Skip to content
This repository has been archived by the owner on Apr 13, 2023. It is now read-only.

added test to cover case of no matching transition element in job (DO NOT PULL THIS) #49

Closed
wants to merge 10 commits into from
Closed
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: java

install:
- mkdir RI
- git clone https://github.com/WASdev/standards.jsr352.jbatch
- cd standards.jsr352.jbatch
- mvn clean install
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ standards.jsr352.tck

## Contributing

[CLA details](CONTRIBUTING.md)
[CLA details](https://github.com/WASdev/standards.jsr352.batch-spec/wiki/Contributor-License-Agreement)

#### Other IBM GitHub projects

Find more open source projects on the [IBM Github Page](http://ibm.github.io/)

1 change: 1 addition & 0 deletions com.ibm.jbatch.tck.cts/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/working.basedir
6 changes: 6 additions & 0 deletions com.ibm.jbatch.tck.cts/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Instructions for building CTS (assumes up-to-date com.ibm.jbatch.tck module)

1. mvn clean
1. mvn process-sources -Dcts
1. ant -Dtransform.dir=working.basedir/javaSource/
1. mvn assembly:single -Dcts
222 changes: 222 additions & 0 deletions com.ibm.jbatch.tck.cts/build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,222 @@
<!--
Copyright 2015 International Business Machines Corp.

See the NOTICE file distributed with this work for additional information
regarding copyright ownership. Licensed under the Apache License,
Version 2.0 (the "License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->


<!--
0) mvn clean
1) mvn process-sources -Dcts
2) ant -Dtransform.dir=working.basedir/javaSource/
3) mvn assembly:single -Dcts
-->

<project name="cts" default="genCTS">

<!-- The classes holding the @Test-annotated test methods -->
<fileset id="testMethods" dir="${transform.dir}/com/ibm/jbatch/tck/tests">
<include name="**/*.java"/>
</fileset>

<fileset id="allClasses" dir="${transform.dir}/com/ibm/jbatch/tck">
<include name="**/*.java"/>
<exclude name="com/ibm/jbatch/tck/annotations/**/*.java"/>
</fileset>

<target name="genCTS" depends="inheritSuperClass, convertToTestUtil, removeJunitTestNG"/>

<!-- Modify the class declaration to extend ServiceEETest and add import for package
containing the ServiceEETest class -->
<target name="inheritSuperClass">
<replaceregexp>
<regexp pattern="(public class\s*[^\s]*\s)"/>
<substitution expression="\1extends ServiceEETest "/>
<fileset refid="testMethods"/>
</replaceregexp>
</target>

<target name="convertToTestUtil">
<replaceregexp>
<regexp pattern="(package.*)"/>
<substitution expression="\1${line.separator}${line.separator}import com.sun.ts.lib.harness.*;${line.separator}import com.sun.ts.lib.util.TestUtil;"/>
<fileset refid="allClasses"/>
</replaceregexp>

<replaceregexp flags="g">
<regexp pattern="(.*)throws Exception"/>
<substitution expression="\1throws Fault"/>
<fileset refid="testMethods"/>
</replaceregexp>

<replaceregexp flags="g">
<regexp pattern="throws Exception"/>
<substitution expression="throws Fault"/>
<fileset refid="testMethods"/>
</replaceregexp>

<!--<replaceregexp flags="gs">
<regexp pattern="catch\s*\(Exception e\).*?}"/>
<substitution expression=
"catch\(Exception e\) {${line.separator}TestUtil.logErr(&quot;Caught exception: &quot;
+ e.getMessage());${line.separator}TestUtil.printStackTrace(e);${line.separator}throw new Fault(METHOD + &quot; failed&quot;, e);}"/>
<fileset refid="testMethods"/>
</replaceregexp>-->

<replaceregexp flags="gs">
<regexp pattern="private static void handleException.*?}"/>
<substitution expression=
"private static void handleException\(String methodName, Exception e\) throws Fault {${line.separator}TestUtil.logErr(&quot;Caught exception: &quot;
+ e.getMessage());${line.separator}TestUtil.printStackTrace(e);${line.separator}throw new Fault(methodName + &quot; failed&quot;, e);}"/>
<fileset refid="testMethods"/>
</replaceregexp>


