Chromium roll (https://codereview.chromium.org/976353002)

testing/android/java/src/org/chromium/native_test/ChromeNativeTestInstrumentationTestRunner.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.native_test;
 
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Environment;
 import android.util.Log;
 
-import org.chromium.net.test.TestServerSpawner;
-
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
  *  An Instrumentation that runs tests based on ChromeNativeTestActivity.
  */
 public class ChromeNativeTestInstrumentationTestRunner extends Instrumentation {
     // TODO(jbudorick): Remove this extra when b/18981674 is fixed.
     public static final String EXTRA_ONLY_OUTPUT_FAILURES =
             "org.chromium.native_test.ChromeNativeTestInstrumentationTestRunner."
                     + "OnlyOutputFailures";
-    public static final String EXTRA_ENABLE_TEST_SERVER_SPAWNER =
-            "org.chromium.native_test.ChromeNativeTestInstrumentationTestRunner."
-                    + "EnableTestServerSpawner";
 
     private static final String TAG = "ChromeNativeTestInstrumentationTestRunner";
 
     private static final int ACCEPT_TIMEOUT_MS = 5000;
     private static final Pattern RE_TEST_OUTPUT = Pattern.compile("\\[ *([^ ]*) *\\] ?([^ ]+) .*");
-    private static final int SERVER_SPAWNER_PORT = 0;
 
     private static interface ResultsBundleGenerator {
         public Bundle generate(Map<String, TestResult> rawResults);
     }
 
     private String mCommandLineFile;
     private String mCommandLineFlags;
     private File mStdoutFile;
     private Bundle mLogBundle;
     private ResultsBundleGenerator mBundleGenerator;
     private boolean mOnlyOutputFailures;
 
-    private boolean mEnableTestServerSpawner;
-    private TestServerSpawner mTestServerSpawner;
-    private Thread mTestServerSpawnerThread;
-
     @Override
     public void onCreate(Bundle arguments) {
         mCommandLineFile = arguments.getString(ChromeNativeTestActivity.EXTRA_COMMAND_LINE_FILE);
         mCommandLineFlags = arguments.getString(ChromeNativeTestActivity.EXTRA_COMMAND_LINE_FLAGS);
         try {
             mStdoutFile = File.createTempFile(
                     ".temp_stdout_", ".txt", Environment.getExternalStorageDirectory());
             Log.i(TAG, "stdout file created: " + mStdoutFile.getAbsolutePath());
         } catch (IOException e) {
             Log.e(TAG, "Unable to create temporary stdout file." + e.toString());
             finish(Activity.RESULT_CANCELED, new Bundle());
             return;
         }
         mLogBundle = new Bundle();
         mBundleGenerator = new RobotiumBundleGenerator();
         mOnlyOutputFailures = arguments.containsKey(EXTRA_ONLY_OUTPUT_FAILURES);
-        mEnableTestServerSpawner = arguments.containsKey(EXTRA_ENABLE_TEST_SERVER_SPAWNER);
-        mTestServerSpawner = null;
-        mTestServerSpawnerThread = null;
         start();
     }
 
     @Override
     public void onStart() {
         super.onStart();
-
-        setUp();
         Bundle results = runTests();
-        tearDown();
-
         finish(Activity.RESULT_OK, results);
     }
 
-    private void setUp() {
-        if (mEnableTestServerSpawner) {
-            Log.i(TAG, "Test server spawner enabled.");
-            try {
-                mTestServerSpawner = new TestServerSpawner(SERVER_SPAWNER_PORT, ACCEPT_TIMEOUT_MS);
-
-                File portFile = new File(
-                        Environment.getExternalStorageDirectory(), "net-test-server-ports");
-                OutputStreamWriter writer =
-                        new OutputStreamWriter(new FileOutputStream(portFile));
-                writer.write(Integer.toString(mTestServerSpawner.getServerPort()) + ":0");
-                writer.close();
-
-                mTestServerSpawnerThread = new Thread(mTestServerSpawner);
-                mTestServerSpawnerThread.start();
-            } catch (IOException e) {
-                Log.e(TAG, "Error creating TestServerSpawner: " + e.toString());
-            }
-        }
-    }
-
-    private void tearDown() {
-        if (mTestServerSpawnerThread != null) {
-            try {
-                mTestServerSpawner.stop();
-                mTestServerSpawnerThread.join();
-            } catch (InterruptedException e) {
-                Log.e(TAG, "Interrupted while shutting down test server spawner: " + e.toString());
-            }
-        }
-    }
-
     /** Runs the tests in the ChromeNativeTestActivity and returns a Bundle containing the results.
      */
     private Bundle runTests() {
         Log.i(TAG, "Creating activity.");
         Activity activityUnderTest = startNativeTestActivity();
 
         Log.i(TAG, "Waiting for tests to finish.");
         try {
             while (!activityUnderTest.isFinishing()) {
                 Thread.sleep(100);
@@ skipping 133 matching lines @@
             } else {
                 resultBuilder.append("\nOK (" + Integer.toString(testsPassed) + " tests)");
             }
             resultsBundle.putString(Instrumentation.REPORT_KEY_STREAMRESULT,
                     resultBuilder.toString());
             return resultsBundle;
         }
     }
 
 }