Skip to content
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.

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

Fix typo in testing code. #2252

Merged
merged 1 commit into from
Jun 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<echo value="#######################################################"/>
<echo value=" "/>

<!-- Run HelperCompatabilityTests -->
<!-- Run HelperCompatibilityTests -->

<exec command="$JAVA_EXE$ -Xshareclasses:destroyAll" quiet="false"/>

Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
/**
* @author Matthew Kilner
*/
public class PartitioningURLClassPathHelperURLHelperStaleEntryCompatabilityTest {
public class PartitioningURLClassPathHelperURLHelperStaleEntryCompatibilityTest {

StringManipulator manipulator = new StringManipulator();

Expand All @@ -44,7 +44,7 @@ public static void main(String[] args) {
System.out.println("\n Please specifiy -testfile <filename> -javacdir <path to javac>");
}

PartitioningURLClassPathHelperURLHelperStaleEntryCompatabilityTest test = new PartitioningURLClassPathHelperURLHelperStaleEntryCompatabilityTest();
PartitioningURLClassPathHelperURLHelperStaleEntryCompatibilityTest test = new PartitioningURLClassPathHelperURLHelperStaleEntryCompatibilityTest();

String testFile = args[1];
String javacdir = args[3];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
/**
* @author Matthew Kilner
*/
public class PartitioningURLHelperURLClassPathHelperStaleEntryCompatabilityTest {
public class PartitioningURLHelperURLClassPathHelperStaleEntryCompatibilityTest {

StringManipulator manipulator = new StringManipulator();

Expand All @@ -46,7 +46,7 @@ public static void main(String[] args) {
System.out.println("\n Please specifiy -testfile <filename> -javacdir <path to javac>");
}

PartitioningURLHelperURLClassPathHelperStaleEntryCompatabilityTest test = new PartitioningURLHelperURLClassPathHelperStaleEntryCompatabilityTest();
PartitioningURLHelperURLClassPathHelperStaleEntryCompatibilityTest test = new PartitioningURLHelperURLClassPathHelperStaleEntryCompatibilityTest();

String testFile = args[1];
String javacdir = args[3];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
/**
* @author Matthew Kilner
*/
public class TokenIncompatabilityTest {
public class TokenIncompatibilityTest {

StringManipulator manipulator = new StringManipulator();

public static void main(String[] args) {

TokenIncompatabilityTest test = new TokenIncompatabilityTest();
TokenIncompatibilityTest test = new TokenIncompatibilityTest();

test.run();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
/**
* @author Matthew Kilner
*/
public class URLClassPathHelperURLHelperCompatabilityTest {
public class URLClassPathHelperURLHelperCompatibilityTest {

StringManipulator manipulator = new StringManipulator();

Expand All @@ -42,7 +42,7 @@ public static void main(String[] args) {
System.out.println("\n Please specifiy -testfile <filename>");
}

URLClassPathHelperURLHelperCompatabilityTest test = new URLClassPathHelperURLHelperCompatabilityTest();
URLClassPathHelperURLHelperCompatibilityTest test = new URLClassPathHelperURLHelperCompatibilityTest();

String testFile = args[1];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
/**
* @author Matthew Kilner
*/
public class URLClassPathHelperURLHelperStaleEntryCompatabilityTest {
public class URLClassPathHelperURLHelperStaleEntryCompatibilityTest {

StringManipulator manipulator = new StringManipulator();

Expand All @@ -44,7 +44,7 @@ public static void main(String[] args) {
System.out.println("\n Please specifiy -testfile <filename> -javacdir <path to javac>");
}

URLClassPathHelperURLHelperStaleEntryCompatabilityTest test = new URLClassPathHelperURLHelperStaleEntryCompatabilityTest();
URLClassPathHelperURLHelperStaleEntryCompatibilityTest test = new URLClassPathHelperURLHelperStaleEntryCompatibilityTest();

String testFile = args[1];
String javacdir = args[3];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
/**
* @author Matthew Kilner
*/
public class URLHelperURLClassPathHelperCompatabilityTest {
public class URLHelperURLClassPathHelperCompatibilityTest {

StringManipulator manipulator = new StringManipulator();

Expand All @@ -44,7 +44,7 @@ public static void main(String[] args) {
System.out.println("\n Please specifiy -testfile <filename>");
}

URLHelperURLClassPathHelperCompatabilityTest test = new URLHelperURLClassPathHelperCompatabilityTest();
URLHelperURLClassPathHelperCompatibilityTest test = new URLHelperURLClassPathHelperCompatibilityTest();

String testFile = args[1];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
/**
* @author Matthew Kilner
*/
public class URLHelperURLClassPathHelperStaleEntryCompatabilityTest {
public class URLHelperURLClassPathHelperStaleEntryCompatibilityTest {

StringManipulator manipulator = new StringManipulator();

Expand All @@ -46,7 +46,7 @@ public static void main(String[] args) {
System.out.println("\n Please specifiy -testfile <filename> -javacdir <path to javac>");
}

URLHelperURLClassPathHelperStaleEntryCompatabilityTest test = new URLHelperURLClassPathHelperStaleEntryCompatabilityTest();
URLHelperURLClassPathHelperStaleEntryCompatibilityTest test = new URLHelperURLClassPathHelperStaleEntryCompatibilityTest();

String testFile = args[1];
String javacdir = args[3];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
-->

<project name="SCHelperCompatabilityTests" default="build" basedir=".">
<project name="SCHelperCompatibilityTests" default="build" basedir=".">
<taskdef resource="net/sf/antcontrib/antlib.xml" />
<description>
Build SCHelperCompatabilityTests
Build SCHelperCompatibilityTests
</description>

<!-- set properties for this build -->
<property name="DEST" value="${BUILD_ROOT}/functional/cmdLineTests/shareClassTests/SCHelperCompatabilityTests" />
<property name="DEST" value="${BUILD_ROOT}/functional/cmdLineTests/shareClassTests/SCHelperCompatibilityTests" />
<property name="PROJECT_ROOT" location="." />
<property name="src" location="."/>
<property name="build" location="./bin"/>
Expand Down Expand Up @@ -65,55 +65,55 @@
<if>
<equals arg1="${JAVA_VERSION}" arg2="SE80"/>
<then>
<javac srcdir="${build}" includes="PartitioningURLClassPathHelperURLHelperStaleEntryCompatabilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<javac srcdir="${build}" includes="PartitioningURLClassPathHelperURLHelperStaleEntryCompatibilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<src path="${SharedClassUtils_srddir}"/>
</javac>
<javac srcdir="${build}" includes="PartitioningURLHelperURLClassPathHelperStaleEntryCompatabilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<javac srcdir="${build}" includes="PartitioningURLHelperURLClassPathHelperStaleEntryCompatibilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<src path="${SharedClassUtils_srddir}"/>
</javac>
<javac srcdir="${build}" includes="TokenIncompatabilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<javac srcdir="${build}" includes="TokenIncompatibilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<src path="${SharedClassUtils_srddir}"/>
</javac>
<javac srcdir="${build}" includes="URLClassPathHelperURLHelperCompatabilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<javac srcdir="${build}" includes="URLClassPathHelperURLHelperCompatibilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<src path="${SharedClassUtils_srddir}"/>
</javac>
<javac srcdir="${build}" includes="URLClassPathHelperURLHelperStaleEntryCompatabilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<javac srcdir="${build}" includes="URLClassPathHelperURLHelperStaleEntryCompatibilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<src path="${SharedClassUtils_srddir}"/>
</javac>
<javac srcdir="${build}" includes="URLHelperURLClassPathHelperCompatabilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<javac srcdir="${build}" includes="URLHelperURLClassPathHelperCompatibilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<src path="${SharedClassUtils_srddir}"/>
</javac>
<javac srcdir="${build}" includes="URLHelperURLClassPathHelperStaleEntryCompatabilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<javac srcdir="${build}" includes="URLHelperURLClassPathHelperStaleEntryCompatibilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<src path="${SharedClassUtils_srddir}"/>
</javac>
</then>
<else>
<property name="addExports" value="--add-modules openj9.sharedclasses --add-exports java.base/com.ibm.oti.util=ALL-UNNAMED" />
<javac srcdir="${build}" includes="PartitioningURLClassPathHelperURLHelperStaleEntryCompatabilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<javac srcdir="${build}" includes="PartitioningURLClassPathHelperURLHelperStaleEntryCompatibilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<src path="${SharedClassUtils_srddir}"/>
<compilerarg line='${addExports}' />
</javac>
<javac srcdir="${build}" includes="PartitioningURLHelperURLClassPathHelperStaleEntryCompatabilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<javac srcdir="${build}" includes="PartitioningURLHelperURLClassPathHelperStaleEntryCompatibilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<src path="${SharedClassUtils_srddir}"/>
<compilerarg line='${addExports}' />
</javac>
<javac srcdir="${build}" includes="TokenIncompatabilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<javac srcdir="${build}" includes="TokenIncompatibilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<src path="${SharedClassUtils_srddir}"/>
<compilerarg line='${addExports}' />
</javac>
<javac srcdir="${build}" includes="URLClassPathHelperURLHelperCompatabilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<javac srcdir="${build}" includes="URLClassPathHelperURLHelperCompatibilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<src path="${SharedClassUtils_srddir}"/>
<compilerarg line='${addExports}' />
</javac>
<javac srcdir="${build}" includes="URLClassPathHelperURLHelperStaleEntryCompatabilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<javac srcdir="${build}" includes="URLClassPathHelperURLHelperStaleEntryCompatibilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<src path="${SharedClassUtils_srddir}"/>
<compilerarg line='${addExports}' />
</javac>
<javac srcdir="${build}" includes="URLHelperURLClassPathHelperCompatabilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<javac srcdir="${build}" includes="URLHelperURLClassPathHelperCompatibilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<src path="${SharedClassUtils_srddir}"/>
<compilerarg line='${addExports}' />
</javac>
<javac srcdir="${build}" includes="URLHelperURLClassPathHelperStaleEntryCompatabilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<javac srcdir="${build}" includes="URLHelperURLClassPathHelperStaleEntryCompatibilityTest.java" destdir="${build}" fork="true" debug="on" debuglevel="lines,vars,source" executable="${compiler.javac}" encoding="ISO-8859-1">
<src path="${SharedClassUtils_srddir}"/>
<compilerarg line='${addExports}' />
</javac>
Expand All @@ -131,7 +131,7 @@
</target>

<target name="dist" depends="compile" description="generate the distribution">
<jar jarfile="${DEST}/HelperCompatabilityTests.jar" filesonly="true">
<jar jarfile="${DEST}/HelperCompatibilityTests.jar" filesonly="true">
<fileset dir="${build}" />
</jar>
<copy todir="${DEST}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@

<!DOCTYPE suite SYSTEM "excludes.dtd">
<?xml:stylesheet type="text/xsl" href="excludes.xsl" ?>
<suite id="HelperCompatabilityTest Excluded Test Case List">
<exclude id="HelperCompatabilityTest 9" platform="current" shouldFix="true">
<suite id="HelperCompatibilityTest Excluded Test Case List">
<exclude id="HelperCompatibilityTest 9" platform="current" shouldFix="true">
<reason>The result on IBM SDK is incorrect due to JCL patch of zip Hook, we should not find classes from SCC after jar are updated. See StaleClassPathTest5.sh</reason>
</exclude>
<exclude id="destroy cache 9" platform="current" shouldFix="true">
<reason>The result on IBM SDK is incorrect due to JCL patch of zip Hook, we should not find classes from SCC after jar are updated</reason>
</exclude>
<exclude id="HelperCompatabilityTest 11" platform="current" shouldFix="true">
<exclude id="HelperCompatibilityTest 11" platform="current" shouldFix="true">
<reason>The result on IBM SDK is incorrect due to JCL patch of zip Hook, we should not find classes from SCC after jar are updated. See StaleClassPathTest5.sh</reason>
</exclude>
<exclude id="destroy cache 11" platform="current" shouldFix="true">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
<playlist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../TestConfig/playlist.xsd">
<include>variables.mk</include>
<test>
<testCaseName>cmdLineTester_SCHelperCompatabilityTests_win</testCaseName>
<testCaseName>cmdLineTester_SCHelperCompatibilityTests_win</testCaseName>
<variations>
<variation>Mode110</variation>
<variation>Mode610</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
$(CD) $(REPORTDIR); \
cp $(Q)$(TEST_RESROOT)$(D)HelperCompatabilityTests.jar$(Q) .; \
$(Q)$(JDK_HOME)$(D)bin$(D)jar.exe$(Q) xf HelperCompatabilityTests.jar; \
cp $(Q)$(TEST_RESROOT)$(D)HelperCompatibilityTests.jar$(Q) .; \
$(Q)$(JDK_HOME)$(D)bin$(D)jar.exe$(Q) xf HelperCompatibilityTests.jar; \
$(JAVA_COMMAND) $(JVM_OPTIONS) -DJAVA_EXE='$(JAVA_COMMAND) $(JVM_OPTIONS)' -DJDK_HOME=$(Q)$(JDK_HOME)$(Q) -DCPDL=$(Q)$(P)$(Q) -DPROPS_DIR=$(Q)$(TEST_RESROOT)$(D)props_win$(Q) -DSCMODE=204 \
-jar $(CMDLINETESTER_JAR) \
-config $(Q)$(TEST_RESROOT)$(D)HelperCompatabilityTests$(XMLSUFFIX).xml$(Q) \
-config $(Q)$(TEST_RESROOT)$(D)HelperCompatibilityTests$(XMLSUFFIX).xml$(Q) \
-xids all,$(JAVA_VERSION) -xlist $(Q)$(TEST_RESROOT)$(D)exclude.xml$(Q) \
-nonZeroExitWhenError \
-outputLimit 300; \
Expand All @@ -56,19 +56,19 @@
</subsets>
</test>
<test>
<testCaseName>cmdLineTester_SCHelperCompatabilityTests_unix</testCaseName>
<testCaseName>cmdLineTester_SCHelperCompatibilityTests_unix</testCaseName>
<variations>
<variation>Mode110</variation>
<variation>Mode610</variation>
</variations>
<command>$(MKTREE) $(REPORTDIR); \
$(CD) $(REPORTDIR); \
cp $(Q)$(TEST_RESROOT)$(D)HelperCompatabilityTests.jar$(Q) .; \
$(Q)$(JDK_HOME)$(D)bin$(D)jar$(Q) xf HelperCompatabilityTests.jar; \
cp $(Q)$(TEST_RESROOT)$(D)HelperCompatibilityTests.jar$(Q) .; \
$(Q)$(JDK_HOME)$(D)bin$(D)jar$(Q) xf HelperCompatibilityTests.jar; \
$(CONVERT_TO_EBCDIC_CMD) \
$(JAVA_COMMAND) $(JVM_OPTIONS) -DJAVA_EXE='$(JAVA_COMMAND) $(JVM_OPTIONS)' -DJDK_HOME=$(Q)$(JDK_HOME)$(Q) -DCPDL=$(Q)$(P)$(Q) -DPROPS_DIR=$(Q)$(TEST_RESROOT)$(D)props_unix$(Q) -DSCMODE=204 \
-jar $(CMDLINETESTER_JAR) \
-config $(Q)$(TEST_RESROOT)$(D)HelperCompatabilityTests$(XMLSUFFIX).xml$(Q) \
-config $(Q)$(TEST_RESROOT)$(D)HelperCompatibilityTests$(XMLSUFFIX).xml$(Q) \
-xids all,$(JAVA_VERSION),$(JCL_VERSION) -xlist $(Q)$(TEST_RESROOT)$(D)exclude.xml$(Q) \
-nonZeroExitWhenError \
-outputLimit 300; \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<echo value="#######################################################"/>
<echo value=" "/>

<!-- Run HelperCompatabilityTests -->
<!-- Run HelperCompatibilityTests -->

<test id="Simple Sanity Initial Cleanup" timeout="600" runPath=".">
<command>$JAVA_EXE$ $currentMode$,destroy</command>
Expand Down