diff options
author | Ang Li <angli@google.com> | 2019-01-28 16:30:16 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-28 16:30:16 -0800 |
commit | e95b40a3249b47bb55de05cc53a25ae679ad9216 (patch) | |
tree | bfdef996639114127ae2ba09700c13e2c5e23085 /third_party/sl4a/src/main/java/com/google/android | |
parent | 69b6fb3bbd386b6a2743e2a4cf5bde8ac48c74ed (diff) | |
download | mobly-snippet-lib-e95b40a3249b47bb55de05cc53a25ae679ad9216.tar.gz |
Update toolchain and make the lib build again. (#100)
The presubmit command now works and generates a report.
Diffstat (limited to 'third_party/sl4a/src/main/java/com/google/android')
3 files changed, 7 insertions, 11 deletions
diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/SnippetRunner.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/SnippetRunner.java index f79a4b4..ea1d71f 100644 --- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/SnippetRunner.java +++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/SnippetRunner.java @@ -50,13 +50,11 @@ import java.util.Locale; * <li>'stop' action prints 'OK (0 tests)' * <li>'start' action prints nothing. * </ul> - * * <li>v1.0: New instrumentation output added to track bringup process * <ul> * <li>"SNIPPET START, PROTOCOL <major> <minor>" upon snippet start * <li>"SNIPPET SERVING, PORT <port>" once server is ready * </ul> - * * </ul> */ public class SnippetRunner extends AndroidJUnitRunner { diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/event/EventSnippet.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/event/EventSnippet.java index ee1a21a..05e044c 100644 --- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/event/EventSnippet.java +++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/event/EventSnippet.java @@ -40,9 +40,8 @@ public class EventSnippet implements Snippet { private final EventCache mEventCache = EventCache.getInstance(); @Rpc( - description = - "Blocks until an event of a specified type has been received. The returned event is removed from the cache. Default timeout is 60s." - ) + description = + "Blocks until an event of a specified type has been received. The returned event is removed from the cache. Default timeout is 60s.") public JSONObject eventWaitAndGet( String callbackId, String eventName, @Nullable Integer timeout) throws InterruptedException, JSONException, EventSnippetException { @@ -61,11 +60,10 @@ public class EventSnippet implements Snippet { } @Rpc( - description = - "Gets and removes all the events of a certain name that have been received so far. " - + "Non-blocking. Potentially racey since it does not guarantee no event of " - + "the same name will occur after the call." - ) + description = + "Gets and removes all the events of a certain name that have been received so far. " + + "Non-blocking. Potentially racey since it does not guarantee no event of " + + "the same name will occur after the call.") public List<JSONObject> eventGetAll(String callbackId, String eventName) throws InterruptedException, JSONException { String qId = EventCache.getQueueId(callbackId, eventName); diff --git a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/MethodDescriptor.java b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/MethodDescriptor.java index 7d3ca1f..11eb9ce 100644 --- a/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/MethodDescriptor.java +++ b/third_party/sl4a/src/main/java/com/google/android/mobly/snippet/rpc/MethodDescriptor.java @@ -91,7 +91,7 @@ public final class MethodDescriptor { // TODO(damonkohler): This signature is a bit weird (auto-refactored). The obvious alternative // would be to work on one supplied parameter and return the converted parameter. However, // that's problematic because you lose the ability to call the getXXX methods on the JSON array. - //@VisibleForTesting + // @VisibleForTesting private static Object convertParameter(final JSONArray parameters, int index, Type type) throws JSONException, RpcError { try { |