From: chibash <chiba@javassist.org>
Date: Tue, 8 May 2018 00:24:19 +0000 (+0900)
Subject: fixes a minor bug in a test case.
X-Git-Tag: rel_3_23_0_ga~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=040a9cfc267dde60b0977227a479a939a4e828f6;p=javassist.git

fixes a minor bug in a test case.
---

diff --git a/build.xml b/build.xml
index 5273c494..4300d7ac 100644
--- a/build.xml
+++ b/build.xml
@@ -16,6 +16,7 @@
   <property name="build.dir" value="${basedir}/target"/>
   <property name="build.classes.dir" value="${build.dir}/classes"/>
   <property name="test.src.dir" value="${basedir}/src/test"/>
+  <property name="test.lib.dir" value="${test.src.dir}/resources"/>
   <property name="test.build.dir" value="${build.dir}/test-classes"/>
   <property name="test.run.dir" value="${build.dir}/runtest"/>
   <property name="test.reports.dir" value = "${build.dir}/test-output"/>
@@ -39,6 +40,7 @@
 
   <path id="test.classpath">
     <pathelement location="${test.build.dir}"/>
+    <pathelement location="${test.lib.dir}"/>
     <pathelement location="${lib.dir}/junit.jar"/>
     <pathelement location="${lib.dir}/hamcrest.jar"/>
     <pathelement location="${build.classes.dir}"/>
@@ -100,15 +102,23 @@
   </target>
 
   <target name="runtest" depends="jar,test-compile">
+    <copy file="${test.lib.dir}/empty.jar"
+          tofile="${test.lib.dir}/emptyorig.jar"
+          preservelastmodified="true" />
     <junit fork="true" printsummary="true" dir="${test.run.dir}">
       <jvmarg value="-XX:-FailOverToOldVerifier"/>
       <classpath refid="test.classpath"/>
       <formatter type="xml" extension=".xml"/>
       <test name="javassist.JvstTest" outfile="TestLog" />
     </junit>
+    <move file="${test.lib.dir}/emptyorig.jar"
+          tofile="${test.lib.dir}/empty.jar" />
   </target>
 
   <target name="runtest9" depends="jar,test-compile">
+    <copy file="${test.lib.dir}/empty.jar"
+          tofile="${test.lib.dir}/emptyorig.jar"
+          preservelastmodified="true" />
     <junit fork="true" printsummary="true" dir="${test.run.dir}">
       <jvmarg line="--add-opens java.base/java.lang=ALL-UNNAMED" />
       <jvmarg value="-XX:-FailOverToOldVerifier"/>
@@ -116,6 +126,8 @@
       <formatter type="xml" extension=".xml"/>
       <test name="javassist.JvstTest" outfile="TestLog" />
     </junit>
+    <move file="${test.lib.dir}/emptyorig.jar"
+          tofile="${test.lib.dir}/empty.jar" />
   </target>
 
   <target name="sample" depends="compile">
diff --git a/javassist.jar b/javassist.jar
index 232bb340..e009d8e6 100644
Binary files a/javassist.jar and b/javassist.jar differ
diff --git a/src/test/javassist/JvstTest.java b/src/test/javassist/JvstTest.java
index ff58106a..e2f9211f 100644
--- a/src/test/javassist/JvstTest.java
+++ b/src/test/javassist/JvstTest.java
@@ -79,7 +79,7 @@ public class JvstTest extends JvstTestRoot {
 
         // Assert that it is possible to delete the jar file.
         // On Windows deleting an open file will fail, while on on Mac/Linux this is always possible.
-        // This check will thus only fail on Windos if the file is still open.
+        // This check will thus only fail on Windows if the file is still open.
         assertTrue(jarFile.delete());
     }
 
diff --git a/src/test/resources/empty.jar b/src/test/resources/empty.jar
old mode 100755
new mode 100644