Restore Android instrumentation test stdout semantics

Author: shai-almog

scripts/android/tests/HelloCodenameOneInstrumentedTest.java

@@ -6,7 +6,6 @@
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.util.Base64;
-import android.util.Log;
 import android.util.DisplayMetrics;
 import android.view.View;
 
@@ -26,18 +25,17 @@
 import org.junit.Assume;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.junit.AfterClass;
 
 import java.io.ByteArrayOutputStream;
 import java.util.Locale;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import com.codename1.io.Log;
 
 @RunWith(AndroidJUnit4.class)
 public class HelloCodenameOneInstrumentedTest {
 
-    private static final String LOG_TAG = "CN1SS";
-    private static final int CHUNK_SIZE = 600;
+    private static final int CHUNK_SIZE = 2000;
     private static final String PREVIEW_CHANNEL = "PREVIEW";
     private static final int[] PREVIEW_JPEG_QUALITIES =
             new int[] {60, 50, 40, 35, 30, 25, 20, 18, 16, 14, 12, 10, 8, 6, 5, 4, 3, 2, 1};
@@ -47,7 +45,6 @@ public class HelloCodenameOneInstrumentedTest {
 
     private static void println(String s) {
         System.out.println(s);
-        Log.i(LOG_TAG, s);
     }
 
     private static void settle(long millis) {
@@ -193,7 +190,7 @@ private static ScreenshotCapture captureScreenshot(ActivityScenario<Activity> sc
                 }
             } catch (Throwable t) {
                 println("CN1SS:ERR:test=" + testName + " " + t);
-                com.codename1.io.Log.e(t);
+                Log.e(t);
             } finally {
                 latch.countDown();
             }
@@ -245,28 +242,21 @@ private static void emitScreenshotChannel(byte[] bytes, String testName, String
         for (int pos = 0; pos < b64.length(); pos += CHUNK_SIZE) {
             int end = Math.min(pos + CHUNK_SIZE, b64.length());
             String chunk = b64.substring(pos, end);
-            String line =
+            System.out.println(
                     prefix
                             + ":"
                             + safeName
                             + ":"
                             + String.format(Locale.US, "%06d", pos)
                             + ":"
-                            + chunk;
-            emitLine(line);
+                            + chunk);
             count++;
         }
         println("CN1SS:INFO:test=" + safeName + " chunks=" + count + " total_b64_len=" + b64.length());
-        String endLine = prefix + ":END:" + safeName;
-        emitLine(endLine);
+        System.out.println(prefix + ":END:" + safeName);
         System.out.flush();
     }
 
-    private static void emitLine(String line) {
-        System.out.println(line);
-        Log.i(LOG_TAG, line);
-    }
-
     private static void prepareBrowserComponentContent(ActivityScenario<Activity> scenario) throws InterruptedException {
         final CountDownLatch supportLatch = new CountDownLatch(1);
         final boolean[] supported = new boolean[1];
@@ -389,10 +379,4 @@ public void testBrowserComponentScreenshot() throws Exception {
 
         emitScreenshot(capture, BROWSER_TEST);
     }
-
-    @AfterClass
-    public static void suiteFinished() {
-        println("CN1SS:SUITE:FINISHED");
-        System.out.flush();
-    }
 }