Regenerate test api (Flank#269)

miguelslemos · Aug 28, 2018 · 9aa8ed4 · 9aa8ed4
1 parent acba9b6
commit 9aa8ed4
Show file tree

Hide file tree

Showing 14 changed files with 334 additions and 125 deletions.
diff --git a/firebase_apis/generate_java_client.sh b/firebase_apis/generate_java_client.sh
@@ -2,7 +2,8 @@
 
 # Note: Must have already installed google-apis-client-generator from the master branch. PIP release will not work!
 
-pushd apis
+# git clone https://github.com/google/apis-client-generator.git
+# pip install .
 
 # Generate only the testing library since the others are published officially already.
 
@@ -11,15 +12,15 @@ pushd apis
 #     --language=java \
 #     --output_dir=./storage
 
-rm -rf "./testing/src/"
+rm -rf "./test_api/src/"
 
  generate_library \
-    --input=./testing_v1.json \
+    --input=./json/testing_v1.json \
     --language=java \
     --package_path=api/services \
-    --output_dir=./testing/src/main/java
+    --output_dir=./test_api/src/main/java
 
-mv ./testing/src/main/java/pom.xml ./testing/pom.xml
+mv ./test_api/src/main/java/pom.xml ./test_api/pom.xml
 
 #  generate_library \
 #     --input=./toolresults_v1beta3.json \

diff --git a/firebase_apis/test_api/pom.xml b/firebase_apis/test_api/pom.xml
@@ -0,0 +1,84 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>7</version>
+  </parent>
+
+  <groupId>com.google.apis</groupId>
+  <artifactId>google-api-services-testing</artifactId>
+  <version>v1-rev0-1.22.0-SNAPSHOT</version>
+  <name>Cloud Testing API v1-rev0-1.22.0-SNAPSHOT</name>
+  <packaging>jar</packaging>
+
+  <inceptionYear>2011</inceptionYear>
+
+  <organization>
+    <name>Google</name>
+    <url>http://www.google.com/</url>
+  </organization>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Built-By>Google</Built-By>
+              <Build-Jdk>1.6.x</Build-Jdk>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.7</version>
+        <configuration>
+          <doctitle>Cloud Testing API ${project.version}</doctitle>
+          <windowtitle>Cloud Testing API ${project.version}</windowtitle>
+          <links>
+            <link>http://docs.oracle.com/javase/7/docs/api</link>
+
+            <link>http://javadoc.google-http-java-client.googlecode.com/hg/1.22.0-SNAPSHOT</link>
+
+            <link>http://javadoc.google-oauth-java-client.googlecode.com/hg/1.22.0-SNAPSHOT</link>
+
+            <link>http://javadoc.google-api-java-client.googlecode.com/hg/1.22.0-SNAPSHOT</link>
+          </links>
+        </configuration>
+      </plugin>
+    </plugins>
+    <sourceDirectory>.</sourceDirectory>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.api-client</groupId>
+      <artifactId>google-api-client</artifactId>
+      <version>1.22.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+</project>
diff --git a/firebase_apis/test_api/src/main/java/com/google/api/services/testing/Testing.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/Testing.java
@@ -196,11 +196,6 @@ public GetApkDetails setAlt(java.lang.String alt) {
         return (GetApkDetails) super.setAlt(alt);
       }
 
-      @Override
-      public GetApkDetails setBearerToken(java.lang.String bearerToken) {
-        return (GetApkDetails) super.setBearerToken(bearerToken);
-      }
-
       @Override
       public GetApkDetails setCallback(java.lang.String callback) {
         return (GetApkDetails) super.setCallback(callback);
@@ -221,11 +216,6 @@ public GetApkDetails setOauthToken(java.lang.String oauthToken) {
         return (GetApkDetails) super.setOauthToken(oauthToken);
       }
 
-      @Override
-      public GetApkDetails setPp(java.lang.Boolean pp) {
-        return (GetApkDetails) super.setPp(pp);
-      }
-
       @Override
       public GetApkDetails setPrettyPrint(java.lang.Boolean prettyPrint) {
         return (GetApkDetails) super.setPrettyPrint(prettyPrint);
@@ -365,11 +355,6 @@ public Cancel setAlt(java.lang.String alt) {
           return (Cancel) super.setAlt(alt);
         }
 
-        @Override
-        public Cancel setBearerToken(java.lang.String bearerToken) {
-          return (Cancel) super.setBearerToken(bearerToken);
-        }
-
         @Override
         public Cancel setCallback(java.lang.String callback) {
           return (Cancel) super.setCallback(callback);
@@ -390,11 +375,6 @@ public Cancel setOauthToken(java.lang.String oauthToken) {
           return (Cancel) super.setOauthToken(oauthToken);
         }
 
-        @Override
-        public Cancel setPp(java.lang.Boolean pp) {
-          return (Cancel) super.setPp(pp);
-        }
-
         @Override
         public Cancel setPrettyPrint(java.lang.Boolean prettyPrint) {
           return (Cancel) super.setPrettyPrint(prettyPrint);
@@ -524,11 +504,6 @@ public Create setAlt(java.lang.String alt) {
           return (Create) super.setAlt(alt);
         }
 
-        @Override
-        public Create setBearerToken(java.lang.String bearerToken) {
-          return (Create) super.setBearerToken(bearerToken);
-        }
-
         @Override
         public Create setCallback(java.lang.String callback) {
           return (Create) super.setCallback(callback);
@@ -549,11 +524,6 @@ public Create setOauthToken(java.lang.String oauthToken) {
           return (Create) super.setOauthToken(oauthToken);
         }
 
-        @Override
-        public Create setPp(java.lang.Boolean pp) {
-          return (Create) super.setPp(pp);
-        }
-
         @Override
         public Create setPrettyPrint(java.lang.Boolean prettyPrint) {
           return (Create) super.setPrettyPrint(prettyPrint);
@@ -701,11 +671,6 @@ public Get setAlt(java.lang.String alt) {
           return (Get) super.setAlt(alt);
         }
 
-        @Override
-        public Get setBearerToken(java.lang.String bearerToken) {
-          return (Get) super.setBearerToken(bearerToken);
-        }
-
         @Override
         public Get setCallback(java.lang.String callback) {
           return (Get) super.setCallback(callback);
@@ -726,11 +691,6 @@ public Get setOauthToken(java.lang.String oauthToken) {
           return (Get) super.setOauthToken(oauthToken);
         }
 
-        @Override
-        public Get setPp(java.lang.Boolean pp) {
-          return (Get) super.setPp(pp);
-        }
-
         @Override
         public Get setPrettyPrint(java.lang.Boolean prettyPrint) {
           return (Get) super.setPrettyPrint(prettyPrint);
@@ -888,11 +848,6 @@ public Get setAlt(java.lang.String alt) {
         return (Get) super.setAlt(alt);
       }
 
-      @Override
-      public Get setBearerToken(java.lang.String bearerToken) {
-        return (Get) super.setBearerToken(bearerToken);
-      }
-
       @Override
       public Get setCallback(java.lang.String callback) {
         return (Get) super.setCallback(callback);
@@ -913,11 +868,6 @@ public Get setOauthToken(java.lang.String oauthToken) {
         return (Get) super.setOauthToken(oauthToken);
       }
 
-      @Override
-      public Get setPp(java.lang.Boolean pp) {
-        return (Get) super.setPp(pp);
-      }
-
       @Override
       public Get setPrettyPrint(java.lang.Boolean prettyPrint) {
         return (Get) super.setPrettyPrint(prettyPrint);

diff --git a/firebase_apis/test_api/src/main/java/com/google/api/services/testing/TestingRequest.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/TestingRequest.java
@@ -95,23 +95,6 @@ public TestingRequest<T> setAlt(java.lang.String alt) {
     return this;
   }
 
-  /** OAuth bearer token. */
-  @com.google.api.client.util.Key("bearer_token")
-  private java.lang.String bearerToken;
-
-  /**
-   * OAuth bearer token.
-   */
-  public java.lang.String getBearerToken() {
-    return bearerToken;
-  }
-
-  /** OAuth bearer token. */
-  public TestingRequest<T> setBearerToken(java.lang.String bearerToken) {
-    this.bearerToken = bearerToken;
-    return this;
-  }
-
   /** JSONP */
   @com.google.api.client.util.Key
   private java.lang.String callback;
@@ -187,23 +170,6 @@ public TestingRequest<T> setOauthToken(java.lang.String oauthToken) {
     return this;
   }
 
-  /** Pretty-print response. */
-  @com.google.api.client.util.Key
-  private java.lang.Boolean pp;
-
-  /**
-   * Pretty-print response. [default: true]
-   */
-  public java.lang.Boolean getPp() {
-    return pp;
-  }
-
-  /** Pretty-print response. */
-  public TestingRequest<T> setPp(java.lang.Boolean pp) {
-    this.pp = pp;
-    return this;
-  }
-
   /** Returns response with indentations and line breaks. */
   @com.google.api.client.util.Key
   private java.lang.Boolean prettyPrint;

diff --git a/...t_api/src/main/java/com/google/api/services/testing/model/AndroidInstrumentationTest.java b/...t_api/src/main/java/com/google/api/services/testing/model/AndroidInstrumentationTest.java
@@ -35,7 +35,7 @@
 public final class AndroidInstrumentationTest extends com.google.api.client.json.GenericJson {
 
   /**
-   * The APK for the application under test. Required
+   * The APK for the application under test.
    * The value may be {@code null}.
    */
   @com.google.api.client.util.Key
@@ -59,7 +59,7 @@ public final class AndroidInstrumentationTest extends com.google.api.client.json
    *
    * for more information about Android Test Orchestrator.
    *
-   * Optional, if empty, test will be run without orchestrator.
+   * Optional. If not set, the test will be run without the orchestrator.
    * The value may be {@code null}.
    */
   @com.google.api.client.util.Key
@@ -100,15 +100,15 @@ public final class AndroidInstrumentationTest extends com.google.api.client.json
   private java.util.List<java.lang.String> testTargets;
 
   /**
-   * The APK for the application under test. Required
+   * The APK for the application under test.
    * @return value or {@code null} for none
    */
   public FileReference getAppApk() {
     return appApk;
   }
 
   /**
-   * The APK for the application under test. Required
+   * The APK for the application under test.
    * @param appApk appApk or {@code null} for none
    */
   public AndroidInstrumentationTest setAppApk(FileReference appApk) {
@@ -145,7 +145,7 @@ public AndroidInstrumentationTest setAppPackageId(java.lang.String appPackageId)
    *
    * for more information about Android Test Orchestrator.
    *
-   * Optional, if empty, test will be run without orchestrator.
+   * Optional. If not set, the test will be run without the orchestrator.
    * @return value or {@code null} for none
    */
   public java.lang.String getOrchestratorOption() {
@@ -162,7 +162,7 @@ public java.lang.String getOrchestratorOption() {
    *
    * for more information about Android Test Orchestrator.
    *
-   * Optional, if empty, test will be run without orchestrator.
+   * Optional. If not set, the test will be run without the orchestrator.
    * @param orchestratorOption orchestratorOption or {@code null} for none
    */
   public AndroidInstrumentationTest setOrchestratorOption(java.lang.String orchestratorOption) {

diff --git a/...se_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidRoboTest.java b/...se_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidRoboTest.java
@@ -31,7 +31,7 @@
 public final class AndroidRoboTest extends com.google.api.client.json.GenericJson {
 
   /**
-   * The APK for the application under test. Required
+   * The APK for the application under test.
    * The value may be {@code null}.
    */
   @com.google.api.client.util.Key
@@ -93,15 +93,15 @@ public final class AndroidRoboTest extends com.google.api.client.json.GenericJso
   private java.util.List<RoboStartingIntent> startingIntents;
 
   /**
-   * The APK for the application under test. Required
+   * The APK for the application under test.
    * @return value or {@code null} for none
    */
   public FileReference getAppApk() {
     return appApk;
   }
 
   /**
-   * The APK for the application under test. Required
+   * The APK for the application under test.
    * @param appApk appApk or {@code null} for none
    */
   public AndroidRoboTest setAppApk(FileReference appApk) {

diff --git a/..._api/src/main/java/com/google/api/services/testing/model/AndroidRuntimeConfiguration.java b/..._api/src/main/java/com/google/api/services/testing/model/AndroidRuntimeConfiguration.java
@@ -17,7 +17,7 @@
 package com.google.api.services.testing.model;
 
 /**
- * Configuration that can be selected at the time a test is run.
+ * Android configuration that can be selected at the time a test is run.
  *
  * <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: