Fix wrong imports by Jens

EnMasseProject · Jun 22, 2020 · 3866765 · 3866765
1 parent 6951aa0
commit 3866765
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 14 deletions.
diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/CredentialsTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/CredentialsTest.java
@@ -11,7 +11,7 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @Tag(TestTag.FRAMEWORK)
 public class CredentialsTest {

diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/DeviceCertificateManagerTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/DeviceCertificateManagerTest.java
@@ -6,7 +6,7 @@
 package io.enmasse.systemtest.iot;
 
 import static io.enmasse.systemtest.TestTag.FRAMEWORK;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.security.cert.X509Certificate;
 import java.time.Duration;

diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/IoTTestSessionTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/IoTTestSessionTest.java
@@ -7,7 +7,7 @@
 
 import static io.enmasse.systemtest.TestTag.FRAMEWORK;
 import static io.enmasse.systemtest.iot.IoTTestSession.Adapter.HTTP;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 

diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/KeyStoreCreatorTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/KeyStoreCreatorTest.java
@@ -5,7 +5,7 @@
 
 package io.enmasse.systemtest.iot;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.time.Duration;
 import java.time.Instant;

diff --git a/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/project/ManagedTest.java b/systemtests/src/test/java/io/enmasse/systemtest/iot/isolated/project/ManagedTest.java
@@ -10,7 +10,7 @@
 import static java.time.Duration.ofMinutes;
 import static java.time.Duration.ofSeconds;
 import static org.hamcrest.collection.IsEmptyIterable.emptyIterable;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.net.HttpURLConnection;
 import java.util.LinkedList;

diff --git a/...emtests/src/test/java/io/enmasse/systemtest/iot/shared/control/CommandAndControlTest.java b/...emtests/src/test/java/io/enmasse/systemtest/iot/shared/control/CommandAndControlTest.java
@@ -15,7 +15,7 @@
 import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.hamcrest.core.IsNull.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.net.HttpURLConnection;
 import java.nio.ByteBuffer;

diff --git a/systemtests/src/test/java/io/enmasse/systemtest/isolated/CommonTest.java b/systemtests/src/test/java/io/enmasse/systemtest/isolated/CommonTest.java
@@ -45,7 +45,6 @@
 import io.enmasse.systemtest.utils.PlanUtils;
 import io.enmasse.systemtest.utils.TestUtils;
 import io.fabric8.kubernetes.api.model.Pod;
-import io.github.artsok.RepeatedIfExceptionsTest;
 import org.apache.qpid.proton.amqp.Binary;
 import org.apache.qpid.proton.amqp.messaging.AmqpValue;
 import org.apache.qpid.proton.amqp.messaging.Data;
@@ -606,7 +605,6 @@ private AddressSpace getAddressSpaceBrokerOperableOnFullQueue(AddressPlan exampl
 
     @Tag(NON_PR)
     @DisplayName("testFullBrokerRemainsOperableBrokered")
-    @RepeatedIfExceptionsTest(repeats = 2, name = "")
     public void testFullBrokerRemainsOperableBrokered() throws Exception {
         BrokeredInfraConfig testInfra = new BrokeredInfraConfigBuilder()
                 .withNewMetadata()

diff --git a/...mtests/src/test/java/io/enmasse/systemtest/isolated/infra/standard/InfraTestStandard.java b/...mtests/src/test/java/io/enmasse/systemtest/isolated/infra/standard/InfraTestStandard.java
@@ -56,8 +56,8 @@
 import java.util.stream.Collectors;
 
 import static io.enmasse.systemtest.TestTag.ACCEPTANCE;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class InfraTestStandard extends InfraTestBase implements ITestIsolatedStandard {

diff --git a/systemtests/src/test/java/io/enmasse/systemtest/olm/OLMLinksTest.java b/systemtests/src/test/java/io/enmasse/systemtest/olm/OLMLinksTest.java
@@ -7,8 +7,8 @@
 import static io.enmasse.systemtest.TestTag.ACCEPTANCE;
 import static io.enmasse.systemtest.TestTag.NON_PR;
 import static io.enmasse.systemtest.TestTag.OLM;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.Duration;
 import java.util.List;

diff --git a/systemtests/src/test/java/io/enmasse/systemtest/scale/ScaleTestManagerTest.java b/systemtests/src/test/java/io/enmasse/systemtest/scale/ScaleTestManagerTest.java
@@ -5,15 +5,14 @@
 package io.enmasse.systemtest.scale;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.IntStream;
 
-import org.HdrHistogram.DoubleHistogram;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;