Skip to content

Tests for flow, multiple-steps and split projects #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arun-gupta merged 5 commits into from
Dec 31, 2013
Merged

Tests for flow, multiple-steps and split projects #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
be717e2
Added test for flow project.
radcortez Dec 31, 2013
41ba99f
Added test for multiple-steps project.
radcortez Dec 31, 2013
f8806eb
Added test for split project.
radcortez Dec 31, 2013
45d0a8b
Code style issues.
radcortez Dec 31, 2013
02e47c0
Fixed test. Assert steps order.
radcortez Dec 31, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions batch/batch-listeners/src/test/java/org.javaee7.batch.listeners/BatchListenersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ public class BatchListenersTest {
@Deployment
public static WebArchive createDeployment() {
WebArchive war = ShrinkWrap.create(WebArchive.class)
.addClass(BatchTestHelper.class)
.addPackage("org.javaee7.batch.listeners")
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
.addAsResource("META-INF/batch-jobs/myJob.xml");
.addClass(BatchTestHelper.class)
.addPackage("org.javaee7.batch.listeners")
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
.addAsResource("META-INF/batch-jobs/myJob.xml");
System.out.println(war.toString(true));
return war;
}
Expand All @@ -49,9 +49,9 @@ public void testBatchListeners() throws Exception {
if (stepExecution.getStepName().equals("myStep")) {
Map<Metric.MetricType, Long> metricsMap = BatchTestHelper.getMetricsMap(stepExecution.getMetrics());

assertEquals(10L, (long) metricsMap.get(Metric.MetricType.READ_COUNT));
assertEquals(10L / 2L, (long) metricsMap.get(Metric.MetricType.WRITE_COUNT));
assertEquals(10L / 3 + 10 % 3, (long) metricsMap.get(Metric.MetricType.COMMIT_COUNT));
assertEquals(10L, metricsMap.get(Metric.MetricType.READ_COUNT).longValue());
assertEquals(10L / 2L, metricsMap.get(Metric.MetricType.WRITE_COUNT).longValue());
assertEquals(10L / 3 + (10L % 3 > 0 ? 1 : 0), metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue());
}
}

Expand Down
8 changes: 4 additions & 4 deletions batch/batchlet-simple/src/test/java/org/javaee7/batch/batchlet/simple/MyBatchletTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ public class MyBatchletTest {
@Deployment
public static WebArchive createDeployment() {
WebArchive war = ShrinkWrap.create(WebArchive.class)
.addClass(BatchTestHelper.class)
.addClass(MyBatchlet.class)
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
.addAsResource("META-INF/batch-jobs/myJob.xml");
.addClass(BatchTestHelper.class)
.addClass(MyBatchlet.class)
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
.addAsResource("META-INF/batch-jobs/myJob.xml");
System.out.println(war.toString(true));
return war;
}
Expand Down
14 changes: 7 additions & 7 deletions ...checkpoint/src/test/java/org/javaee7/batch/chunk/checkpoint/BatchChunkCheckpointTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ public class BatchChunkCheckpointTest {
@Deployment
public static WebArchive createDeployment() {
WebArchive war = ShrinkWrap.create(WebArchive.class)
.addClass(BatchTestHelper.class)
.addPackage("org.javaee7.batch.chunk.checkpoint")
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
.addAsResource("META-INF/batch-jobs/myJob.xml");
.addClass(BatchTestHelper.class)
.addPackage("org.javaee7.batch.chunk.checkpoint")
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
.addAsResource("META-INF/batch-jobs/myJob.xml");
System.out.println(war.toString(true));
return war;
}
Expand All @@ -49,9 +49,9 @@ public void testBatchChunkCheckpoint() throws Exception {
if (stepExecution.getStepName().equals("myStep")) {
Map<Metric.MetricType, Long> metricsMap = BatchTestHelper.getMetricsMap(stepExecution.getMetrics());

assertEquals(10L, (long) metricsMap.get(Metric.MetricType.READ_COUNT));
assertEquals(10L / 2L, (long) metricsMap.get(Metric.MetricType.WRITE_COUNT));
assertEquals(10L / 5L + 1, (long) metricsMap.get(Metric.MetricType.COMMIT_COUNT));
assertEquals(10L, metricsMap.get(Metric.MetricType.READ_COUNT).longValue());
assertEquals(10L / 2L, metricsMap.get(Metric.MetricType.WRITE_COUNT).longValue());
assertEquals(10L / 5L + 1, metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue());
}
}

Expand Down
6 changes: 3 additions & 3 deletions ...csv-database/src/test/java/org/javaee7/batch/chunk/csv/database/BatchCSVDatabaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ public void testBatchCSVDatabase() throws Exception {
if (stepExecution.getStepName().equals("myStep")) {
Map<Metric.MetricType, Long> metricsMap = BatchTestHelper.getMetricsMap(stepExecution.getMetrics());

assertEquals(7L, (long) metricsMap.get(Metric.MetricType.READ_COUNT));
assertEquals(7L, (long) metricsMap.get(Metric.MetricType.WRITE_COUNT));
assertEquals(3L, (long) metricsMap.get(Metric.MetricType.COMMIT_COUNT));
assertEquals(7L, metricsMap.get(Metric.MetricType.READ_COUNT).longValue());
assertEquals(7L, metricsMap.get(Metric.MetricType.WRITE_COUNT).longValue());
assertEquals(3L, metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue());
}
}

Expand Down
6 changes: 3 additions & 3 deletions ...nk-exception/src/test/java/org/javaee7/batch/chunk/exception/BatchChunkExceptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ public void testBatchChunkException() throws Exception {
if (stepExecution.getStepName().equals("myStep")) {
Map<Metric.MetricType, Long> metricsMap = BatchTestHelper.getMetricsMap(stepExecution.getMetrics());

assertEquals(1L, (long) metricsMap.get(Metric.MetricType.READ_SKIP_COUNT));
assertEquals(1L, (long) metricsMap.get(Metric.MetricType.PROCESS_SKIP_COUNT));
assertEquals(1L, (long) metricsMap.get(Metric.MetricType.WRITE_SKIP_COUNT));
assertEquals(1L, metricsMap.get(Metric.MetricType.READ_SKIP_COUNT).longValue());
assertEquals(1L, metricsMap.get(Metric.MetricType.PROCESS_SKIP_COUNT).longValue());
assertEquals(1L, metricsMap.get(Metric.MetricType.WRITE_SKIP_COUNT).longValue());
}
}

Expand Down
4 changes: 2 additions & 2 deletions batch/chunk-mapper/src/main/resources/META-INF/batch-jobs/myJob.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
<property name="end" value="#{partitionPlan['end']}" />
</properties>
</reader>
<processor ref="myItemProcessor"></processor>
<writer ref="myItemWriter"></writer>
<processor ref="myItemProcessor"/>
<writer ref="myItemWriter"/>
</chunk>
<partition>
<mapper ref="myMapper"/>
Expand Down
4 changes: 2 additions & 2 deletions batch/chunk-optional-processor/src/main/resources/META-INF/batch-jobs/myJob.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<job id="myJob" xmlns="http://xmlns.jcp.org/xml/ns/javaee" version="1.0">
<step id="myStep" >
<chunk item-count="3">
<reader ref="myItemReader"></reader>
<writer ref="myItemWriter"></writer>
<reader ref="myItemReader"/>
<writer ref="myItemWriter"/>
</chunk>
</step>
</job>
Expand Down
2 changes: 1 addition & 1 deletion ...test/java/org/javaee7/batch/chunk/optional/processor/BatchChunkOptionalProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void testBatchChunkOptionalProcessor() throws Exception {
Map<Metric.MetricType, Long> metricsMap = BatchTestHelper.getMetricsMap(stepExecution.getMetrics());
assertEquals(10L, metricsMap.get(Metric.MetricType.READ_COUNT).longValue());
assertEquals(10L, metricsMap.get(Metric.MetricType.WRITE_COUNT).longValue());
assertEquals(10L / 3 + 10 % 3, metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue());
assertEquals(10L / 3 + (10L % 3 > 0 ? 1 : 0), metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue());
}
}

Expand Down
4 changes: 2 additions & 2 deletions batch/chunk-partition/src/main/resources/META-INF/batch-jobs/myJob.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
<property name="end" value="#{partitionPlan['end']}" />
</properties>
</reader>
<processor ref="myItemProcessor"></processor>
<writer ref="myItemWriter"></writer>
<processor ref="myItemProcessor"/>
<writer ref="myItemWriter"/>
</chunk>
<partition>
<plan partitions="2">
Expand Down
6 changes: 3 additions & 3 deletions batch/chunk-simple-nobeans/src/main/resources/META-INF/batch-jobs/myJob.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
<job id="myJob" xmlns="http://xmlns.jcp.org/xml/ns/javaee" version="1.0">
<step id="myStep" >
<chunk item-count="3">
<reader ref="myItemReader"></reader>
<processor ref="myItemProcessor"></processor>
<writer ref="myItemWriter"></writer>
<reader ref="myItemReader"/>
<processor ref="myItemProcessor"/>
<writer ref="myItemWriter"/>
</chunk>
</step>
</job>
Expand Down
2 changes: 1 addition & 1 deletion ...test/java/org/javaee7/batch/samples/chunk/simple/nobeans/BatchChunkSimpleNoBeansTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void testBatchChunkSimpleNoBeans() throws Exception {

assertEquals(10L, metricsMap.get(Metric.MetricType.READ_COUNT).longValue());
assertEquals(10L / 2L, metricsMap.get(Metric.MetricType.WRITE_COUNT).longValue());
assertEquals(10L / 3 + 10 % 3, metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue());
assertEquals(10L / 3 + (10L % 3 > 0 ? 1 : 0), metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue());
}
}

Expand Down
6 changes: 3 additions & 3 deletions batch/chunk-simple/src/main/resources/META-INF/batch-jobs/myJob.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
<job id="myJob" xmlns="http://xmlns.jcp.org/xml/ns/javaee" version="1.0">
<step id="myStep" >
<chunk item-count="3">
<reader ref="myItemReader"></reader>
<processor ref="myItemProcessor"></processor>
<writer ref="myItemWriter"></writer>
<reader ref="myItemReader"/>
<processor ref="myItemProcessor"/>
<writer ref="myItemWriter"/>
</chunk>
</step>
</job>
Expand Down
31 changes: 12 additions & 19 deletions batch/chunk-simple/src/test/java/org/javaee7/batch/chunk/simple/ChunkSimpleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,17 @@
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;

import javax.batch.operations.JobOperator;
import javax.batch.runtime.BatchRuntime;
import javax.batch.runtime.BatchStatus;
import javax.batch.runtime.JobExecution;
import javax.batch.runtime.Metric;
import javax.batch.runtime.StepExecution;
import javax.batch.runtime.*;
import java.util.List;
import java.util.Map;
import java.util.Properties;

import static org.junit.Assert.assertEquals;

/**
* @author Roberto Cortez
*/
Expand All @@ -29,14 +26,10 @@ public class ChunkSimpleTest {
@Deployment
public static WebArchive createDeployment() {
WebArchive war = ShrinkWrap.create(WebArchive.class)
.addClass(BatchTestHelper.class)
.addClass(MyInputRecord.class)
.addClass(MyItemProcessor.class)
.addClass(MyItemReader.class)
.addClass(MyItemWriter.class)
.addClass(MyOutputRecord.class)
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
.addAsResource("META-INF/batch-jobs/myJob.xml");
.addClass(BatchTestHelper.class)
.addPackage("org.javaee7.batch.chunk.simple")
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
.addAsResource("META-INF/batch-jobs/myJob.xml");
System.out.println(war.toString(true));
return war;
}
Expand All @@ -52,13 +45,13 @@ public void testChunkSimple() throws Exception {
List<StepExecution> stepExecutions = jobOperator.getStepExecutions(executionId);
for (StepExecution stepExecution : stepExecutions) {
if (stepExecution.getStepName().equals("myStep")) {
Map<Metric.MetricType,Long> metricsMap = BatchTestHelper.getMetricsMap(stepExecution.getMetrics());
Assert.assertEquals((long) metricsMap.get(Metric.MetricType.READ_COUNT), 10L);
Assert.assertEquals((long) metricsMap.get(Metric.MetricType.WRITE_COUNT), 10L/2L);
Assert.assertEquals((long) metricsMap.get(Metric.MetricType.COMMIT_COUNT), 10L/3 + 10%3);
Map<Metric.MetricType, Long> metricsMap = BatchTestHelper.getMetricsMap(stepExecution.getMetrics());
assertEquals(10L, metricsMap.get(Metric.MetricType.READ_COUNT).longValue());
assertEquals(10L / 2L, metricsMap.get(Metric.MetricType.WRITE_COUNT).longValue());
assertEquals(10L / 3 + (10L % 3 > 0 ? 1 : 0), metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue());
}
}

Assert.assertEquals(jobExecution.getBatchStatus(), BatchStatus.COMPLETED);
assertEquals(jobExecution.getBatchStatus(), BatchStatus.COMPLETED);
}
}
11 changes: 8 additions & 3 deletions batch/flow/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.javaee7.batch</groupId>
Expand All @@ -8,11 +9,15 @@
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>org.javaee7.batch</groupId>
<artifactId>flow</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>war</packaging>

<name>${project.artifactId}</name>

<dependencies>
<dependency>
<groupId>org.javaee7</groupId>
<artifactId>util-samples</artifactId>
</dependency>
</dependencies>
</project>
137 changes: 0 additions & 137 deletions batch/flow/src/main/java/org/javaee7/batch/flow/TestServlet.java
View file
Open in desktop

This file was deleted.

Loading