Merge pull request #2036 from MarcMil/fix-asm-tests

Fixing asm tests for newer java versions
soot-oss · Dec 22, 2023 · 58042b3 · 58042b3
2 parents 59ea1d9 + 4c82499
commit 58042b3
Show file tree

Hide file tree

Showing 38 changed files with 5 additions and 4 deletions.
diff --git a/src/test/java/soot/asm/backend/AbstractASMBackendTest.java b/src/test/java/soot/asm/backend/AbstractASMBackendTest.java
@@ -163,7 +163,7 @@ public void runTestAndCompareOutput() throws IOException {
    * @return The location of the process-dir folder
    */
   protected String getTargetFolder() {
-    File f = new File("./target/test-classes");
+    File f = new File("./test-classes-asm");
     return f.getAbsolutePath();
   }
 
@@ -173,7 +173,7 @@ protected String getTargetFolder() {
    * @return The location of the folder containing the test files
    */
   protected String getClassPathFolder() {
-    File f = new File("./target/test-classes");
+    File f = new File("./test-classes-asm");
     return f.getAbsolutePath();
   }
 

diff --git a/src/test/java/soot/asm/backend/InstanceOfCastsTest.java b/src/test/java/soot/asm/backend/InstanceOfCastsTest.java
@@ -63,8 +63,9 @@ protected void generate(TraceClassVisitor cw) {
       mv.visitVarInsn(ALOAD, 1);
       mv.visitTypeInsn(CHECKCAST, "[Lsoot/asm/backend/targets/Measurable;");
       // the eclipse compiler and javac >= version 1.9 produce different bytecode @see https://github.com/soot-oss/soot/pull/1155
-      if (targetCompiler != TargetCompiler.eclipse  && targetCompiler != TargetCompiler.javac9)
-        mv.visitTypeInsn(CHECKCAST, "[Lsoot/asm/backend/targets/Measurable;");
+      //if (targetCompiler != TargetCompiler.eclipse  && targetCompiler != TargetCompiler.javac9)
+      //  mv.visitTypeInsn(CHECKCAST, "[Lsoot/asm/backend/targets/Measurable;");
+      // Not applicable now, since we use fixed classes in test-classes-asm, which were compiled by Java 1.8
       mv.visitInsn(ARETURN);
       mv.visitLabel(l0);
       mv.visitInsn(ACONST_NULL);

diff --git a/test-classes-asm/soot/asm/backend/targets/AnnotatedAnnotatedClass.class b/test-classes-asm/soot/asm/backend/targets/AnnotatedAnnotatedClass.class
diff --git a/test-classes-asm/soot/asm/backend/targets/AnnotatedClass.class b/test-classes-asm/soot/asm/backend/targets/AnnotatedClass.class
diff --git a/test-classes-asm/soot/asm/backend/targets/AnnotatedField.class b/test-classes-asm/soot/asm/backend/targets/AnnotatedField.class
diff --git a/test-classes-asm/soot/asm/backend/targets/AnnotatedMethod.class b/test-classes-asm/soot/asm/backend/targets/AnnotatedMethod.class
diff --git a/test-classes-asm/soot/asm/backend/targets/AnnotatedParameter.class b/test-classes-asm/soot/asm/backend/targets/AnnotatedParameter.class
diff --git a/test-classes-asm/soot/asm/backend/targets/ArithmeticLib.class b/test-classes-asm/soot/asm/backend/targets/ArithmeticLib.class
diff --git a/test-classes-asm/soot/asm/backend/targets/Arrays.class b/test-classes-asm/soot/asm/backend/targets/Arrays.class
diff --git a/test-classes-asm/soot/asm/backend/targets/Bean.class b/test-classes-asm/soot/asm/backend/targets/Bean.class
diff --git a/test-classes-asm/soot/asm/backend/targets/Comparable.class b/test-classes-asm/soot/asm/backend/targets/Comparable.class
diff --git a/test-classes-asm/soot/asm/backend/targets/CompareArithmeticInstructions2.class b/test-classes-asm/soot/asm/backend/targets/CompareArithmeticInstructions2.class
diff --git a/test-classes-asm/soot/asm/backend/targets/CompareArithmeticInstuctions.class b/test-classes-asm/soot/asm/backend/targets/CompareArithmeticInstuctions.class
diff --git a/test-classes-asm/soot/asm/backend/targets/CompareInstructions.class b/test-classes-asm/soot/asm/backend/targets/CompareInstructions.class
diff --git a/test-classes-asm/soot/asm/backend/targets/ConstantPool.class b/test-classes-asm/soot/asm/backend/targets/ConstantPool.class
diff --git a/test-classes-asm/soot/asm/backend/targets/ControlStructures.class b/test-classes-asm/soot/asm/backend/targets/ControlStructures.class
diff --git a/test-classes-asm/soot/asm/backend/targets/Dups.class b/test-classes-asm/soot/asm/backend/targets/Dups.class
diff --git a/test-classes-asm/soot/asm/backend/targets/ExceptionMethods.class b/test-classes-asm/soot/asm/backend/targets/ExceptionMethods.class
diff --git a/test-classes-asm/soot/asm/backend/targets/ExtendedArithmeticLib.class b/test-classes-asm/soot/asm/backend/targets/ExtendedArithmeticLib.class
diff --git a/test-classes-asm/soot/asm/backend/targets/InnerClass$1.class b/test-classes-asm/soot/asm/backend/targets/InnerClass$1.class
diff --git a/test-classes-asm/soot/asm/backend/targets/InnerClass$Inner.class b/test-classes-asm/soot/asm/backend/targets/InnerClass$Inner.class
diff --git a/test-classes-asm/soot/asm/backend/targets/InnerClass.class b/test-classes-asm/soot/asm/backend/targets/InnerClass.class
diff --git a/test-classes-asm/soot/asm/backend/targets/InnerStaticClass$1.class b/test-classes-asm/soot/asm/backend/targets/InnerStaticClass$1.class
diff --git a/test-classes-asm/soot/asm/backend/targets/InnerStaticClass$Inner.class b/test-classes-asm/soot/asm/backend/targets/InnerStaticClass$Inner.class
diff --git a/test-classes-asm/soot/asm/backend/targets/InnerStaticClass.class b/test-classes-asm/soot/asm/backend/targets/InnerStaticClass.class
diff --git a/test-classes-asm/soot/asm/backend/targets/InstanceOfCasts.class b/test-classes-asm/soot/asm/backend/targets/InstanceOfCasts.class
diff --git a/test-classes-asm/soot/asm/backend/targets/LineNumbers.class b/test-classes-asm/soot/asm/backend/targets/LineNumbers.class
diff --git a/test-classes-asm/soot/asm/backend/targets/LogicalOperations.class b/test-classes-asm/soot/asm/backend/targets/LogicalOperations.class
diff --git a/test-classes-asm/soot/asm/backend/targets/Measurable.class b/test-classes-asm/soot/asm/backend/targets/Measurable.class
diff --git a/test-classes-asm/soot/asm/backend/targets/Modifiers.class b/test-classes-asm/soot/asm/backend/targets/Modifiers.class
diff --git a/test-classes-asm/soot/asm/backend/targets/Monitor.class b/test-classes-asm/soot/asm/backend/targets/Monitor.class
diff --git a/test-classes-asm/soot/asm/backend/targets/MyAnnotatedAnnotation.class b/test-classes-asm/soot/asm/backend/targets/MyAnnotatedAnnotation.class
diff --git a/test-classes-asm/soot/asm/backend/targets/MyEnum.class b/test-classes-asm/soot/asm/backend/targets/MyEnum.class
diff --git a/test-classes-asm/soot/asm/backend/targets/MyTestAnnotation.class b/test-classes-asm/soot/asm/backend/targets/MyTestAnnotation.class
diff --git a/test-classes-asm/soot/asm/backend/targets/Returns.class b/test-classes-asm/soot/asm/backend/targets/Returns.class
diff --git a/test-classes-asm/soot/asm/backend/targets/Stores.class b/test-classes-asm/soot/asm/backend/targets/Stores.class
diff --git a/test-classes-asm/soot/asm/backend/targets/TryCatch.class b/test-classes-asm/soot/asm/backend/targets/TryCatch.class
diff --git a/test-classes-asm/soot/asm/backend/targets/nullTypes.class b/test-classes-asm/soot/asm/backend/targets/nullTypes.class