From 87282ba994a84d058bc237fa7a7ab1780db0c806 Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Wed, 6 Nov 2019 12:39:51 +0100 Subject: [PATCH 1/3] Replace usages of deprecated Mockito's Matchers class --- .../testcontainers/utility/AuthenticatedImagePullTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java index 19b933d174c..78b54798cd1 100644 --- a/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java +++ b/core/src/test/java/org/testcontainers/utility/AuthenticatedImagePullTest.java @@ -16,8 +16,8 @@ import java.util.concurrent.TimeUnit; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import static org.rnorth.visibleassertions.VisibleAssertions.assertTrue; From 3aa8e091717e81b7a9b2c0693cdcc39d4645d2ed Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Wed, 6 Nov 2019 12:42:23 +0100 Subject: [PATCH 2/3] Replace usages of legacy Long creation methods --- .../org/testcontainers/dynamodb/DynaliteContainerTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java b/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java index 2d414aecb3b..524d3f6c34c 100644 --- a/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java +++ b/modules/dynalite/src/test/java/org/testcontainers/dynamodb/DynaliteContainerTest.java @@ -37,7 +37,7 @@ private void runTest(AmazonDynamoDB client) { "Name", ScalarAttributeType.S)) .withKeySchema(new KeySchemaElement("Name", KeyType.HASH)) .withProvisionedThroughput(new ProvisionedThroughput( - new Long(10), new Long(10))) + 10L, 10L)) .withTableName("foo"); @@ -49,4 +49,4 @@ private void runTest(AmazonDynamoDB client) { assertEquals("the table has the right name", "foo", tableDescription.getTableName()); assertEquals("the name has the right primary key", "Name", tableDescription.getKeySchema().get(0).getAttributeName()); } -} \ No newline at end of file +} From f2c7da01f25cd3cbc5ae80f7bdad4a037346a03c Mon Sep 17 00:00:00 2001 From: Grzegorz Piwowarek Date: Wed, 6 Nov 2019 12:42:56 +0100 Subject: [PATCH 3/3] Replace usages of deprecated Mockito's Matchers class --- .../containers/FailureDetectingExternalResourceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java b/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java index 47d594c4c02..15a9eba7d17 100644 --- a/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java +++ b/core/src/test/java/org/testcontainers/containers/FailureDetectingExternalResourceTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import org.junit.runner.Description; import org.junit.runners.model.Statement; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy;