Skip to content

Commit 934fdd9

Browse files
eamonnmcmanuseamonnmcmanus
authored
Remove PowerMock from nearly all samples, in favour of plain Mockito. (GoogleCloudPlatform#2853)
Also use the more usual `MockitoAnnotations.initMocks(this)` rather than `Mockito.mockitoSession().initMocks(this)`. Remove some unnecessary `throws` clauses. Pass a value through a second constructor rather than bashing a field with PowerMock's Whitebox.
1 parent 688b17f commit 934fdd9

File tree

54 files changed

+172
-618
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+172
-618
lines changed

‎functions/concepts/env-vars/pom.xml

-19
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
</parent>
3232

3333
<properties>
34-
<powermock.version>2.0.7</powermock.version>
3534
<maven.compiler.target>11</maven.compiler.target>
3635
<maven.compiler.source>11</maven.compiler.source>
3736
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -74,24 +73,6 @@
7473
<version>1.0.1</version>
7574
<scope>test</scope>
7675
</dependency>
77-
<dependency>
78-
<groupId>org.powermock</groupId>
79-
<artifactId>powermock-core</artifactId>
80-
<version>${powermock.version}</version>
81-
<scope>test</scope>
82-
</dependency>
83-
<dependency>
84-
<groupId>org.powermock</groupId>
85-
<artifactId>powermock-module-junit4</artifactId>
86-
<version>${powermock.version}</version>
87-
<scope>test</scope>
88-
</dependency>
89-
<dependency>
90-
<groupId>org.powermock</groupId>
91-
<artifactId>powermock-api-mockito2</artifactId>
92-
<version>${powermock.version}</version>
93-
<scope>test</scope>
94-
</dependency>
9576
</dependencies>
9677

9778
<!-- Disable tests during GCF builds (from parent POM) -->

‎functions/concepts/env-vars/src/test/java/functions/EnvVarsTest.java

+4-8
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package functions;
1818

1919
import static com.google.common.truth.Truth.assertThat;
20-
import static org.powermock.api.mockito.PowerMockito.mock;
20+
import static org.mockito.Mockito.when;
2121

2222
import com.google.cloud.functions.HttpRequest;
2323
import com.google.cloud.functions.HttpResponse;
@@ -31,8 +31,7 @@
3131
import org.junit.runner.RunWith;
3232
import org.junit.runners.JUnit4;
3333
import org.mockito.Mock;
34-
import org.mockito.Mockito;
35-
import org.powermock.api.mockito.PowerMockito;
34+
import org.mockito.MockitoAnnotations;
3635

3736
@RunWith(JUnit4.class)
3837
public class EnvVarsTest {
@@ -47,14 +46,11 @@ public class EnvVarsTest {
4746

4847
@Before
4948
public void beforeTest() throws IOException {
50-
Mockito.mockitoSession().initMocks(this);
51-
52-
request = mock(HttpRequest.class);
53-
response = mock(HttpResponse.class);
49+
MockitoAnnotations.initMocks(this);
5450

5551
responseOut = new StringWriter();
5652
writerOut = new BufferedWriter(responseOut);
57-
PowerMockito.when(response.getWriter()).thenReturn(writerOut);
53+
when(response.getWriter()).thenReturn(writerOut);
5854
}
5955

6056
@Test

‎functions/concepts/execution-count/pom.xml

+3-16
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
</parent>
3232

3333
<properties>
34-
<powermock.version>2.0.7</powermock.version>
3534
<maven.compiler.target>11</maven.compiler.target>
3635
<maven.compiler.source>11</maven.compiler.source>
3736
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,21 +66,9 @@
6766
<scope>test</scope>
6867
</dependency>
6968
<dependency>
70-
<groupId>org.powermock</groupId>
71-
<artifactId>powermock-core</artifactId>
72-
<version>${powermock.version}</version>
73-
<scope>test</scope>
74-
</dependency>
75-
<dependency>
76-
<groupId>org.powermock</groupId>
77-
<artifactId>powermock-module-junit4</artifactId>
78-
<version>${powermock.version}</version>
79-
<scope>test</scope>
80-
</dependency>
81-
<dependency>
82-
<groupId>org.powermock</groupId>
83-
<artifactId>powermock-api-mockito2</artifactId>
84-
<version>${powermock.version}</version>
69+
<groupId>org.mockito</groupId>
70+
<artifactId>mockito-core</artifactId>
71+
<version>3.3.3</version>
8572
<scope>test</scope>
8673
</dependency>
8774
</dependencies>

‎functions/concepts/execution-count/src/test/java/functions/ExecutionCountTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
package functions;
1818

1919
import static com.google.common.truth.Truth.assertThat;
20-
import static org.powermock.api.mockito.PowerMockito.mock;
20+
import static org.mockito.Mockito.mock;
21+
import static org.mockito.Mockito.when;
2122

2223
import com.google.cloud.functions.HttpRequest;
2324
import com.google.cloud.functions.HttpResponse;
@@ -29,7 +30,6 @@
2930
import org.junit.runner.RunWith;
3031
import org.junit.runners.JUnit4;
3132
import org.mockito.Mock;
32-
import org.powermock.api.mockito.PowerMockito;
3333

3434
@RunWith(JUnit4.class)
3535
public class ExecutionCountTest {
@@ -46,7 +46,7 @@ public void beforeTest() throws IOException {
4646

4747
responseOut = new StringWriter();
4848
writerOut = new BufferedWriter(responseOut);
49-
PowerMockito.when(response.getWriter()).thenReturn(writerOut);
49+
when(response.getWriter()).thenReturn(writerOut);
5050
}
5151

5252
@Test

‎functions/concepts/file-system/pom.xml

-20
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
</parent>
3232

3333
<properties>
34-
<powermock.version>2.0.7</powermock.version>
3534
<maven.compiler.target>11</maven.compiler.target>
3635
<maven.compiler.source>11</maven.compiler.source>
3736
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -60,31 +59,12 @@
6059
<scope>test</scope>
6160
</dependency>
6261

63-
<!-- Required for mocking env vars -->
6462
<dependency>
6563
<groupId>com.google.truth</groupId>
6664
<artifactId>truth</artifactId>
6765
<version>1.0.1</version>
6866
<scope>test</scope>
6967
</dependency>
70-
<dependency>
71-
<groupId>org.powermock</groupId>
72-
<artifactId>powermock-core</artifactId>
73-
<version>${powermock.version}</version>
74-
<scope>test</scope>
75-
</dependency>
76-
<dependency>
77-
<groupId>org.powermock</groupId>
78-
<artifactId>powermock-module-junit4</artifactId>
79-
<version>${powermock.version}</version>
80-
<scope>test</scope>
81-
</dependency>
82-
<dependency>
83-
<groupId>org.powermock</groupId>
84-
<artifactId>powermock-api-mockito2</artifactId>
85-
<version>${powermock.version}</version>
86-
<scope>test</scope>
87-
</dependency>
8868
</dependencies>
8969

9070
<!-- Disable tests during GCF builds (from parent POM) -->

‎functions/concepts/file-system/src/test/java/functions/FileSystemTest.java

+4-8
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
package functions;
1818

1919
import static com.google.common.truth.Truth.assertThat;
20-
import static org.powermock.api.mockito.PowerMockito.mock;
21-
import static org.powermock.api.mockito.PowerMockito.when;
20+
import static org.mockito.Mockito.when;
2221

2322
import com.google.cloud.functions.HttpRequest;
2423
import com.google.cloud.functions.HttpResponse;
@@ -33,7 +32,7 @@
3332
import org.junit.runners.JUnit4;
3433
import org.mockito.Mock;
3534
import org.mockito.Mockito;
36-
import org.powermock.api.mockito.PowerMockito;
35+
import org.mockito.MockitoAnnotations;
3736

3837
@RunWith(JUnit4.class)
3938
public class FileSystemTest {
@@ -45,14 +44,11 @@ public class FileSystemTest {
4544

4645
@Before
4746
public void beforeTest() throws IOException {
48-
Mockito.mockitoSession().initMocks(this);
49-
50-
request = mock(HttpRequest.class);
51-
response = mock(HttpResponse.class);
47+
MockitoAnnotations.initMocks(this);
5248

5349
responseOut = new StringWriter();
5450
writerOut = new BufferedWriter(responseOut);
55-
PowerMockito.when(response.getWriter()).thenReturn(writerOut);
51+
when(response.getWriter()).thenReturn(writerOut);
5652
}
5753

5854
@Test

‎functions/concepts/lazy-fields/pom.xml

-19
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
</parent>
3232

3333
<properties>
34-
<powermock.version>2.0.7</powermock.version>
3534
<maven.compiler.target>11</maven.compiler.target>
3635
<maven.compiler.source>11</maven.compiler.source>
3736
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -66,24 +65,6 @@
6665
<version>1.0.1</version>
6766
<scope>test</scope>
6867
</dependency>
69-
<dependency>
70-
<groupId>org.powermock</groupId>
71-
<artifactId>powermock-core</artifactId>
72-
<version>${powermock.version}</version>
73-
<scope>test</scope>
74-
</dependency>
75-
<dependency>
76-
<groupId>org.powermock</groupId>
77-
<artifactId>powermock-module-junit4</artifactId>
78-
<version>${powermock.version}</version>
79-
<scope>test</scope>
80-
</dependency>
81-
<dependency>
82-
<groupId>org.powermock</groupId>
83-
<artifactId>powermock-api-mockito2</artifactId>
84-
<version>${powermock.version}</version>
85-
<scope>test</scope>
86-
</dependency>
8768
</dependencies>
8869

8970
<!-- Disable tests during GCF builds (from parent POM) -->

‎functions/concepts/lazy-fields/src/test/java/functions/LazyFieldsTest.java

+5-8
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,20 @@
1717
package functions;
1818

1919
import static com.google.common.truth.Truth.assertThat;
20-
import static org.powermock.api.mockito.PowerMockito.mock;
21-
import static org.powermock.api.mockito.PowerMockito.when;
20+
import static org.mockito.Mockito.mock;
21+
import static org.mockito.Mockito.when;
2222

2323
import com.google.cloud.functions.HttpRequest;
2424
import com.google.cloud.functions.HttpResponse;
25-
import java.io.BufferedReader;
2625
import java.io.BufferedWriter;
2726
import java.io.IOException;
28-
import java.io.StringReader;
2927
import java.io.StringWriter;
3028
import org.junit.Before;
3129
import org.junit.Test;
3230
import org.junit.runner.RunWith;
3331
import org.junit.runners.JUnit4;
3432
import org.mockito.Mock;
35-
import org.mockito.Mockito;
36-
import org.powermock.api.mockito.PowerMockito;
33+
import org.mockito.MockitoAnnotations;
3734

3835
@RunWith(JUnit4.class)
3936
public class LazyFieldsTest {
@@ -45,14 +42,14 @@ public class LazyFieldsTest {
4542

4643
@Before
4744
public void beforeTest() throws IOException {
48-
Mockito.mockitoSession().initMocks(this);
45+
MockitoAnnotations.initMocks(this);
4946

5047
request = mock(HttpRequest.class);
5148
response = mock(HttpResponse.class);
5249

5350
responseOut = new StringWriter();
5451
writerOut = new BufferedWriter(responseOut);
55-
PowerMockito.when(response.getWriter()).thenReturn(writerOut);
52+
when(response.getWriter()).thenReturn(writerOut);
5653
}
5754

5855
@Test

‎functions/concepts/retry-pubsub/pom.xml

-19
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
</parent>
3232

3333
<properties>
34-
<powermock.version>2.0.7</powermock.version>
3534
<maven.compiler.target>11</maven.compiler.target>
3635
<maven.compiler.source>11</maven.compiler.source>
3736
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -71,24 +70,6 @@
7170
<version>1.0.1</version>
7271
<scope>test</scope>
7372
</dependency>
74-
<dependency>
75-
<groupId>org.powermock</groupId>
76-
<artifactId>powermock-core</artifactId>
77-
<version>${powermock.version}</version>
78-
<scope>test</scope>
79-
</dependency>
80-
<dependency>
81-
<groupId>org.powermock</groupId>
82-
<artifactId>powermock-module-junit4</artifactId>
83-
<version>${powermock.version}</version>
84-
<scope>test</scope>
85-
</dependency>
86-
<dependency>
87-
<groupId>org.powermock</groupId>
88-
<artifactId>powermock-api-mockito2</artifactId>
89-
<version>${powermock.version}</version>
90-
<scope>test</scope>
91-
</dependency>
9273
<dependency>
9374
<groupId>com.google.guava</groupId>
9475
<artifactId>guava-testlib</artifactId>

‎functions/concepts/retry-pubsub/src/test/java/functions/RetryPubSubTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.util.Base64;
2626
import java.util.logging.Logger;
2727
import org.junit.After;
28-
import org.junit.Before;
2928
import org.junit.BeforeClass;
3029
import org.junit.Test;
3130
import org.junit.runner.RunWith;

‎functions/concepts/retry-timeout/pom.xml

-19
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
</parent>
3232

3333
<properties>
34-
<powermock.version>2.0.7</powermock.version>
3534
<maven.compiler.target>11</maven.compiler.target>
3635
<maven.compiler.source>11</maven.compiler.source>
3736
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -72,24 +71,6 @@
7271
<version>1.0.1</version>
7372
<scope>test</scope>
7473
</dependency>
75-
<dependency>
76-
<groupId>org.powermock</groupId>
77-
<artifactId>powermock-core</artifactId>
78-
<version>${powermock.version}</version>
79-
<scope>test</scope>
80-
</dependency>
81-
<dependency>
82-
<groupId>org.powermock</groupId>
83-
<artifactId>powermock-module-junit4</artifactId>
84-
<version>${powermock.version}</version>
85-
<scope>test</scope>
86-
</dependency>
87-
<dependency>
88-
<groupId>org.powermock</groupId>
89-
<artifactId>powermock-api-mockito2</artifactId>
90-
<version>${powermock.version}</version>
91-
<scope>test</scope>
92-
</dependency>
9374
<dependency>
9475
<groupId>com.google.guava</groupId>
9576
<artifactId>guava-testlib</artifactId>

0 commit comments

Comments
 (0)