Skip to content

Commit

Permalink
Update deps (#556)
Browse files Browse the repository at this point in the history
* WIP listTestCases

* Update Tmp.kt

* Update Tmp.kt

* Update API JSON

* Update test_api

* Update picocli & set usageHelpAutoWidth

* Update dependencies

* Fix detekt lint errors

* Fix okhttp3 error

* Fix picocli deprecations

* Fix broken test

* Fix more deprecations

* Fix deprecation
  • Loading branch information
bootstraponline authored Jun 30, 2019
1 parent db71eb8 commit afb96d2
Show file tree
Hide file tree
Showing 67 changed files with 688 additions and 411 deletions.
1 change: 1 addition & 0 deletions firebase_apis/generate_java_client.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# xcode-select --install
# brew install python@2
# export PATH="/usr/local/opt/python@2/libexec/bin:$PATH"
# pip install --upgrade pip setuptools
# pip install .

# Generate only the testing library since the others are published officially already.
Expand Down
54 changes: 39 additions & 15 deletions firebase_apis/json/testing_v1.json
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@
}
}
},
"revision": "20190430",
"revision": "20190627",
"rootUrl": "https://testing.googleapis.com/",
"schemas": {
"Account": {
Expand Down Expand Up @@ -847,11 +847,11 @@
"properties": {
"obbFile": {
"$ref": "ObbFile",
"description": "A reference to an opaque binary blob file"
"description": "A reference to an opaque binary blob file."
},
"regularFile": {
"$ref": "RegularFile",
"description": "A reference to a regular file"
"description": "A reference to a regular file."
}
},
"type": "object"
Expand Down Expand Up @@ -945,7 +945,7 @@
"type": "object"
},
"GoogleAuto": {
"description": "Enables automatic Google account login.\nIf set, the service will automatically generate a Google test account and add\nit to the device, before executing the test. Note that test accounts might be\nreused.\nMany applications show their full set of functionalities when an account is\npresent on the device. Logging into the device with these generated accounts\nallows testing more functionalities.",
"description": "Enables automatic Google account login.\nIf set, the service automatically generates a Google test account and adds\nit to the device, before executing the test. Note that test accounts might be\nreused.\nMany applications show their full set of functionalities when an account is\npresent on the device. Logging into the device with these generated accounts\nallows testing more functionalities.",
"id": "GoogleAuto",
"properties": {},
"type": "object"
Expand Down Expand Up @@ -1129,7 +1129,7 @@
"type": "object"
},
"IosTestSetup": {
"description": "A description of how to set up an iOS device prior to a test.",
"description": "A description of how to set up an iOS device prior to running the test.",
"id": "IosTestSetup",
"properties": {
"networkProfile": {
Expand Down Expand Up @@ -1330,6 +1330,10 @@
"$ref": "GoogleCloudStorage",
"description": "Required."
},
"resultsUrl": {
"description": "Output only. URL to the results in the Firebase Web Console.",
"type": "string"
},
"toolResultsExecution": {
"$ref": "ToolResultsExecution",
"description": "Output only. The tool results execution that results are written to."
Expand Down Expand Up @@ -1377,10 +1381,12 @@
"id": "RoboStartingIntent",
"properties": {
"launcherActivity": {
"$ref": "LauncherActivityIntent"
"$ref": "LauncherActivityIntent",
"description": "An intent that starts the main launcher activity."
},
"startActivity": {
"$ref": "StartActivityIntent"
"$ref": "StartActivityIntent",
"description": "An intent that starts an activity with specific details."
},
"timeout": {
"description": "Timeout in seconds for each intent.",
Expand Down Expand Up @@ -1454,15 +1460,15 @@
"type": "object"
},
"TestExecution": {
"description": "Specifies a single test to be executed in a single environment.",
"description": "A single test executed in a single environment.",
"id": "TestExecution",
"properties": {
"environment": {
"$ref": "Environment",
"description": "Output only. How the host machine(s) are configured."
},
"id": {
"description": "Output only. Unique id set by the backend.",
"description": "Output only. Unique id set by the service.",
"type": "string"
},
"matrixId": {
Expand Down Expand Up @@ -1524,7 +1530,7 @@
"type": "object"
},
"TestMatrix": {
"description": "A group of one or more TestExecutions, built by taking a\nproduct of values over a pre-defined set of axes.",
"description": "TestMatrix captures all details about a test. It contains the environment\nconfiguration, test specification, test executions and overall state and\noutcome.",
"id": "TestMatrix",
"properties": {
"clientInfo": {
Expand All @@ -1533,7 +1539,7 @@
},
"environmentMatrix": {
"$ref": "EnvironmentMatrix",
"description": "Required. How the host machine(s) are configured."
"description": "Required. The devices the tests are being executed on."
},
"flakyTestAttempts": {
"description": "The number of times a TestExecution should be re-attempted if one or more\nof its test cases fail for any reason.\nThe maximum number of reruns allowed is 10.\n\nDefault is 0, which implies no reruns.",
Expand Down Expand Up @@ -1595,7 +1601,7 @@
"There is a conflict in the provided robo_directives.",
"There is at least one invalid resource name in the provided\nrobo directives",
"Invalid definition of action in the robo directives\n(e.g. a click or ignore action includes an input text field)",
"There there is no test loop intent filter, or the one that is given is\nnot formatted correctly.",
"There is no test loop intent filter, or the one that is given is\nnot formatted correctly.",
"The request contains a scenario label that was not declared in the\nmanifest.",
"There was an error when parsing a label's value.",
"The request contains a scenario number that was not declared in the\nmanifest.",
Expand All @@ -1614,6 +1620,24 @@
],
"type": "string"
},
"outcomeSummary": {
"description": "Output Only. The overall outcome of the test.\nOnly set when the test matrix state is FINISHED.",
"enum": [
"OUTCOME_SUMMARY_UNSPECIFIED",
"SUCCESS",
"FAILURE",
"INCONCLUSIVE",
"SKIPPED"
],
"enumDescriptions": [
"Do not use. For proto versioning only.",
"The test matrix run was successful, for instance:\n- All the test cases passed.\n- Robo did not detect a crash of the application under test.",
"A run failed, for instance:\n- One or more test case failed.\n- A test timed out.\n- The application under test crashed.",
"Something unexpected happened. The run should still be considered\nunsuccessful but this is likely a transient problem and re-running the\ntest might be successful.",
"All tests were skipped, for instance:\n- All device configurations were incompatible."
],
"type": "string"
},
"projectId": {
"description": "The cloud project that owns the test matrix.",
"type": "string"
Expand All @@ -1623,7 +1647,7 @@
"description": "Required. Where the results for the matrix are written."
},
"state": {
"description": "Output only. Indicates the current progress of the test matrix\n(e.g., FINISHED).",
"description": "Output only. Indicates the current progress of the test matrix.",
"enum": [
"TEST_STATE_UNSPECIFIED",
"VALIDATING",
Expand Down Expand Up @@ -1735,11 +1759,11 @@
"description": "An Android Application with a Test Loop."
},
"disablePerformanceMetrics": {
"description": "Disables performance metrics recording; may reduce test latency.",
"description": "Disables performance metrics recording. May reduce test latency.",
"type": "boolean"
},
"disableVideoRecording": {
"description": "Disables video recording; may reduce test latency.",
"description": "Disables video recording. May reduce test latency.",
"type": "boolean"
},
"iosTestSetup": {
Expand Down
12 changes: 9 additions & 3 deletions firebase_apis/json/toolresults_v1beta3.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"description": "Reads and publishes results from Firebase Test Lab.",
"discoveryVersion": "v1",
"documentationLink": "https://firebase.google.com/docs/test-lab/",
"etag": "\"VPK3KBfpaEgZ16pozGOoMYfKc0U/L2NlhyPOGzwB1sm_TzrKH1MPv5M\"",
"etag": "\"9eZ1uxVRThTDhLJCZHhqs3eQWz4/NCu3fWCbbpd11Za0iGB55K_72G0\"",
"icons": {
"x16": "https://www.gstatic.com/images/branding/product/1x/googleg_16dp.png",
"x32": "https://www.gstatic.com/images/branding/product/1x/googleg_32dp.png"
Expand Down Expand Up @@ -1271,7 +1271,7 @@
}
}
},
"revision": "20190508",
"revision": "20190627",
"rootUrl": "https://www.googleapis.com/",
"schemas": {
"AndroidAppInfo": {
Expand Down Expand Up @@ -2287,7 +2287,7 @@
"type": "object"
},
"Status": {
"description": "The `Status` type defines a logical error model that is suitable for different programming environments, including REST APIs and RPC APIs. It is used by [gRPC](https://github.com/grpc). The error model is designed to be:\n\n- Simple to use and understand for most users - Flexible enough to meet unexpected needs\n\n# Overview\n\nThe `Status` message contains three pieces of data: error code, error message, and error details. The error code should be an enum value of [google.rpc.Code][], but it may accept additional error codes if needed. The error message should be a developer-facing English message that helps developers *understand* and *resolve* the error. If a localized user-facing error message is needed, put the localized message in the error details or localize it in the client. The optional error details may contain arbitrary information about the error. There is a predefined set of error detail types in the package `google.rpc` that can be used for common error conditions.\n\n# Language mapping\n\nThe `Status` message is the logical representation of the error model, but it is not necessarily the actual wire format. When the `Status` message is exposed in different client libraries and different wire protocols, it can be mapped differently. For example, it will likely be mapped to some exceptions in Java, but more likely mapped to some error codes in C.\n\n# Other uses\n\nThe error model and the `Status` message can be used in a variety of environments, either with or without APIs, to provide a consistent developer experience across different environments.\n\nExample uses of this error model include:\n\n- Partial errors. If a service needs to return partial errors to the client, it may embed the `Status` in the normal response to indicate the partial errors.\n\n- Workflow errors. A typical workflow has multiple steps. Each step may have a `Status` message for error reporting.\n\n- Batch operations. If a client uses batch request and batch response, the `Status` message should be used directly inside batch response, one for each error sub-response.\n\n- Asynchronous operations. If an API call embeds asynchronous operation results in its response, the status of those operations should be represented directly using the `Status` message.\n\n- Logging. If some API errors are stored in logs, the message `Status` could be used directly after any stripping needed for security/privacy reasons.",
"description": "The `Status` type defines a logical error model that is suitable for different programming environments, including REST APIs and RPC APIs. It is used by [gRPC](https://github.com/grpc). Each `Status` message contains three pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the [API Design Guide](https://cloud.google.com/apis/design/errors).",
"id": "Status",
"properties": {
"code": {
Expand Down Expand Up @@ -2456,13 +2456,15 @@
"enum": [
"error",
"failed",
"flaky",
"passed",
"skipped"
],
"enumDescriptions": [
"",
"",
"",
"",
""
],
"type": "string"
Expand Down Expand Up @@ -2644,6 +2646,10 @@
"description": "A summary of a test suite result either parsed from XML or uploaded directly by a user.\n\nNote: the API related comments are for StepService only. This message is also being used in ExecutionService in a read only mode for the corresponding step.",
"id": "TestSuiteOverview",
"properties": {
"elapsedTime": {
"$ref": "Duration",
"description": "Elapsed time of test suite."
},
"errorCount": {
"description": "Number of test cases in error, typically set by the service by parsing the xml_source.\n\n- In create/response: always set - In update request: never",
"format": "int32",
Expand Down
4 changes: 2 additions & 2 deletions firebase_apis/test_api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

<groupId>com.google.apis</groupId>
<artifactId>google-api-services-testing</artifactId>
<version>v1-rev20190430-1.25.0-SNAPSHOT</version>
<name>Cloud Testing API v1-rev20190430-1.25.0-SNAPSHOT</name>
<version>v1-rev20190627-1.25.0-SNAPSHOT</version>
<name>Cloud Testing API v1-rev20190627-1.25.0-SNAPSHOT</name>
<packaging>jar</packaging>

<inceptionYear>2011</inceptionYear>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,29 +30,29 @@
public final class DeviceFile extends com.google.api.client.json.GenericJson {

/**
* A reference to an opaque binary blob file
* A reference to an opaque binary blob file.
* The value may be {@code null}.
*/
@com.google.api.client.util.Key
private ObbFile obbFile;

/**
* A reference to a regular file
* A reference to a regular file.
* The value may be {@code null}.
*/
@com.google.api.client.util.Key
private RegularFile regularFile;

/**
* A reference to an opaque binary blob file
* A reference to an opaque binary blob file.
* @return value or {@code null} for none
*/
public ObbFile getObbFile() {
return obbFile;
}

/**
* A reference to an opaque binary blob file
* A reference to an opaque binary blob file.
* @param obbFile obbFile or {@code null} for none
*/
public DeviceFile setObbFile(ObbFile obbFile) {
Expand All @@ -61,15 +61,15 @@ public DeviceFile setObbFile(ObbFile obbFile) {
}

/**
* A reference to a regular file
* A reference to a regular file.
* @return value or {@code null} for none
*/
public RegularFile getRegularFile() {
return regularFile;
}

/**
* A reference to a regular file
* A reference to a regular file.
* @param regularFile regularFile or {@code null} for none
*/
public DeviceFile setRegularFile(RegularFile regularFile) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
package com.google.api.services.testing.model;

/**
* Enables automatic Google account login. If set, the service will automatically generate a Google
* test account and add it to the device, before executing the test. Note that test accounts might
* be reused. Many applications show their full set of functionalities when an account is present on
* Enables automatic Google account login. If set, the service automatically generates a Google test
* account and adds it to the device, before executing the test. Note that test accounts might be
* reused. Many applications show their full set of functionalities when an account is present on
* the device. Logging into the device with these generated accounts allows testing more
* functionalities.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.google.api.services.testing.model;

/**
* A description of how to set up an iOS device prior to a test.
* A description of how to set up an iOS device prior to running the test.
*
* <p> This is the Java data model class that specifies how to parse/serialize into the JSON that is
* transmitted over HTTP when working with the Cloud Testing API. For a detailed explanation see:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ public final class ResultStorage extends com.google.api.client.json.GenericJson
@com.google.api.client.util.Key
private GoogleCloudStorage googleCloudStorage;

/**
* Output only. URL to the results in the Firebase Web Console.
* The value may be {@code null}.
*/
@com.google.api.client.util.Key
private java.lang.String resultsUrl;

/**
* Output only. The tool results execution that results are written to.
* The value may be {@code null}.
Expand Down Expand Up @@ -69,6 +76,23 @@ public ResultStorage setGoogleCloudStorage(GoogleCloudStorage googleCloudStorage
return this;
}

/**
* Output only. URL to the results in the Firebase Web Console.
* @return value or {@code null} for none
*/
public java.lang.String getResultsUrl() {
return resultsUrl;
}

/**
* Output only. URL to the results in the Firebase Web Console.
* @param resultsUrl resultsUrl or {@code null} for none
*/
public ResultStorage setResultsUrl(java.lang.String resultsUrl) {
this.resultsUrl = resultsUrl;
return this;
}

/**
* Output only. The tool results execution that results are written to.
* @return value or {@code null} for none
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,14 @@
public final class RoboStartingIntent extends com.google.api.client.json.GenericJson {

/**
* An intent that starts the main launcher activity.
* The value may be {@code null}.
*/
@com.google.api.client.util.Key
private LauncherActivityIntent launcherActivity;

/**
* An intent that starts an activity with specific details.
* The value may be {@code null}.
*/
@com.google.api.client.util.Key
Expand All @@ -49,13 +51,15 @@ public final class RoboStartingIntent extends com.google.api.client.json.Generic
private String timeout;

/**
* An intent that starts the main launcher activity.
* @return value or {@code null} for none
*/
public LauncherActivityIntent getLauncherActivity() {
return launcherActivity;
}

/**
* An intent that starts the main launcher activity.
* @param launcherActivity launcherActivity or {@code null} for none
*/
public RoboStartingIntent setLauncherActivity(LauncherActivityIntent launcherActivity) {
Expand All @@ -64,13 +68,15 @@ public RoboStartingIntent setLauncherActivity(LauncherActivityIntent launcherAct
}

/**
* An intent that starts an activity with specific details.
* @return value or {@code null} for none
*/
public StartActivityIntent getStartActivity() {
return startActivity;
}

/**
* An intent that starts an activity with specific details.
* @param startActivity startActivity or {@code null} for none
*/
public RoboStartingIntent setStartActivity(StartActivityIntent startActivity) {
Expand Down
Loading

0 comments on commit afb96d2

Please sign in to comment.