<replaceregexp flags="g">
<regexp pattern="(String METHOD.*)"/>
<substitution expression=
"\1${line.separator}TestUtil.logTrace\(METHOD\);"/>
<fileset refid="testMethods"/>
</replaceregexp>

<replaceregexp flags="g">
<regexp pattern="Reporter.log*"/>
<substitution expression=
"TestUtil.logMsg"/>
<fileset refid="allClasses"/>
</replaceregexp>

<replaceregexp flags="g">
<regexp pattern="\+&quot;&lt;p>&quot;"/>
<substitution expression=
""/>
<fileset refid="testMethods"/>
</replaceregexp>

<replaceregexp flags="g">
<regexp pattern="&lt;p>"/>
<substitution expression=
""/>
<fileset refid="testMethods"/>
</replaceregexp>

<!--<replaceregexp flags="g">
<regexp pattern="Reporter.log\((.*),.*"/>
<substitution expression="TestUtil.logMsg\(\1\);"/>
<fileset refid="testMethods"/>
</replaceregexp>-->
</target>

<!-- Remove Junit package import and annotations from source files -->
<target name="removeJunitTestNG">
<sequential>
<replaceregexp flags="g">
<regexp pattern="(import org.junit.*)"/>
<substitution expression=""/>
<fileset refid="allClasses"/>
</replaceregexp>

<replaceregexp flags="g">
<regexp pattern="(@org.junit.*)"/>
<substitution expression=""/>
<fileset refid="allClasses"/>
</replaceregexp>

<replaceregexp flags="g">
<regexp pattern="(import org.testng.*)"/>
<substitution expression=""/>
<fileset refid="allClasses"/>
</replaceregexp>

<replaceregexp flags="g">
<regexp pattern="@BeforeClass"/>
<substitution expression=""/>
<fileset refid="testMethods"/>
</replaceregexp>

<replaceregexp flags="g">
<regexp pattern="@BeforeMethod"/>
<substitution expression=""/>
<fileset refid="testMethods"/>
</replaceregexp>

<replaceregexp flags="g">
<regexp pattern="@Test\(enabled=false\)"/>
<substitution expression=""/>
<fileset refid="testMethods"/>
</replaceregexp>


<replaceregexp flags="g">
<regexp pattern="@Test\(enabled = false\)"/>
<substitution expression=""/>
<fileset refid="testMethods"/>
</replaceregexp>

<replaceregexp flags="g">
<regexp pattern="@Test"/>
<substitution expression=""/>
<fileset refid="testMethods"/>
</replaceregexp>



<replaceregexp flags="g">
<regexp pattern="@AfterClass"/>
<substitution expression=""/>
<fileset refid="testMethods"/>
</replaceregexp>

<replaceregexp flags="g">
<regexp pattern="@AfterMethod"/>
<substitution expression=""/>
<fileset refid="testMethods"/>
</replaceregexp>

<replaceregexp flags="g">
<regexp pattern="@AfterTest"/>
<substitution expression=""/>
<fileset refid="testMethods"/>
</replaceregexp>

<replaceregexp flags="g">
<regexp pattern="@BeforeTest"/>
<substitution expression=""/>
<fileset refid="testMethods"/>
</replaceregexp>

<replaceregexp flags="g">
<regexp pattern="@Ignore.*"/>
<substitution expression=""/>
<fileset refid="testMethods"/>
</replaceregexp>

<!-- Now that @BeforeTest and others have been removed -->

<replaceregexp flags="g">
<regexp pattern="@Before"/>
<substitution expression=""/>
<fileset refid="testMethods"/>
</replaceregexp>

<!-- Now that @AfterTest and others have been removed -->
<replaceregexp flags="g">
<regexp pattern="@After"/>
<substitution expression=""/>
<fileset refid="testMethods"/>
</replaceregexp>
</sequential>
</target>

