interop-testing: use Activity.RESULT_OK (-1) instead of 0

ericgribkoff · web-flow · commit 3795417ed264 · 2017-08-11T17:39:52.000-07:00
diff --git a/android-interop-testing/README.md b/android-interop-testing/README.md
@@ -45,11 +45,11 @@ $ adb shell am instrument -w -e server_host <hostname or ip address> -e server_p
 
 If the test passed successfully, it will output:
 ```
-INSTRUMENTATION_RESULT: grpc test result=Succeed!!!
-INSTRUMENTATION_CODE: 0
+INSTRUMENTATION_RESULT: grpc test result=Success!
+INSTRUMENTATION_CODE: -1
 ```
 otherwise, output something like:
 ```
 INSTRUMENTATION_RESULT: grpc test result=Failed... : <exception stacktrace if applicable>
-INSTRUMENTATION_CODE: 1
+INSTRUMENTATION_CODE: 0
 ```
diff --git a/android-interop-testing/app/src/main/java/io/grpc/android/integrationtest/InteropTester.java b/android-interop-testing/app/src/main/java/io/grpc/android/integrationtest/InteropTester.java
@@ -60,7 +60,7 @@
  * Implementation of the integration tests, as an AsyncTask.
  */
 final class InteropTester extends AsyncTask<Void, Void, String> {
-  static final String SUCCESS_MESSAGE = "Succeed!!!";
+  static final String SUCCESS_MESSAGE = "Success!";
   static final String LOG_TAG = "GrpcTest";
 
   private ManagedChannel channel;
diff --git a/android-interop-testing/app/src/main/java/io/grpc/android/integrationtest/TesterInstrumentation.java b/android-interop-testing/app/src/main/java/io/grpc/android/integrationtest/TesterInstrumentation.java
@@ -16,6 +16,7 @@
 
 package io.grpc.android.integrationtest;
 
+import android.app.Activity;
 import android.app.Instrumentation;
 import android.os.Bundle;
 import android.util.Log;
@@ -88,17 +89,17 @@ public void onPostTest(String result) {
               Bundle bundle = new Bundle();
               bundle.putString("grpc test result", result);
               if (InteropTester.SUCCESS_MESSAGE.equals(result)) {
-                finish(0, bundle);
+                finish(Activity.RESULT_OK, bundle);
               } else {
-                finish(1, bundle);
+                finish(Activity.RESULT_CANCELED, bundle);
               }
             }
           },
           useGet).execute();
     } catch (Throwable t) {
       Bundle bundle = new Bundle();
       bundle.putString("Exception encountered", t.toString());
-      finish(1, bundle);
+      finish(Activity.RESULT_CANCELED, bundle);
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`
`17`	`17`	`package io.grpc.android.integrationtest;`
`18`	`18`
	`19`	`+import android.app.Activity;`
`19`	`20`	`import android.app.Instrumentation;`
`20`	`21`	`import android.os.Bundle;`
`21`	`22`	`import android.util.Log;`
`@@ -88,17 +89,17 @@ public void onPostTest(String result) {`
`88`	`89`	`Bundle bundle = new Bundle();`
`89`	`90`	`bundle.putString("grpc test result", result);`
`90`	`91`	`if (InteropTester.SUCCESS_MESSAGE.equals(result)) {`
`91`		`- finish(0, bundle);`
	`92`	`+ finish(Activity.RESULT_OK, bundle);`
`92`	`93`	`} else {`
`93`		`- finish(1, bundle);`
	`94`	`+ finish(Activity.RESULT_CANCELED, bundle);`
`94`	`95`	`}`
`95`	`96`	`}`
`96`	`97`	`},`
`97`	`98`	`useGet).execute();`
`98`	`99`	`} catch (Throwable t) {`
`99`	`100`	`Bundle bundle = new Bundle();`
`100`	`101`	`bundle.putString("Exception encountered", t.toString());`
`101`		`- finish(1, bundle);`
	`102`	`+ finish(Activity.RESULT_CANCELED, bundle);`
`102`	`103`	`}`
`103`	`104`	`}`
`104`	`105`	`}`