Trying to cleanup the messy test

Author: shai-almog

vm/tests/src/test/java/com/codename1/tools/translator/CompilerHelper.java

@@ -1,7 +1,10 @@
 package com.codename1.tools.translator;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -16,6 +19,7 @@
  * Helper class to manage external JDK compilers.
  */
 public class CompilerHelper {
+    private static String lastErrorLog;
 
     private static final Map<String, Path> availableJdks = new TreeMap<>();
 
@@ -157,11 +161,27 @@ public static int compile(Path jdkHome, List<String> args) throws IOException, I
 
         ProcessBuilder pb = new ProcessBuilder(command);
         // Inherit IO so we see errors in the log
-        pb.inheritIO();
+        pb.redirectErrorStream(true);
         Process p = pb.start();
+        lastErrorLog = "";
+        try (InputStream is = p.getInputStream();
+             ByteArrayOutputStream buffer = new ByteArrayOutputStream()) {
+
+            byte[] data = new byte[8192]; // 8 KB buffer
+            int n;
+            while ((n = is.read(data)) != -1) {
+                buffer.write(data, 0, n);
+            }
+
+            lastErrorLog = buffer.toString("UTF-8");
+        }
         return p.waitFor();
     }
 
+    public static String getLastErrorLog() {
+        return lastErrorLog;
+    }
+
     public static class CompilerConfig {
         public final String jdkVersion;
         public final Path jdkHome;

vm/tests/src/test/java/com/codename1/tools/translator/StackOverflowIntegrationTest.java

@@ -55,7 +55,8 @@ void throwsAndRecoversFromStackOverflow(CompilerHelper.CompilerConfig config) th
         compileArgs.add(sourceDir.resolve("StackOverflowApp.java").toString());
 
         int compileResult = CompilerHelper.compile(config.jdkHome, compileArgs);
-        assertEquals(0, compileResult, "StackOverflowApp should compile with " + config);
+        assertEquals(0, compileResult, "StackOverflowApp should compile with " + config +
+                " error: " + CompilerHelper.getLastErrorLog());
 
         CompilerHelper.copyDirectory(javaApiDir, classesDir);
         Files.copy(sourceDir.resolve("native_report.c"), classesDir.resolve("native_report.c"));
@@ -92,22 +93,12 @@ void throwsAndRecoversFromStackOverflow(CompilerHelper.CompilerConfig config) th
                 "StackOverflowApp probe run exited with code " + probeResult.exitCode
                         + ". Output:\n" + probeResult.output
                         + probeDiagnostics);
-        assertTrue(probeResult.output.contains("PROBE_CONSTANT"),
-                "StackOverflowApp probe run should succeed. Output was:\n" + probeResult.output + probeDiagnostics);
         ProcessResult smokeResult = runProcess(Arrays.asList(executable.toString(), "smoke"), buildDir);
         String smokeDiagnostics = buildDiagnostics(srcRoot, executable, smokeResult);
         assertEquals(0, smokeResult.exitCode,
                 "StackOverflowApp smoke run exited with code " + smokeResult.exitCode
                         + ". Output:\n" + smokeResult.output
                         + smokeDiagnostics);
-        assertTrue(smokeResult.output.contains("PROBE_CONSTANT_ONE"),
-                "StackOverflowApp smoke run should emit PROBE_CONSTANT_ONE. Output was:\n"
-                        + smokeResult.output + smokeDiagnostics);
-        assertTrue(smokeResult.output.contains("PROBE_CONSTANT_TWO"),
-                "StackOverflowApp smoke run should emit PROBE_CONSTANT_TWO. Output was:\n"
-                        + smokeResult.output
-                        + "\nMissing PROBE_CONSTANT_TWO suggests a crash between the first and second print."
-                        + smokeDiagnostics);
 
         ProcessResult result = runProcess(Arrays.asList(executable.toString(), "overflow", "run"), buildDir);
         String diagnostics = buildDiagnostics(srcRoot, executable, result);
@@ -121,10 +112,11 @@ void throwsAndRecoversFromStackOverflow(CompilerHelper.CompilerConfig config) th
 
     private String appSource() {
         return "public class StackOverflowApp {\n" +
+                "    private int counter;\n" +
                 "    private static native void report(String msg);\n" +
-                "    private static native void reportConstant();\n" +
-                "    private static native void reportConstantTwice();\n" +
                 "    private static void triggerOverflow() {\n" +
+                "        report(\"Calling ...\" + counter);\n" +
+                "        counter++;" +
                 "        triggerOverflow();\n" +
                 "    }\n" +
                 "    private static int boundedRecursion(int depth) {\n" +
@@ -134,14 +126,7 @@ private String appSource() {
                 "        return depth + boundedRecursion(depth - 1);\n" +
                 "    }\n" +
                 "    public static void main(String[] args) {\n" +
-                "        if (args == null || args.length == 0) {\n" +
-                "            reportConstant();\n" +
-                "            return;\n" +
-                "        }\n" +
-                "        if (args.length == 1) {\n" +
-                "            reportConstantTwice();\n" +
-                "            return;\n" +
-                "        }\n" +
+                "        report(\"Starting test...\");\n" +
                 "        try {\n" +
                 "            triggerOverflow();\n" +
                 "        } catch (StackOverflowError err) {\n" +
@@ -154,16 +139,6 @@ private String appSource() {
     private String nativeReportSource() {
         return "#include \"cn1_globals.h\"\n" +
                 "#include <stdio.h>\n" +
-                "void StackOverflowApp_reportConstant__(CODENAME_ONE_THREAD_STATE) {\n" +
-                "    printf(\"PROBE_CONSTANT\\n\");\n" +
-                "    fflush(stdout);\n" +
-                "}\n" +
-                "void StackOverflowApp_reportConstantTwice__(CODENAME_ONE_THREAD_STATE) {\n" +
-                "    printf(\"PROBE_CONSTANT_ONE\\n\");\n" +
-                "    fflush(stdout);\n" +
-                "    printf(\"PROBE_CONSTANT_TWO\\n\");\n" +
-                "    fflush(stdout);\n" +
-                "}\n" +
                 "void StackOverflowApp_report___java_lang_String(CODENAME_ONE_THREAD_STATE, JAVA_OBJECT msg) {\n" +
                 "    struct String_Struct {\n" +
                 "        JAVA_OBJECT header;\n" +
@@ -247,7 +222,9 @@ private String buildDiagnostics(Path srcRoot, Path executable, ProcessResult res
             diagnostics.append("\nreport snippet: ")
                     .append(extractSnippet(appSourceText, "StackOverflowApp_report___java_lang_String", 120));
         }
-        if (!result.output.isEmpty()) {
+        if (result.output.isEmpty()) {
+            diagnostics.append("\n***No output printed");
+        } else {
             diagnostics.append("\nOutput length: ").append(result.output.length());
         }
         return diagnostics.toString();