fix

radioegor146 · Feb 5, 2024 · a61697c · a61697c
1 parent d331e81
commit a61697c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/obfuscator/src/test/java/by/radioegor146/ClassicTest.java b/obfuscator/src/test/java/by/radioegor146/ClassicTest.java
@@ -150,6 +150,7 @@ public void execute() throws Throwable {
                         Arrays.asList("java",
                                 "-Djava.library.path=.",
                                 "-Dseed=1337",
+                                "-Dplatform=" + platform.name(),
                                 "-Dtest.src=" + temp.toString(),
                                 "-jar", resultJar.toString()));
                 System.out.println(String.format("Took %dms", testRunResult.execTime));

diff --git a/obfuscator/src/test/java/by/radioegor146/TestsGenerator.java b/obfuscator/src/test/java/by/radioegor146/TestsGenerator.java
@@ -44,7 +44,10 @@ public Stream<DynamicTest> generateTests() throws URISyntaxException, IOExceptio
         Objects.requireNonNull(tests, "No tests dir in resources");
 
         Path testDir = Paths.get(tests.toURI());
-        return Files.walk(testDir, FileVisitOption.FOLLOW_LINKS).filter(Files::isDirectory).filter(TestsGenerator::hasJavaFiles).filter(TestsGenerator::testAllowed).map(p -> DynamicTest.dynamicTest(testDir.relativize(p).toString(), new ClassicTest(p, testDir.relativize(p).toString())));
+        return Files.walk(testDir, FileVisitOption.FOLLOW_LINKS).filter(Files::isDirectory)
+                .filter(TestsGenerator::hasJavaFiles).filter(TestsGenerator::testAllowed)
+                .map(p -> DynamicTest.dynamicTest(testDir.relativize(p).toString(),
+                        new ClassicTest(p, testDir.relativize(p).toString())));
     }
 
     private static boolean hasJavaFiles(Path path) {

diff --git a/obfuscator/test_data/tests/clinit/TestClInitStacktrace/Test.java b/obfuscator/test_data/tests/clinit/TestClInitStacktrace/Test.java
@@ -3,6 +3,9 @@ public class Test {
     private static void printStackTrace() {
         StackTraceElement[] stack = new Exception().getStackTrace();
         for (int i = 0; i < stack.length; i++) {
+            if (System.getProperty("platform").equals("ANDROID") && stack[i].getClassName().equals("native0.hidden.Hidden0")) {
+                continue;
+            }
             System.out.printf("%d: %s.%s\n", i, stack[i].getClassName(), stack[i].getMethodName());
         }
     }