Repository: knox Updated Branches: refs/heads/master a66a78cb6 -> 9e412e536
KNOX-1459 - Remove testng assertions Signed-off-by: Kevin Risden <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/9e412e53 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/9e412e53 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/9e412e53 Branch: refs/heads/master Commit: 9e412e536b021b1ae0b75c8b8a7ef871f3faf680 Parents: a66a78c Author: Kevin Risden <[email protected]> Authored: Wed Sep 26 13:53:17 2018 -0400 Committer: Kevin Risden <[email protected]> Committed: Wed Sep 26 14:36:25 2018 -0400 ---------------------------------------------------------------------- .../config/impl/GatewayConfigImplTest.java | 7 ++++--- .../security/impl/RemoteAliasMonitorTest.java | 10 ++++----- .../security/impl/RemoteAliasServiceTest.java | 22 ++++++++++---------- .../simple/SimpleDescriptorHandlerTest.java | 3 +-- ...efaultRemoteConfigurationRegistriesTest.java | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/9e412e53/gateway-server/src/test/java/org/apache/knox/gateway/config/impl/GatewayConfigImplTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/config/impl/GatewayConfigImplTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/config/impl/GatewayConfigImplTest.java index d1089c0..a783780 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/config/impl/GatewayConfigImplTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/config/impl/GatewayConfigImplTest.java @@ -12,11 +12,12 @@ import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertNotNull; + /** * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/knox/blob/9e412e53/gateway-server/src/test/java/org/apache/knox/gateway/security/impl/RemoteAliasMonitorTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/security/impl/RemoteAliasMonitorTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/security/impl/RemoteAliasMonitorTest.java index 46ce2c7..62ebd06 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/security/impl/RemoteAliasMonitorTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/security/impl/RemoteAliasMonitorTest.java @@ -35,9 +35,9 @@ import org.apache.zookeeper.data.ACL; import org.easymock.Capture; import org.easymock.EasyMock; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.testng.Assert; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -245,10 +245,10 @@ public class RemoteAliasMonitorTest { aliases = zkAlias.getAliasesForCluster(expectedClusterName); aliasesDev = zkAlias.getAliasesForCluster(expectedClusterNameDev); - Assert.assertTrue(aliases.contains(expectedAlias), - "Expected alias 'knox.test.alias' not found "); - Assert.assertTrue(aliasesDev.contains(expectedAliasDev), - "Expected alias 'knox.test.alias.dev' not found "); + Assert.assertTrue("Expected alias 'knox.test.alias' not found ", + aliases.contains(expectedAlias)); + Assert.assertTrue("Expected alias 'knox.test.alias.dev' not found ", + aliasesDev.contains(expectedAliasDev)); final char[] result = zkAlias .getPasswordFromAliasForCluster(expectedClusterName, expectedAlias); http://git-wip-us.apache.org/repos/asf/knox/blob/9e412e53/gateway-server/src/test/java/org/apache/knox/gateway/security/impl/RemoteAliasServiceTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/security/impl/RemoteAliasServiceTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/security/impl/RemoteAliasServiceTest.java index 4f3b3af..ab57e4c 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/security/impl/RemoteAliasServiceTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/security/impl/RemoteAliasServiceTest.java @@ -31,9 +31,9 @@ import org.apache.knox.gateway.services.security.impl.RemoteAliasService; import org.easymock.Capture; import org.easymock.EasyMock; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.testng.Assert; import java.util.ArrayList; import java.util.Collections; @@ -191,10 +191,10 @@ public class RemoteAliasServiceTest { Assert.assertEquals(aliases.size(), 1); Assert.assertEquals(aliasesDev.size(), 1); - Assert.assertTrue(aliases.contains(expectedAlias), - "Expected alias 'knox.test.alias' not found "); - Assert.assertTrue(aliasesDev.contains(expectedAliasDev), - "Expected alias 'knox.test.alias.dev' not found "); + Assert.assertTrue("Expected alias 'knox.test.alias' not found ", + aliases.contains(expectedAlias)); + Assert.assertTrue("Expected alias 'knox.test.alias.dev' not found ", + aliasesDev.contains(expectedAliasDev)); final char[] result = zkAlias .getPasswordFromAliasForCluster(expectedClusterName, expectedAlias); @@ -213,12 +213,12 @@ public class RemoteAliasServiceTest { aliasesDev = zkAlias.getAliasesForCluster(expectedClusterNameDev); Assert.assertEquals(aliasesDev.size(), 0); - Assert.assertFalse(aliasesDev.contains(expectedAliasDev), - "Expected alias 'knox.test.alias.dev' to be removed but found."); + Assert.assertFalse("Expected alias 'knox.test.alias.dev' to be removed but found.", + aliasesDev.contains(expectedAliasDev)); Assert.assertEquals(aliases.size(), 1); - Assert.assertTrue(aliases.contains(expectedAlias), - "Expected alias 'knox.test.alias' not found "); + Assert.assertTrue("Expected alias 'knox.test.alias' not found ", + aliases.contains(expectedAlias)); /* Test auto-generate password for alias */ final String testAutoGeneratedpasswordAlias = "knox.test.alias.auto"; @@ -230,8 +230,8 @@ public class RemoteAliasServiceTest { Assert.assertNotNull(autoGeneratedPassword); Assert.assertEquals(aliases.size(), 2); - Assert.assertTrue(aliases.contains(testAutoGeneratedpasswordAlias), - "Expected alias 'knox.test.alias' not found "); + Assert.assertTrue("Expected alias 'knox.test.alias' not found ", + aliases.contains(testAutoGeneratedpasswordAlias)); } http://git-wip-us.apache.org/repos/asf/knox/blob/9e412e53/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorHandlerTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorHandlerTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorHandlerTest.java index befde7d..a288c72 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorHandlerTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorHandlerTest.java @@ -54,11 +54,10 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.testng.Assert.assertNull; - public class SimpleDescriptorHandlerTest { http://git-wip-us.apache.org/repos/asf/knox/blob/9e412e53/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/config/DefaultRemoteConfigurationRegistriesTest.java ---------------------------------------------------------------------- diff --git a/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/config/DefaultRemoteConfigurationRegistriesTest.java b/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/config/DefaultRemoteConfigurationRegistriesTest.java index ce223e9..8cdf322 100644 --- a/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/config/DefaultRemoteConfigurationRegistriesTest.java +++ b/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/config/DefaultRemoteConfigurationRegistriesTest.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Properties; import static org.junit.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; +import static org.junit.Assert.assertNotNull; public class DefaultRemoteConfigurationRegistriesTest {