</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project basedir="." name="com_ibm_jbatch_tck">
<import file="../../../../../bin/xml/ts.nonleafimport.xml" />
</project>

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project basedir="." name="com_ibm_jbatch_tck_tests">
<import file="../../../../../../bin/xml/ts.nonleafimport.xml" />
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0"?>
<project name="ee" basedir=".">

<import file="../../../../../../../bin/xml/ts.import.xml"/>

<target name="package">
<ts.vehicles name="ee" classes="com/ibm/jbatch/tck/**/*.class">
<servlet-elements>
<zipfileset dir="${src.dir}/com/ibm/jbatch/tck/testJobXml" prefix="WEB-INF/classes"/>
<zipfileset dir="${src.dir}/com/ibm/jbatch/tck/tests/ee" includes="beans.xml" prefix="WEB-INF"/>
</servlet-elements>
<jsp-elements>
<zipfileset dir="${src.dir}/com/ibm/jbatch/tck/testJobXml" prefix="WEB-INF/classes"/>
<zipfileset dir="${src.dir}/com/ibm/jbatch/tck/tests/ee" includes="beans.xml" prefix="WEB-INF"/>
</jsp-elements>
<ejb-elements>
<fileset dir="${src.dir}/com/ibm/jbatch/tck/testJobXml"/>
<zipfileset dir="${src.dir}/com/ibm/jbatch/tck/tests/ee" includes="beans.xml" prefix="META-INF"/>
</ejb-elements>
</ts.vehicles>
</target>

<target name="-precompile">
<ts.javac includes="com/ibm/jbatch/tck/artifacts/**,
com/ibm/jbatch/tck/utils/**,
com/ibm/jbatch/tck/spi/**,
com/ibm/jbatch/tck/polling/**"/>
</target>

<target name="-preclean">
<ts.clean.classes dir="${class.dir}/com/ibm/jbatch/tck/artifacts"/>
<ts.clean.classes dir="${class.dir}/com/ibm/jbatch/tck/utils"/>
<ts.clean.classes dir="${class.dir}/com/ibm/jbatch/tck/spi"/>
<ts.clean.classes dir="${class.dir}/com/ibm/jbatch/tck/polling"/>
</target>

</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
<sun-application-client>
<ejb-ref>
<ejb-ref-name>ejb/EJBVehicle</ejb-ref-name>
<jndi-name>ee_ejb_vehicle</jndi-name>
</ejb-ref>
</sun-application-client>
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
<sun-ejb-jar>
<enterprise-beans>
<unique-id>0</unique-id>
<ejb>
<ejb-name>com_sun_ts_tests_common_vehicle_ejb_EJBVehicle</ejb-name>
<jndi-name>ee_ejb_vehicle</jndi-name>
<resource-ref>
<res-ref-name>jdbc/orderDB</res-ref-name>
<jndi-name>jdbc/orderDB</jndi-name>
<default-resource-principal>
<name>user1</name>
<password>password1</password>
</default-resource-principal>
</resource-ref>
<pass-by-reference>false</pass-by-reference>
<ior-security-config>
<transport-config>
<integrity>supported</integrity>
<confidentiality>supported</confidentiality>
<establish-trust-in-target>supported</establish-trust-in-target>
<establish-trust-in-client>supported</establish-trust-in-client>
</transport-config>
<as-context>
<auth-method>username_password</auth-method>
<realm>default</realm>
<required>false</required>
</as-context>
<sas-context>
<caller-propagation>supported</caller-propagation>
</sas-context>
</ior-security-config>
<is-read-only-bean>false</is-read-only-bean>
<refresh-period-in-seconds>-1</refresh-period-in-seconds>
<gen-classes/>
</ejb>
</enterprise-beans>
</sun-ejb-jar>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd">
<sun-web-app>
<resource-ref>
</resource-ref>
</sun-web-app>
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd">
<sun-web-app>
<resource-ref>
<res-ref-name>jdbc/orderDB</res-ref-name>
<jndi-name>jdbc/orderDB</jndi-name>
<default-resource-principal>
<name>user1</name>
<password>password1</password>
</default-resource-principal>
</resource-ref>
</sun-web-app>
Loading