Update assertNotNull (GoogleCloudPlatform#4397)

eaball35 · web-flow · commit 81b8961678b0 · 2020-12-09T13:25:48.000-08:00
* Update assertNotNull Updating import junit.framework.TestCase.assertNotNull issue GoogleCloudPlatform#3694 * Update assertEqual + assertTrue GoogleCloudPlatform#3694 * fix import order * update import order * Update CreateJobFromAdHocTest.java
diff --git a/appengine-java11/tasks/src/test/java/com/example/task/CreateTaskIT.java b/appengine-java11/tasks/src/test/java/com/example/task/CreateTaskIT.java
@@ -17,7 +17,7 @@
 package com.example.task;
 
 import static com.google.common.truth.Truth.assertThat;
-import static junit.framework.TestCase.assertNotNull;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
diff --git a/appengine-java8/tasks/quickstart/src/test/java/com/example/task/CreateTaskIT.java b/appengine-java8/tasks/quickstart/src/test/java/com/example/task/CreateTaskIT.java
@@ -17,7 +17,7 @@
 package com.example.task;
 
 import static com.google.common.truth.Truth.assertThat;
-import static junit.framework.TestCase.assertNotNull;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
diff --git a/cdn/signed-urls/src/test/java/com/google/cdn/SignedUrlsTest.java b/cdn/signed-urls/src/test/java/com/google/cdn/SignedUrlsTest.java
@@ -18,7 +18,7 @@
 package com.google.cdn;
 
 import static com.google.cdn.SignedUrls.signUrl;
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 import java.util.Base64;
 import java.util.Date;
diff --git a/container-registry/container-analysis/src/test/java/com/example/containeranalysis/SamplesTest.java b/container-registry/container-analysis/src/test/java/com/example/containeranalysis/SamplesTest.java
@@ -17,8 +17,8 @@
 package com.example.containeranalysis;
 
 import static java.lang.Thread.sleep;
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import com.google.api.gax.rpc.AlreadyExistsException;
 import com.google.api.gax.rpc.NotFoundException;
diff --git a/healthcare/v1/src/test/java/snippets/healthcare/DatasetTests.java b/healthcare/v1/src/test/java/snippets/healthcare/DatasetTests.java
@@ -16,8 +16,8 @@
 
 package snippets.healthcare;
 
-import static junit.framework.TestCase.assertNotNull;
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 
 import com.google.api.client.googleapis.json.GoogleJsonResponseException;
diff --git a/healthcare/v1/src/test/java/snippets/healthcare/DicomStoreTests.java b/healthcare/v1/src/test/java/snippets/healthcare/DicomStoreTests.java
@@ -16,8 +16,8 @@
 
 package snippets.healthcare;
 
-import static junit.framework.TestCase.assertNotNull;
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 
 import java.io.ByteArrayOutputStream;
diff --git a/healthcare/v1/src/test/java/snippets/healthcare/DicomWebTests.java b/healthcare/v1/src/test/java/snippets/healthcare/DicomWebTests.java
@@ -17,8 +17,8 @@
 package snippets.healthcare;
 
 import static com.google.common.truth.Truth.assertThat;
-import static junit.framework.TestCase.assertNotNull;
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 
 import java.io.ByteArrayOutputStream;
diff --git a/healthcare/v1/src/test/java/snippets/healthcare/FhirResourceTests.java b/healthcare/v1/src/test/java/snippets/healthcare/FhirResourceTests.java
@@ -16,8 +16,8 @@
 
 package snippets.healthcare;
 
-import static junit.framework.TestCase.assertNotNull;
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
diff --git a/healthcare/v1/src/test/java/snippets/healthcare/FhirStoreTests.java b/healthcare/v1/src/test/java/snippets/healthcare/FhirStoreTests.java
@@ -16,8 +16,8 @@
 
 package snippets.healthcare;
 
-import static junit.framework.TestCase.assertNotNull;
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 
 import java.io.ByteArrayOutputStream;
diff --git a/healthcare/v1/src/test/java/snippets/healthcare/Hl7v2MessageTests.java b/healthcare/v1/src/test/java/snippets/healthcare/Hl7v2MessageTests.java
@@ -16,8 +16,9 @@
 
 package snippets.healthcare;
 
-import static junit.framework.TestCase.assertNotNull;
+
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
diff --git a/healthcare/v1/src/test/java/snippets/healthcare/Hl7v2StoreTests.java b/healthcare/v1/src/test/java/snippets/healthcare/Hl7v2StoreTests.java
@@ -16,8 +16,8 @@
 
 package snippets.healthcare;
 
-import static junit.framework.TestCase.assertNotNull;
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 
 import java.io.ByteArrayOutputStream;
diff --git a/media/transcoder/src/test/java/com/example/transcoder/CreateJobFromAdHocTest.java b/media/transcoder/src/test/java/com/example/transcoder/CreateJobFromAdHocTest.java
@@ -16,9 +16,9 @@
 
 package com.example.transcoder;
 
-import static junit.framework.TestCase.assertNotNull;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNotNull;
 
 import com.google.api.gax.paging.Page;
 import com.google.cloud.storage.Blob;
diff --git a/media/transcoder/src/test/java/com/example/transcoder/CreateJobFromPresetTest.java b/media/transcoder/src/test/java/com/example/transcoder/CreateJobFromPresetTest.java
@@ -16,9 +16,9 @@
 
 package com.example.transcoder;
 
-import static junit.framework.TestCase.assertNotNull;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNotNull;
 
 import com.google.api.gax.paging.Page;
 import com.google.cloud.storage.Blob;
diff --git a/media/transcoder/src/test/java/com/example/transcoder/CreateJobFromTemplateTest.java b/media/transcoder/src/test/java/com/example/transcoder/CreateJobFromTemplateTest.java
@@ -16,9 +16,9 @@
 
 package com.example.transcoder;
 
-import static junit.framework.TestCase.assertNotNull;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNotNull;
 
 import com.google.api.gax.paging.Page;
 import com.google.cloud.storage.Blob;
diff --git a/media/transcoder/src/test/java/com/example/transcoder/CreateJobTemplateTest.java b/media/transcoder/src/test/java/com/example/transcoder/CreateJobTemplateTest.java
@@ -16,9 +16,9 @@
 
 package com.example.transcoder;
 
-import static junit.framework.TestCase.assertNotNull;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/media/transcoder/src/test/java/com/example/transcoder/DeleteJobTemplateTest.java b/media/transcoder/src/test/java/com/example/transcoder/DeleteJobTemplateTest.java
@@ -16,9 +16,9 @@
 
 package com.example.transcoder;
 
-import static junit.framework.TestCase.assertNotNull;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/media/transcoder/src/test/java/com/example/transcoder/DeleteJobTest.java b/media/transcoder/src/test/java/com/example/transcoder/DeleteJobTest.java
@@ -16,9 +16,9 @@
 
 package com.example.transcoder;
 
-import static junit.framework.TestCase.assertNotNull;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNotNull;
 
 import com.google.api.gax.paging.Page;
 import com.google.cloud.storage.Blob;
diff --git a/media/transcoder/src/test/java/com/example/transcoder/GetJobTemplateTest.java b/media/transcoder/src/test/java/com/example/transcoder/GetJobTemplateTest.java
@@ -16,9 +16,9 @@
 
 package com.example.transcoder;
 
-import static junit.framework.TestCase.assertNotNull;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/media/transcoder/src/test/java/com/example/transcoder/GetJobTest.java b/media/transcoder/src/test/java/com/example/transcoder/GetJobTest.java
@@ -16,9 +16,10 @@
 
 package com.example.transcoder;
 
-import static junit.framework.TestCase.assertNotNull;
+
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNotNull;
 
 import com.google.api.gax.paging.Page;
 import com.google.cloud.storage.Blob;
diff --git a/media/transcoder/src/test/java/com/example/transcoder/ListJobTemplateTest.java b/media/transcoder/src/test/java/com/example/transcoder/ListJobTemplateTest.java
@@ -16,9 +16,9 @@
 
 package com.example.transcoder;
 
-import static junit.framework.TestCase.assertNotNull;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/media/transcoder/src/test/java/com/example/transcoder/ListJobsTest.java b/media/transcoder/src/test/java/com/example/transcoder/ListJobsTest.java
@@ -16,9 +16,9 @@
 
 package com.example.transcoder;
 
-import static junit.framework.TestCase.assertNotNull;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertNotNull;
 
 import com.google.api.gax.paging.Page;
 import com.google.cloud.storage.Blob;
diff --git a/storage/s3-sdk/src/test/java/ListGcsBucketsTest.java b/storage/s3-sdk/src/test/java/ListGcsBucketsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import static junit.framework.TestCase.assertNotNull;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 
 import com.amazonaws.services.s3.model.Bucket;
diff --git a/storage/s3-sdk/src/test/java/ListGcsObjectsTest.java b/storage/s3-sdk/src/test/java/ListGcsObjectsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import static junit.framework.TestCase.assertNotNull;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 
 import com.amazonaws.services.s3.model.Bucket;
