Skip to content

Commit ce1858b

Browse files
averikitschaverikitsch
authored
Update broken tests (GoogleCloudPlatform#1454)
* Add AutoValue dep and checkstyle fix * Checkstyle fix * Add error-prone plugin * Unused sample * Add Error-prone plugin * Update dependency * Fix compiler version * rollback changes
1 parent 3929880 commit ce1858b

File tree

17 files changed

+126
-417
lines changed

17 files changed

+126
-417
lines changed

‎appengine-java8/datastore-indexes-exploding/src/test/java/com/example/appengine/IndexesServletTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ public void doGet_emptyDatastore_writesNoWidgets() throws Exception {
8686
.isEqualTo("Got 0 widgets.\n");
8787
}
8888

89+
// CHECKSTYLE.OFF: VariableDeclarationUsageDistance
8990
@SuppressWarnings("VariableDeclarationUsageDistance")
9091
@Test
9192
public void doGet_repeatedPropertyEntities_writesWidgets() throws Exception {

‎appengine-java8/datastore/pom.xml

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<dependency>
4040
<groupId>com.google.appengine</groupId>
4141
<artifactId>appengine-api-1.0-sdk</artifactId>
42-
<version>1.9.71</version>
42+
<version>1.9.73</version>
4343
</dependency>
4444

4545
<dependency>
@@ -53,10 +53,16 @@
5353
<dependency>
5454
<groupId>com.google.auto.value</groupId>
5555
<artifactId>auto-value</artifactId>
56-
<version>1.5.4</version>
56+
<version>1.6.5</version>
5757
<scope>provided</scope>
5858
</dependency>
5959

60+
<dependency>
61+
<groupId>com.google.auto.value</groupId>
62+
<artifactId>auto-value-annotations</artifactId>
63+
<version>1.6.5</version>
64+
</dependency>
65+
6066
<dependency>
6167
<groupId>com.google.code.findbugs</groupId>
6268
<artifactId>jsr305</artifactId> <!-- @Nullable annotations -->
@@ -92,25 +98,25 @@
9298
<dependency>
9399
<groupId>com.google.appengine</groupId>
94100
<artifactId>appengine-testing</artifactId>
95-
<version>1.9.71</version>
101+
<version>1.9.73</version>
96102
<scope>test</scope>
97103
</dependency>
98104
<dependency>
99105
<groupId>com.google.appengine</groupId>
100106
<artifactId>appengine-api-stubs</artifactId>
101-
<version>1.9.71</version>
107+
<version>1.9.73</version>
102108
<scope>test</scope>
103109
</dependency>
104110
<dependency>
105111
<groupId>com.google.appengine</groupId>
106112
<artifactId>appengine-tools-sdk</artifactId>
107-
<version>1.9.71</version>
113+
<version>1.9.73</version>
108114
<scope>test</scope>
109115
</dependency>
110116
<dependency>
111117
<groupId>com.google.truth</groupId>
112118
<artifactId>truth</artifactId>
113-
<version>0.42</version>
119+
<version>0.44</version>
114120
<scope>test</scope>
115121
</dependency>
116122
</dependencies>
@@ -128,6 +134,20 @@
128134
<deploy.stopPreviousVersion>true</deploy.stopPreviousVersion>
129135
</configuration>
130136
</plugin>
137+
138+
<plugin>
139+
<artifactId>maven-compiler-plugin</artifactId>
140+
<version>3.8.0</version>
141+
<configuration>
142+
<annotationProcessorPaths>
143+
<annotationProcessorPath>
144+
<groupId>com.google.auto.value</groupId>
145+
<artifactId>auto-value</artifactId>
146+
<version>1.6.5</version>
147+
</annotationProcessorPath>
148+
</annotationProcessorPaths>
149+
</configuration>
150+
</plugin>
131151
</plugins>
132152
</build>
133153
</project>

‎appengine-java8/datastore/src/test/java/com/example/appengine/EntitiesTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ public void repeatedProperties_storesList() throws Exception {
218218
assertThat(retrievedFruits).containsExactlyElementsIn(favoriteFruit).inOrder();
219219
}
220220

221+
// CHECKSTYLE.OFF: VariableDeclarationUsageDistance
221222
@SuppressWarnings("VariableDeclarationUsageDistance")
222223
@Test
223224
public void embeddedEntity_fromEmbedded_embedsProperties() throws Exception {
@@ -240,6 +241,7 @@ public void embeddedEntity_fromEmbedded_embedsProperties() throws Exception {
240241
.named("got.homeAddress")
241242
.isEqualTo("123 Fake St, Made, UP 45678");
242243
}
244+
// CHECKSTYLE.ON: VariableDeclarationUsageDistance
243245

244246
private Key putEmployeeWithContactInfo(Entity contactInfo) {
245247
Entity employee = new Entity("Employee");

‎appengine/logs/pom.xml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,22 @@
7070
<!-- for hot reload of the web application -->
7171
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
7272
<plugins>
73-
<plugin>
73+
<plugin>
7474
<groupId>org.apache.maven.plugins</groupId>
75-
<version>3.3</version>
7675
<artifactId>maven-compiler-plugin</artifactId>
76+
<version>3.8.1</version>
7777
<configuration>
78-
<source>1.7</source>
79-
<target>1.7</target>
78+
<compilerArgs>
79+
<arg>-XDcompilePolicy=simple</arg>
80+
<arg>-Xplugin:ErrorProne</arg>
81+
</compilerArgs>
82+
<annotationProcessorPaths>
83+
<path>
84+
<groupId>com.google.errorprone</groupId>
85+
<artifactId>error_prone_core</artifactId>
86+
<version>2.3.3</version>
87+
</path>
88+
</annotationProcessorPaths>
8089
</configuration>
8190
</plugin>
8291
<plugin>

‎appengine/mail/pom.xml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,20 @@ Copyright 2016 Google Inc.
6161
<plugins>
6262
<plugin>
6363
<groupId>org.apache.maven.plugins</groupId>
64-
<version>3.3</version>
6564
<artifactId>maven-compiler-plugin</artifactId>
65+
<version>3.8.1</version>
6666
<configuration>
67-
<source>1.7</source>
68-
<target>1.7</target>
67+
<compilerArgs>
68+
<arg>-XDcompilePolicy=simple</arg>
69+
<arg>-Xplugin:ErrorProne</arg>
70+
</compilerArgs>
71+
<annotationProcessorPaths>
72+
<path>
73+
<groupId>com.google.errorprone</groupId>
74+
<artifactId>error_prone_core</artifactId>
75+
<version>2.3.3</version>
76+
</path>
77+
</annotationProcessorPaths>
6978
</configuration>
7079
</plugin>
7180
<plugin>

‎appengine/memcache/pom.xml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,19 @@ Copyright 2015 Google Inc.
7272
<plugin>
7373
<groupId>org.apache.maven.plugins</groupId>
7474
<artifactId>maven-compiler-plugin</artifactId>
75-
<version>3.3</version>
75+
<version>3.8.1</version>
7676
<configuration>
77-
<source>1.7</source>
78-
<target>1.7</target>
77+
<compilerArgs>
78+
<arg>-XDcompilePolicy=simple</arg>
79+
<arg>-Xplugin:ErrorProne</arg>
80+
</compilerArgs>
81+
<annotationProcessorPaths>
82+
<path>
83+
<groupId>com.google.errorprone</groupId>
84+
<artifactId>error_prone_core</artifactId>
85+
<version>2.3.3</version>
86+
</path>
87+
</annotationProcessorPaths>
7988
</configuration>
8089
</plugin>
8190
</plugins>

‎appengine/search/pom.xml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,20 @@ Copyright 2015 Google Inc.
9494
<plugins>
9595
<plugin>
9696
<groupId>org.apache.maven.plugins</groupId>
97-
<version>3.3</version>
9897
<artifactId>maven-compiler-plugin</artifactId>
98+
<version>3.8.1</version>
9999
<configuration>
100-
<source>1.7</source>
101-
<target>1.7</target>
100+
<compilerArgs>
101+
<arg>-XDcompilePolicy=simple</arg>
102+
<arg>-Xplugin:ErrorProne</arg>
103+
</compilerArgs>
104+
<annotationProcessorPaths>
105+
<path>
106+
<groupId>com.google.errorprone</groupId>
107+
<artifactId>error_prone_core</artifactId>
108+
<version>2.3.3</version>
109+
</path>
110+
</annotationProcessorPaths>
102111
</configuration>
103112
</plugin>
104113
<!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->

‎appengine/users/pom.xml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,20 @@ Copyright 2015 Google Inc.
108108
<plugins>
109109
<plugin>
110110
<groupId>org.apache.maven.plugins</groupId>
111-
<version>3.3</version>
112111
<artifactId>maven-compiler-plugin</artifactId>
112+
<version>3.8.1</version>
113113
<configuration>
114-
<source>1.7</source>
115-
<target>1.7</target>
114+
<compilerArgs>
115+
<arg>-XDcompilePolicy=simple</arg>
116+
<arg>-Xplugin:ErrorProne</arg>
117+
</compilerArgs>
118+
<annotationProcessorPaths>
119+
<path>
120+
<groupId>com.google.errorprone</groupId>
121+
<artifactId>error_prone_core</artifactId>
122+
<version>2.3.3</version>
123+
</path>
124+
</annotationProcessorPaths>
116125
</configuration>
117126
</plugin>
118127
<plugin>

‎compute/mailjet/pom.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,22 @@
8989
</plugin>
9090
<plugin>
9191
<groupId>org.apache.maven.plugins</groupId>
92-
<version>3.3</version>
9392
<artifactId>maven-compiler-plugin</artifactId>
93+
<version>3.8.1</version>
9494
<configuration>
9595
<source>1.8</source>
9696
<target>1.8</target>
97+
<compilerArgs>
98+
<arg>-XDcompilePolicy=simple</arg>
99+
<arg>-Xplugin:ErrorProne</arg>
100+
</compilerArgs>
101+
<annotationProcessorPaths>
102+
<path>
103+
<groupId>com.google.errorprone</groupId>
104+
<artifactId>error_prone_core</artifactId>
105+
<version>2.3.3</version>
106+
</path>
107+
</annotationProcessorPaths>
97108
</configuration>
98109
</plugin>
99110
</plugins>

‎flexible/cloud-tasks/README.md

Lines changed: 0 additions & 80 deletions
This file was deleted.

0 commit comments

Comments
 (0)