KNOX-998 - Some more refactoring
Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/1451428f Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/1451428f Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/1451428f Branch: refs/heads/master Commit: 1451428f7cca88758e8163276cb5f6a33c1f812d Parents: 46109ad Author: Sandeep More <m...@apache.org> Authored: Thu Nov 2 14:47:28 2017 -0400 Committer: Sandeep More <m...@apache.org> Committed: Thu Nov 2 14:47:28 2017 -0400 ---------------------------------------------------------------------- .../gateway/i18n/messages/MessagesTest.java | 4 +- .../gateway/i18n/resources/ResourcesTest.java | 4 +- ...yAssertionHttpServletRequestWrapperTest.java | 8 +- .../function/UsernameFunctionProcessorTest.java | 8 +- .../impl/HostmapFunctionProcessorTest.java | 2 +- .../impl/ServiceRegistryFunctionsTest.java | 8 +- .../UrlRewriteServletContextListenerTest.java | 4 +- .../api/UrlRewriteServletFilterTest.java | 8 +- .../impl/FrontendFunctionProcessorTest.java | 8 +- .../rewrite/impl/json/JsonFilterReaderTest.java | 2 +- .../rewrite/impl/xml/XmlFilterReaderTest.java | 2 +- .../apache/knox/gateway/AuditLoggingTest.java | 2 +- .../apache/knox/gateway/GatewayFilterTest.java | 4 +- .../knox/gateway/GatewayGlobalConfigTest.java | 2 +- .../org/apache/knox/gateway/TempletonDemo.java | 4 +- .../config/impl/GatewayConfigImplTest.java | 2 +- .../gateway/deploy/DeploymentFactoryTest.java | 2 +- .../xml/XmlGatewayDescriptorExporterTest.java | 2 +- .../knox/gateway/jetty/SslSocketTest.java | 4 +- .../knox/gateway/mock/MockConsoleFactory.java | 2 +- .../services/security/CryptoServiceTest.java | 4 +- .../topology/DefaultTopologyServiceTest.java | 2 +- .../builder/PropertyTopologyBuilderTest.java | 2 +- .../validation/TopologyValidatorTest.java | 2 +- .../topology/xml/TopologyRulesModuleTest.java | 2 +- .../knox/gateway/websockets/BadUrlTest.java | 2 +- .../gateway/websockets/WebsocketEchoTest.java | 2 +- .../WebsocketMultipleConnectionTest.java | 2 +- .../src/test/resources/log4j.properties | 2 +- .../knox/gateway/hbase/HBaseDispatchTest.java | 6 +- .../gateway/dispatch/DefaultDispatchTest.java | 6 +- .../security/principal/PrincipalMapperTest.java | 4 +- .../hostmap/FileBasedHostMapperTest.java | 2 +- .../security/impl/CMFKeystoreServiceTest.java | 4 +- .../security/impl/CMFMasterServiceTest.java | 4 +- .../apache/knox/gateway/GatewayTestDriver.java | 2 +- .../apache/knox/gateway/SecureClusterTest.java | 4 +- .../java/org/apache/knox/gateway/ShellTest.java | 4 +- .../java/org/apache/hadoop/test/Console.java | 57 -- .../java/org/apache/hadoop/test/TestUtils.java | 216 ----- .../apache/hadoop/test/category/FastTests.java | 21 - .../hadoop/test/category/ManualTests.java | 21 - .../hadoop/test/category/MediumTests.java | 21 - .../hadoop/test/category/ReleaseTest.java | 21 - .../apache/hadoop/test/category/SlowTests.java | 21 - .../apache/hadoop/test/category/UnitTests.java | 21 - .../apache/hadoop/test/category/VerifyTest.java | 21 - .../apache/hadoop/test/log/CollectAppender.java | 51 -- .../apache/hadoop/test/log/NoOpAppender.java | 98 --- .../org/apache/hadoop/test/log/NoOpLogger.java | 87 -- .../hadoop/test/mock/MockFilterConfig.java | 46 - .../test/mock/MockHttpServletRequest.java | 410 --------- .../test/mock/MockHttpServletResponse.java | 195 ----- .../hadoop/test/mock/MockInteraction.java | 33 - .../hadoop/test/mock/MockRequestMatcher.java | 330 -------- .../hadoop/test/mock/MockResponseProvider.java | 158 ---- .../org/apache/hadoop/test/mock/MockServer.java | 119 --- .../apache/hadoop/test/mock/MockServlet.java | 61 -- .../hadoop/test/mock/MockServletContext.java | 293 ------- .../test/mock/MockServletInputStream.java | 54 -- .../main/java/org/apache/knox/test/Console.java | 57 ++ .../java/org/apache/knox/test/TestUtils.java | 216 +++++ .../apache/knox/test/category/FastTests.java | 21 + .../apache/knox/test/category/ManualTests.java | 21 + .../apache/knox/test/category/MediumTests.java | 21 + .../apache/knox/test/category/ReleaseTest.java | 21 + .../apache/knox/test/category/SlowTests.java | 21 + .../apache/knox/test/category/UnitTests.java | 21 + .../apache/knox/test/category/VerifyTest.java | 21 + .../apache/knox/test/log/CollectAppender.java | 51 ++ .../org/apache/knox/test/log/NoOpAppender.java | 98 +++ .../org/apache/knox/test/log/NoOpLogger.java | 87 ++ .../apache/knox/test/mock/MockFilterConfig.java | 46 + .../knox/test/mock/MockHttpServletRequest.java | 410 +++++++++ .../knox/test/mock/MockHttpServletResponse.java | 195 +++++ .../apache/knox/test/mock/MockInteraction.java | 33 + .../knox/test/mock/MockRequestMatcher.java | 330 ++++++++ .../knox/test/mock/MockResponseProvider.java | 157 ++++ .../org/apache/knox/test/mock/MockServer.java | 119 +++ .../org/apache/knox/test/mock/MockServlet.java | 61 ++ .../knox/test/mock/MockServletContext.java | 293 +++++++ .../knox/test/mock/MockServletInputStream.java | 54 ++ .../gateway/AmbariServiceDefinitionTest.java | 8 +- .../knox/gateway/GatewayAdminFuncTest.java | 2 +- .../gateway/GatewayAdminTopologyFuncTest.java | 8 +- .../apache/knox/gateway/GatewayAppFuncTest.java | 10 +- .../knox/gateway/GatewayBasicFuncTest.java | 12 +- .../knox/gateway/GatewayDeployFuncTest.java | 10 +- .../knox/gateway/GatewayHealthFuncTest.java | 2 +- .../GatewayLdapDynamicGroupFuncTest.java | 6 +- .../knox/gateway/GatewayLdapGroupFuncTest.java | 7 +- .../gateway/GatewayLdapPosixGroupFuncTest.java | 11 +- .../gateway/GatewayLocalServiceFuncTest.java | 10 +- .../knox/gateway/GatewayMultiFuncTest.java | 11 +- .../GatewayPortMappingDisableFeatureTest.java | 10 +- .../gateway/GatewayPortMappingFailTest.java | 10 +- .../gateway/GatewayPortMappingFuncTest.java | 10 +- .../knox/gateway/GatewaySampleFuncTest.java | 8 +- .../apache/knox/gateway/GatewaySslFuncTest.java | 14 +- .../apache/knox/gateway/Knox242FuncTest.java | 8 +- .../gateway/KnoxCliLdapFuncTestNegative.java | 8 +- .../gateway/KnoxCliLdapFuncTestPositive.java | 10 +- .../apache/knox/gateway/KnoxCliSysBindTest.java | 10 +- .../gateway/OozieServiceDefinitionTest.java | 8 +- .../apache/knox/gateway/WebHdfsHaFuncTest.java | 10 +- .../deploy/DeploymentFactoryFuncTest.java | 8 +- .../knox/gateway/audit/AuditLayoutTest.java | 2 +- .../knox/gateway/audit/AuditServiceTest.java | 2 +- .../audit/StoreAndForwardAppenderTest.java | 2 +- .../src/test/resources/audit-log4j.properties | 2 +- .../gateway/util/urltemplate/ExpanderTest.java | 4 +- .../gateway/util/urltemplate/MatcherTest.java | 4 +- .../util/urltemplate/MatcherTest.java.orig | 839 ------------------- .../gateway/util/urltemplate/ParserTest.java | 4 +- .../gateway/util/urltemplate/RewriterTest.java | 4 +- .../gateway/util/urltemplate/SegmentTest.java | 4 +- .../gateway/util/urltemplate/TemplateTest.java | 4 +- pom.xml | 8 +- 118 files changed, 2536 insertions(+), 3401 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/messages/MessagesTest.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/messages/MessagesTest.java b/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/messages/MessagesTest.java index d53e99d..8a9c42e 100644 --- a/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/messages/MessagesTest.java +++ b/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/messages/MessagesTest.java @@ -20,8 +20,8 @@ package org.apache.knox.gateway.i18n.messages; import org.apache.knox.gateway.i18n.messages.loggers.test.TestMessageLogger; import org.apache.knox.gateway.i18n.messages.loggers.test.TestMessageLoggerFactory; import org.apache.knox.gateway.i18n.messages.loggers.test.TestMessageRecord; -import org.apache.hadoop.test.category.FastTests; -import org.apache.hadoop.test.category.UnitTests; +import org.apache.knox.test.category.FastTests; +import org.apache.knox.test.category.UnitTests; import org.junit.Test; import org.junit.experimental.categories.Category; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTest.java ---------------------------------------------------------------------- diff --git a/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTest.java b/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTest.java index a876b89..d54f379 100644 --- a/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTest.java +++ b/gateway-i18n/src/test/java/org/apache/knox/gateway/i18n/resources/ResourcesTest.java @@ -17,8 +17,8 @@ */ package org.apache.knox.gateway.i18n.resources; -import org.apache.hadoop.test.category.FastTests; -import org.apache.hadoop.test.category.UnitTests; +import org.apache.knox.test.category.FastTests; +import org.apache.knox.test.category.UnitTests; import org.junit.After; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/IdentityAssertionHttpServletRequestWrapperTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/IdentityAssertionHttpServletRequestWrapperTest.java b/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/IdentityAssertionHttpServletRequestWrapperTest.java index 745fbdd..eaa2245 100644 --- a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/IdentityAssertionHttpServletRequestWrapperTest.java +++ b/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/filter/IdentityAssertionHttpServletRequestWrapperTest.java @@ -20,10 +20,10 @@ package org.apache.knox.gateway.identityasserter.filter; import org.apache.commons.io.IOUtils; import org.apache.knox.gateway.config.GatewayConfig; import org.apache.knox.gateway.identityasserter.common.filter.IdentityAsserterHttpServletRequestWrapper; -import org.apache.hadoop.test.category.FastTests; -import org.apache.hadoop.test.category.UnitTests; -import org.apache.hadoop.test.mock.MockHttpServletRequest; -import org.apache.hadoop.test.mock.MockServletInputStream; +import org.apache.knox.test.category.FastTests; +import org.apache.knox.test.category.UnitTests; +import org.apache.knox.test.mock.MockHttpServletRequest; +import org.apache.knox.test.mock.MockServletInputStream; import org.junit.Test; import org.junit.After; import org.junit.experimental.categories.Category; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java b/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java index 0f9d67c..556443f 100644 --- a/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java +++ b/gateway-provider-identity-assertion-common/src/test/java/org/apache/knox/gateway/identityasserter/function/UsernameFunctionProcessorTest.java @@ -24,10 +24,10 @@ import org.apache.knox.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor; import org.apache.knox.gateway.identityasserter.common.function.UsernameFunctionProcessor; import org.apache.knox.gateway.security.PrimaryPrincipal; import org.apache.knox.gateway.util.urltemplate.Parser; -import org.apache.hadoop.test.TestUtils; -import org.apache.hadoop.test.log.NoOpLogger; -import org.apache.hadoop.test.mock.MockInteraction; -import org.apache.hadoop.test.mock.MockServlet; +import org.apache.knox.test.TestUtils; +import org.apache.knox.test.log.NoOpLogger; +import org.apache.knox.test.mock.MockInteraction; +import org.apache.knox.test.mock.MockServlet; import org.apache.http.auth.BasicUserPrincipal; import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletHolder; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessorTest.java b/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessorTest.java index 92ec957..c373dc0 100644 --- a/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessorTest.java +++ b/gateway-provider-rewrite-func-hostmap-static/src/test/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessorTest.java @@ -31,7 +31,7 @@ import org.apache.knox.gateway.services.hostmap.HostMapperService; import org.apache.knox.gateway.util.urltemplate.Parser; import org.apache.knox.gateway.util.urltemplate.Resolver; import org.apache.knox.gateway.util.urltemplate.Template; -import org.apache.hadoop.test.TestUtils; +import org.apache.knox.test.TestUtils; import org.easymock.EasyMock; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java index 9f19a4f..47525bb 100644 --- a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java +++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java @@ -23,10 +23,10 @@ import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteServletFilter; import org.apache.knox.gateway.services.GatewayServices; import org.apache.knox.gateway.services.registry.ServiceRegistry; import org.apache.knox.gateway.util.urltemplate.Parser; -import org.apache.hadoop.test.TestUtils; -import org.apache.hadoop.test.log.NoOpLogger; -import org.apache.hadoop.test.mock.MockInteraction; -import org.apache.hadoop.test.mock.MockServlet; +import org.apache.knox.test.TestUtils; +import org.apache.knox.test.log.NoOpLogger; +import org.apache.knox.test.mock.MockInteraction; +import org.apache.knox.test.mock.MockServlet; import org.apache.http.auth.BasicUserPrincipal; import org.easymock.EasyMock; import org.eclipse.jetty.servlet.FilterHolder; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java index 1d0d72d..db65e35 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java @@ -17,8 +17,8 @@ */ package org.apache.knox.gateway.filter.rewrite.api; -import org.apache.hadoop.test.mock.MockInteraction; -import org.apache.hadoop.test.mock.MockServlet; +import org.apache.knox.test.mock.MockInteraction; +import org.apache.knox.test.mock.MockServlet; import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.http.HttpTester; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java index 484786e..1df1c20 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletFilterTest.java @@ -20,10 +20,10 @@ package org.apache.knox.gateway.filter.rewrite.api; import com.jayway.jsonassert.JsonAssert; import org.apache.knox.gateway.filter.AbstractGatewayFilter; import org.apache.knox.gateway.util.urltemplate.Parser; -import org.apache.hadoop.test.TestUtils; -import org.apache.hadoop.test.log.NoOpAppender; -import org.apache.hadoop.test.mock.MockInteraction; -import org.apache.hadoop.test.mock.MockServlet; +import org.apache.knox.test.TestUtils; +import org.apache.knox.test.log.NoOpAppender; +import org.apache.knox.test.mock.MockInteraction; +import org.apache.knox.test.mock.MockServlet; import org.apache.log4j.Appender; import org.apache.log4j.Logger; import org.eclipse.jetty.http.HttpHeader; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java index d40edc9..a946bd2 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/FrontendFunctionProcessorTest.java @@ -27,10 +27,10 @@ import org.apache.knox.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor; import org.apache.knox.gateway.services.GatewayServices; import org.apache.knox.gateway.services.registry.ServiceRegistry; import org.apache.knox.gateway.util.urltemplate.Parser; -import org.apache.hadoop.test.TestUtils; -import org.apache.hadoop.test.log.NoOpLogger; -import org.apache.hadoop.test.mock.MockInteraction; -import org.apache.hadoop.test.mock.MockServlet; +import org.apache.knox.test.TestUtils; +import org.apache.knox.test.log.NoOpLogger; +import org.apache.knox.test.mock.MockInteraction; +import org.apache.knox.test.mock.MockServlet; import org.apache.http.auth.BasicUserPrincipal; import org.easymock.EasyMock; import org.eclipse.jetty.http.HttpTester; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java index 1378fef..ad55aeb 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java @@ -26,7 +26,7 @@ import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteFilterDescriptor; import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteFilterDetectDescriptor; import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteRulesDescriptor; import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteRulesDescriptorFactory; -import org.apache.hadoop.test.TestUtils; +import org.apache.knox.test.TestUtils; import org.junit.Test; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReaderTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReaderTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReaderTest.java index 7ac4626..5aa5cce 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReaderTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReaderTest.java @@ -37,7 +37,7 @@ import org.apache.knox.gateway.filter.rewrite.ext.UrlRewriteControlDescriptor; import org.apache.knox.gateway.filter.rewrite.ext.UrlRewriteMatchDescriptor; import org.apache.knox.gateway.filter.rewrite.ext.UrlRewriteMatchDescriptorExt; import org.apache.knox.gateway.filter.rewrite.spi.UrlRewriteActionDescriptorBase; -import org.apache.hadoop.test.TestUtils; +import org.apache.knox.test.TestUtils; import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-server/src/test/java/org/apache/knox/gateway/AuditLoggingTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/AuditLoggingTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/AuditLoggingTest.java index 82890c4..03ee0d7 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/AuditLoggingTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/AuditLoggingTest.java @@ -50,7 +50,7 @@ import org.apache.knox.gateway.audit.log4j.correlation.Log4jCorrelationService; import org.apache.knox.gateway.config.GatewayConfig; import org.apache.knox.gateway.dispatch.DefaultDispatch; import org.apache.knox.gateway.i18n.resources.ResourcesFactory; -import org.apache.hadoop.test.log.CollectAppender; +import org.apache.knox.test.log.CollectAppender; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.log4j.spi.LoggingEvent; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-server/src/test/java/org/apache/knox/gateway/GatewayFilterTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayFilterTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayFilterTest.java index 2fe1f1a..b7f787a 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayFilterTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayFilterTest.java @@ -21,8 +21,8 @@ import org.apache.knox.gateway.audit.api.AuditServiceFactory; import org.apache.knox.gateway.config.GatewayConfig; import org.apache.knox.gateway.filter.AbstractGatewayFilter; import org.apache.knox.gateway.topology.Topology; -import org.apache.hadoop.test.category.FastTests; -import org.apache.hadoop.test.category.UnitTests; +import org.apache.knox.test.category.FastTests; +import org.apache.knox.test.category.UnitTests; import org.easymock.EasyMock; import org.junit.After; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-server/src/test/java/org/apache/knox/gateway/GatewayGlobalConfigTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayGlobalConfigTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayGlobalConfigTest.java index 4cfdb8e..1acf9d6 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayGlobalConfigTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayGlobalConfigTest.java @@ -19,7 +19,7 @@ package org.apache.knox.gateway; import org.apache.knox.gateway.config.GatewayConfig; import org.apache.knox.gateway.config.impl.GatewayConfigImpl; -import org.apache.hadoop.test.TestUtils; +import org.apache.knox.test.TestUtils; import org.hamcrest.Matchers; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-server/src/test/java/org/apache/knox/gateway/TempletonDemo.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/TempletonDemo.java b/gateway-server/src/test/java/org/apache/knox/gateway/TempletonDemo.java index 66321ea..fd32abc 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/TempletonDemo.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/TempletonDemo.java @@ -17,8 +17,8 @@ */ package org.apache.knox.gateway; -import org.apache.hadoop.test.category.ManualTests; -import org.apache.hadoop.test.category.SlowTests; +import org.apache.knox.test.category.ManualTests; +import org.apache.knox.test.category.SlowTests; import org.apache.http.HttpResponse; import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/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 bae67e6..06da13d 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 @@ -1,6 +1,6 @@ package org.apache.knox.gateway.config.impl; -import org.apache.hadoop.test.TestUtils; +import org.apache.knox.test.TestUtils; import org.hamcrest.CoreMatchers; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-server/src/test/java/org/apache/knox/gateway/deploy/DeploymentFactoryTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/deploy/DeploymentFactoryTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/deploy/DeploymentFactoryTest.java index 2973f40..7cea065 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/deploy/DeploymentFactoryTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/deploy/DeploymentFactoryTest.java @@ -27,7 +27,7 @@ import org.apache.knox.gateway.topology.Application; import org.apache.knox.gateway.topology.Service; import org.apache.knox.gateway.topology.Topology; import org.apache.knox.gateway.util.XmlUtils; -import org.apache.hadoop.test.TestUtils; +import org.apache.knox.test.TestUtils; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.junit.Test; import org.w3c.dom.Document; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-server/src/test/java/org/apache/knox/gateway/descriptor/xml/XmlGatewayDescriptorExporterTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/descriptor/xml/XmlGatewayDescriptorExporterTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/descriptor/xml/XmlGatewayDescriptorExporterTest.java index 5624a10..d4469c9 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/descriptor/xml/XmlGatewayDescriptorExporterTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/descriptor/xml/XmlGatewayDescriptorExporterTest.java @@ -20,7 +20,7 @@ package org.apache.knox.gateway.descriptor.xml; import org.apache.knox.gateway.descriptor.GatewayDescriptor; import org.apache.knox.gateway.descriptor.GatewayDescriptorFactory; import org.apache.knox.gateway.util.XmlUtils; -import org.apache.hadoop.test.Console; +import org.apache.knox.test.Console; import org.junit.Test; import org.w3c.dom.Document; import org.xml.sax.InputSource; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-server/src/test/java/org/apache/knox/gateway/jetty/SslSocketTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/jetty/SslSocketTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/jetty/SslSocketTest.java index 5aafc20..f65c220 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/jetty/SslSocketTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/jetty/SslSocketTest.java @@ -17,8 +17,8 @@ */ package org.apache.knox.gateway.jetty; -import org.apache.hadoop.test.category.MediumTests; -import org.apache.hadoop.test.category.ManualTests; +import org.apache.knox.test.category.MediumTests; +import org.apache.knox.test.category.ManualTests; import org.apache.http.HttpVersion; import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.params.BasicHttpParams; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-server/src/test/java/org/apache/knox/gateway/mock/MockConsoleFactory.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/mock/MockConsoleFactory.java b/gateway-server/src/test/java/org/apache/knox/gateway/mock/MockConsoleFactory.java index cb15db1..590cca0 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/mock/MockConsoleFactory.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/mock/MockConsoleFactory.java @@ -17,7 +17,7 @@ */ package org.apache.knox.gateway.mock; -import org.apache.hadoop.test.mock.MockServlet; +import org.apache.knox.test.mock.MockServlet; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-server/src/test/java/org/apache/knox/gateway/services/security/CryptoServiceTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/services/security/CryptoServiceTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/services/security/CryptoServiceTest.java index 0d8b7b8..72a21b0 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/services/security/CryptoServiceTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/services/security/CryptoServiceTest.java @@ -21,8 +21,8 @@ import org.apache.knox.gateway.config.GatewayConfig; import org.apache.knox.gateway.services.ServiceLifecycleException; import org.apache.knox.gateway.services.security.impl.ConfigurableEncryptor; import org.apache.knox.gateway.services.security.impl.DefaultCryptoService; -import org.apache.hadoop.test.category.ManualTests; -import org.apache.hadoop.test.category.MediumTests; +import org.apache.knox.test.category.ManualTests; +import org.apache.knox.test.category.MediumTests; import org.easymock.EasyMock; import org.junit.BeforeClass; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-server/src/test/java/org/apache/knox/gateway/services/topology/DefaultTopologyServiceTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/services/topology/DefaultTopologyServiceTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/services/topology/DefaultTopologyServiceTest.java index e70d096..408d396 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/services/topology/DefaultTopologyServiceTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/services/topology/DefaultTopologyServiceTest.java @@ -26,7 +26,7 @@ import org.apache.commons.io.monitor.FileAlterationObserver; import org.apache.knox.gateway.config.GatewayConfig; import org.apache.knox.gateway.services.topology.impl.DefaultTopologyService; import org.apache.knox.gateway.services.security.AliasService; -import org.apache.hadoop.test.TestUtils; +import org.apache.knox.test.TestUtils; import org.apache.knox.gateway.topology.Param; import org.apache.knox.gateway.topology.Provider; import org.apache.knox.gateway.topology.Topology; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-server/src/test/java/org/apache/knox/gateway/topology/builder/PropertyTopologyBuilderTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/topology/builder/PropertyTopologyBuilderTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/topology/builder/PropertyTopologyBuilderTest.java index 700ac9b..f69dc53 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/topology/builder/PropertyTopologyBuilderTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/topology/builder/PropertyTopologyBuilderTest.java @@ -20,7 +20,7 @@ import java.util.Enumeration; import org.apache.knox.gateway.topology.Topology; import org.apache.knox.gateway.topology.builder.property.Property; -import org.apache.hadoop.test.log.NoOpAppender; +import org.apache.knox.test.log.NoOpAppender; import org.apache.log4j.Appender; import org.junit.AfterClass; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-server/src/test/java/org/apache/knox/gateway/topology/validation/TopologyValidatorTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/topology/validation/TopologyValidatorTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/topology/validation/TopologyValidatorTest.java index 9337c85..7c16ac4 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/topology/validation/TopologyValidatorTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/topology/validation/TopologyValidatorTest.java @@ -18,7 +18,7 @@ package org.apache.knox.gateway.topology.validation; import java.net.URL; -import org.apache.hadoop.test.TestUtils; +import org.apache.knox.test.TestUtils; import org.junit.Test; import static org.hamcrest.core.Is.is; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-server/src/test/java/org/apache/knox/gateway/topology/xml/TopologyRulesModuleTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/topology/xml/TopologyRulesModuleTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/topology/xml/TopologyRulesModuleTest.java index 55c80bd..d75dcfb 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/topology/xml/TopologyRulesModuleTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/topology/xml/TopologyRulesModuleTest.java @@ -25,7 +25,7 @@ import org.apache.knox.gateway.topology.Service; import org.apache.knox.gateway.topology.Topology; import org.apache.knox.gateway.topology.Version; import org.apache.knox.gateway.topology.builder.TopologyBuilder; -import org.apache.hadoop.test.TestUtils; +import org.apache.knox.test.TestUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadUrlTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadUrlTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadUrlTest.java index 25891bf..3aceadd 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadUrlTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadUrlTest.java @@ -42,7 +42,7 @@ import org.apache.knox.gateway.services.ServiceLifecycleException; import org.apache.knox.gateway.services.topology.TopologyService; import org.apache.knox.gateway.topology.TopologyEvent; import org.apache.knox.gateway.topology.TopologyListener; -import org.apache.hadoop.test.TestUtils; +import org.apache.knox.test.TestUtils; import org.easymock.EasyMock; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTest.java index da24b98..268e14b 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketEchoTest.java @@ -45,7 +45,7 @@ import org.apache.knox.gateway.services.ServiceLifecycleException; import org.apache.knox.gateway.services.topology.TopologyService; import org.apache.knox.gateway.topology.TopologyEvent; import org.apache.knox.gateway.topology.TopologyListener; -import org.apache.hadoop.test.TestUtils; +import org.apache.knox.test.TestUtils; import org.easymock.EasyMock; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketMultipleConnectionTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketMultipleConnectionTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketMultipleConnectionTest.java index 1b98616..42bc9c3 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketMultipleConnectionTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketMultipleConnectionTest.java @@ -48,7 +48,7 @@ import org.apache.knox.gateway.services.ServiceLifecycleException; import org.apache.knox.gateway.services.topology.TopologyService; import org.apache.knox.gateway.topology.TopologyEvent; import org.apache.knox.gateway.topology.TopologyListener; -import org.apache.hadoop.test.TestUtils; +import org.apache.knox.test.TestUtils; import org.easymock.EasyMock; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-server/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/resources/log4j.properties b/gateway-server/src/test/resources/log4j.properties index b212231..f35213e 100644 --- a/gateway-server/src/test/resources/log4j.properties +++ b/gateway-server/src/test/resources/log4j.properties @@ -24,7 +24,7 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%5p [%c] %m%n log4j.logger.audit = INFO, collectappender -log4j.appender.collectappender = org.apache.hadoop.test.log.CollectAppender +log4j.appender.collectappender = org.apache.knox.test.log.CollectAppender #log4j.logger.org.apache.knox.gateway=DEBUG #log4j.logger.org.eclipse.jetty=DEBUG http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-service-hbase/src/test/java/org/apache/knox/gateway/hbase/HBaseDispatchTest.java ---------------------------------------------------------------------- diff --git a/gateway-service-hbase/src/test/java/org/apache/knox/gateway/hbase/HBaseDispatchTest.java b/gateway-service-hbase/src/test/java/org/apache/knox/gateway/hbase/HBaseDispatchTest.java index 526b0e7..e5bae02 100644 --- a/gateway-service-hbase/src/test/java/org/apache/knox/gateway/hbase/HBaseDispatchTest.java +++ b/gateway-service-hbase/src/test/java/org/apache/knox/gateway/hbase/HBaseDispatchTest.java @@ -21,9 +21,9 @@ import java.net.URI; import javax.servlet.http.HttpServletRequest; import org.apache.knox.gateway.dispatch.Dispatch; -import org.apache.hadoop.test.TestUtils; -import org.apache.hadoop.test.category.FastTests; -import org.apache.hadoop.test.category.UnitTests; +import org.apache.knox.test.TestUtils; +import org.apache.knox.test.category.FastTests; +import org.apache.knox.test.category.UnitTests; import org.easymock.EasyMock; import org.junit.Test; import org.junit.experimental.categories.Category; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/DefaultDispatchTest.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/DefaultDispatchTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/DefaultDispatchTest.java index 99e3a33..9d0afc9 100644 --- a/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/DefaultDispatchTest.java +++ b/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/DefaultDispatchTest.java @@ -40,9 +40,9 @@ import javax.servlet.http.HttpServletResponse; import org.apache.knox.gateway.config.GatewayConfig; import org.apache.knox.gateway.servlet.SynchronousServletOutputStreamAdapter; -import org.apache.hadoop.test.TestUtils; -import org.apache.hadoop.test.category.FastTests; -import org.apache.hadoop.test.category.UnitTests; +import org.apache.knox.test.TestUtils; +import org.apache.knox.test.category.FastTests; +import org.apache.knox.test.category.UnitTests; import org.apache.http.HttpEntity; import org.apache.http.HttpVersion; import org.apache.http.RequestLine; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-spi/src/test/java/org/apache/knox/gateway/security/principal/PrincipalMapperTest.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/security/principal/PrincipalMapperTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/security/principal/PrincipalMapperTest.java index cba7f1c..66b7b46 100644 --- a/gateway-spi/src/test/java/org/apache/knox/gateway/security/principal/PrincipalMapperTest.java +++ b/gateway-spi/src/test/java/org/apache/knox/gateway/security/principal/PrincipalMapperTest.java @@ -17,8 +17,8 @@ */ package org.apache.knox.gateway.security.principal; -import org.apache.hadoop.test.category.FastTests; -import org.apache.hadoop.test.category.UnitTests; +import org.apache.knox.test.category.FastTests; +import org.apache.knox.test.category.UnitTests; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-spi/src/test/java/org/apache/knox/gateway/services/hostmap/FileBasedHostMapperTest.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/services/hostmap/FileBasedHostMapperTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/services/hostmap/FileBasedHostMapperTest.java index 99be7b7..be4d798 100644 --- a/gateway-spi/src/test/java/org/apache/knox/gateway/services/hostmap/FileBasedHostMapperTest.java +++ b/gateway-spi/src/test/java/org/apache/knox/gateway/services/hostmap/FileBasedHostMapperTest.java @@ -17,7 +17,7 @@ */ package org.apache.knox.gateway.services.hostmap; -import org.apache.hadoop.test.TestUtils; +import org.apache.knox.test.TestUtils; import org.junit.Test; import java.net.URL; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFKeystoreServiceTest.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFKeystoreServiceTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFKeystoreServiceTest.java index 7386f74..28c5ea6 100644 --- a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFKeystoreServiceTest.java +++ b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFKeystoreServiceTest.java @@ -26,8 +26,8 @@ import org.apache.knox.gateway.config.GatewayConfig; import org.apache.knox.gateway.services.ServiceLifecycleException; import org.apache.knox.gateway.services.security.KeystoreServiceException; import org.apache.knox.gateway.services.security.MasterService; -import org.apache.hadoop.test.category.FastTests; -import org.apache.hadoop.test.category.UnitTests; +import org.apache.knox.test.category.FastTests; +import org.apache.knox.test.category.UnitTests; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFMasterServiceTest.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFMasterServiceTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFMasterServiceTest.java index 275b090..d3449c0 100644 --- a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFMasterServiceTest.java +++ b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/impl/CMFMasterServiceTest.java @@ -20,8 +20,8 @@ package org.apache.knox.gateway.services.security.impl; import java.io.File; import org.apache.knox.gateway.services.ServiceLifecycleException; -import org.apache.hadoop.test.category.FastTests; -import org.apache.hadoop.test.category.UnitTests; +import org.apache.knox.test.category.FastTests; +import org.apache.knox.test.category.UnitTests; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestDriver.java ---------------------------------------------------------------------- diff --git a/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestDriver.java b/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestDriver.java index dd4216f..3dcd02f 100644 --- a/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestDriver.java +++ b/gateway-test-release-utils/src/main/java/org/apache/knox/gateway/GatewayTestDriver.java @@ -43,7 +43,7 @@ import org.apache.knox.gateway.config.GatewayConfig; import org.apache.knox.gateway.security.ldap.SimpleLdapDirectoryServer; import org.apache.knox.gateway.services.DefaultGatewayServices; import org.apache.knox.gateway.services.ServiceLifecycleException; -import org.apache.hadoop.test.mock.MockServer; +import org.apache.knox.test.mock.MockServer; import org.hamcrest.CoreMatchers; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-test-release/webhdfs-kerb-test/src/test/java/org/apache/knox/gateway/SecureClusterTest.java ---------------------------------------------------------------------- diff --git a/gateway-test-release/webhdfs-kerb-test/src/test/java/org/apache/knox/gateway/SecureClusterTest.java b/gateway-test-release/webhdfs-kerb-test/src/test/java/org/apache/knox/gateway/SecureClusterTest.java index dca2a19..5395a82 100644 --- a/gateway-test-release/webhdfs-kerb-test/src/test/java/org/apache/knox/gateway/SecureClusterTest.java +++ b/gateway-test-release/webhdfs-kerb-test/src/test/java/org/apache/knox/gateway/SecureClusterTest.java @@ -33,8 +33,8 @@ import org.apache.hadoop.minikdc.MiniKdc; import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.ssl.KeyStoreTestUtil; -import org.apache.hadoop.test.TestUtils; -import org.apache.hadoop.test.category.ReleaseTest; +import org.apache.knox.test.TestUtils; +import org.apache.knox.test.category.ReleaseTest; import org.apache.http.HttpHost; import org.apache.http.HttpRequest; import org.apache.http.auth.AuthScope; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-test-release/webhdfs-test/src/test/java/org/apache/knox/gateway/ShellTest.java ---------------------------------------------------------------------- diff --git a/gateway-test-release/webhdfs-test/src/test/java/org/apache/knox/gateway/ShellTest.java b/gateway-test-release/webhdfs-test/src/test/java/org/apache/knox/gateway/ShellTest.java index 455af41..b4f5c1b 100644 --- a/gateway-test-release/webhdfs-test/src/test/java/org/apache/knox/gateway/ShellTest.java +++ b/gateway-test-release/webhdfs-test/src/test/java/org/apache/knox/gateway/ShellTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ package org.apache.knox.gateway; -import org.apache.hadoop.test.category.ReleaseTest; +import org.apache.knox.test.category.ReleaseTest; import org.junit.experimental.categories.Category; import java.io.File; @@ -35,7 +35,7 @@ import org.apache.hadoop.hdfs.HdfsConfiguration; import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.ssl.KeyStoreTestUtil; -import org.apache.hadoop.test.TestUtils; +import org.apache.knox.test.TestUtils; import org.apache.log4j.PropertyConfigurator; import org.junit.AfterClass; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-test-utils/src/main/java/org/apache/hadoop/test/Console.java ---------------------------------------------------------------------- diff --git a/gateway-test-utils/src/main/java/org/apache/hadoop/test/Console.java b/gateway-test-utils/src/main/java/org/apache/hadoop/test/Console.java deleted file mode 100644 index e5bce70..0000000 --- a/gateway-test-utils/src/main/java/org/apache/hadoop/test/Console.java +++ /dev/null @@ -1,57 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.test; - -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; - -public class Console { - - PrintStream oldOut, newOut; - PrintStream oldErr, newErr; - ByteArrayOutputStream newOutBuf, newErrBuf; - - public void capture() { - oldErr = System.err; - newErrBuf = new ByteArrayOutputStream(); - newErr = new PrintStream( newErrBuf ); - - oldOut = System.out; // I18N not required. - newOutBuf = new ByteArrayOutputStream(); - newOut = new PrintStream( newOutBuf ); - - System.setErr( newErr ); - System.setOut( newOut ); - } - - public byte[] getOut() { - return newOutBuf.toByteArray(); - } - - public byte[] getErr() { - return newErrBuf.toByteArray(); - } - - public void release() { - System.setErr( oldErr ); - System.setOut( oldOut ); - newErr.close(); - newOut.close(); - } - -} http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-test-utils/src/main/java/org/apache/hadoop/test/TestUtils.java ---------------------------------------------------------------------- diff --git a/gateway-test-utils/src/main/java/org/apache/hadoop/test/TestUtils.java b/gateway-test-utils/src/main/java/org/apache/hadoop/test/TestUtils.java deleted file mode 100644 index 076c312..0000000 --- a/gateway-test-utils/src/main/java/org/apache/hadoop/test/TestUtils.java +++ /dev/null @@ -1,216 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.test; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.io.StringWriter; -import java.net.HttpURLConnection; -import java.net.InetSocketAddress; -import java.net.ServerSocket; -import java.net.Socket; -import java.net.URL; -import java.nio.ByteBuffer; -import java.util.Properties; -import java.util.UUID; -import java.util.concurrent.TimeUnit; - -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.apache.log4j.Logger; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.VelocityEngine; -import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; -import org.eclipse.jetty.http.HttpTester; -import org.eclipse.jetty.servlet.ServletTester; - -public class TestUtils { - - private static Logger LOG = Logger.getLogger(TestUtils.class); - - public static final long SHORT_TIMEOUT = 1000L; - public static final long MEDIUM_TIMEOUT = 20 * 1000L; - public static final long LONG_TIMEOUT = 60 * 1000L; - - public static String getResourceName( Class clazz, String name ) { - name = clazz.getName().replaceAll( "\\.", "/" ) + "/" + name; - return name; - } - - public static URL getResourceUrl( Class clazz, String name ) throws FileNotFoundException { - name = getResourceName( clazz, name ); - URL url = ClassLoader.getSystemResource( name ); - if( url == null ) { - throw new FileNotFoundException( name ); - } - return url; - } - - public static URL getResourceUrl( String name ) throws FileNotFoundException { - URL url = ClassLoader.getSystemResource( name ); - if( url == null ) { - throw new FileNotFoundException( name ); - } - return url; - } - - public static InputStream getResourceStream( String name ) throws IOException { - URL url = ClassLoader.getSystemResource( name ); - InputStream stream = url.openStream(); - return stream; - } - - public static InputStream getResourceStream( Class clazz, String name ) throws IOException { - URL url = getResourceUrl( clazz, name ); - InputStream stream = url.openStream(); - return stream; - } - - public static Reader getResourceReader( String name, String charset ) throws IOException { - return new InputStreamReader( getResourceStream( name ), charset ); - } - - public static Reader getResourceReader( Class clazz, String name, String charset ) throws IOException { - return new InputStreamReader( getResourceStream( clazz, name ), charset ); - } - - public static String getResourceString( Class clazz, String name, String charset ) throws IOException { - return IOUtils.toString( getResourceReader( clazz, name, charset ) ); - } - - public static File createTempDir( String prefix ) throws IOException { - File targetDir = new File( System.getProperty( "user.dir" ), "target" ); - File tempDir = new File( targetDir, prefix + UUID.randomUUID() ); - FileUtils.forceMkdir( tempDir ); - return tempDir; - } - - public static void LOG_ENTER() { - StackTraceElement caller = Thread.currentThread().getStackTrace()[2]; - System.out.flush(); - System.out.println( String.format( "Running %s#%s", caller.getClassName(), caller.getMethodName() ) ); - System.out.flush(); - } - - public static void LOG_EXIT() { - StackTraceElement caller = Thread.currentThread().getStackTrace()[2]; - System.out.flush(); - System.out.println( String.format( "Exiting %s#%s", caller.getClassName(), caller.getMethodName() ) ); - System.out.flush(); - } - - public static void awaitPortOpen( InetSocketAddress address, int timeout, int delay ) throws InterruptedException { - long maxTime = System.currentTimeMillis() + timeout; - do { - try { - Socket socket = new Socket(); - socket.connect( address, delay ); - socket.close(); - return; - } catch ( IOException e ) { - //e.printStackTrace(); - } - } while( System.currentTimeMillis() < maxTime ); - throw new IllegalStateException( "Timed out " + timeout + " waiting for port " + address ); - } - - public static void awaitNon404HttpStatus( URL url, int timeout, int delay ) throws InterruptedException { - long maxTime = System.currentTimeMillis() + timeout; - do { - Thread.sleep( delay ); - HttpURLConnection conn = null; - try { - conn = (HttpURLConnection)url.openConnection(); - conn.getInputStream().close(); - return; - } catch ( IOException e ) { - //e.printStackTrace(); - try { - if( conn != null && conn.getResponseCode() != 404 ) { - return; - } - } catch ( IOException ee ) { - //ee.printStackTrace(); - } - } - } while( System.currentTimeMillis() < maxTime ); - throw new IllegalStateException( "Timed out " + timeout + " waiting for URL " + url ); - } - - public static String merge( String resource, Properties properties ) { - ClasspathResourceLoader loader = new ClasspathResourceLoader(); - loader.getResourceStream( resource ); - - VelocityEngine engine = new VelocityEngine(); - Properties config = new Properties(); - config.setProperty( RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, "org.apache.velocity.runtime.log.NullLogSystem" ); - config.setProperty( RuntimeConstants.RESOURCE_LOADER, "classpath" ); - config.setProperty( "classpath.resource.loader.class", ClasspathResourceLoader.class.getName() ); - engine.init( config ); - - VelocityContext context = new VelocityContext( properties ); - Template template = engine.getTemplate( resource ); - StringWriter writer = new StringWriter(); - template.merge( context, writer ); - return writer.toString(); - } - - public static String merge( Class base, String resource, Properties properties ) { - String baseResource = base.getName().replaceAll( "\\.", "/" ); - String fullResource = baseResource + "/" + resource; - return merge( fullResource, properties ); - } - - public static int findFreePort() throws IOException { - ServerSocket socket = new ServerSocket(0); - int port = socket.getLocalPort(); - socket.close(); - return port; - } - - public static void waitUntilNextSecond() { - long before = System.currentTimeMillis(); - long wait; - while( ( wait = ( 1000 - ( System.currentTimeMillis() - before ) ) ) > 0 ) { - try { - Thread.sleep( wait ); - } catch( InterruptedException e ) { - // Ignore. - } - } - } - - public static HttpTester.Response execute( ServletTester server, HttpTester.Request request ) throws Exception { - LOG.debug( "execute: request=" + request ); - ByteBuffer requestBuffer = request.generate(); - LOG.trace( "execute: requestBuffer=[" + new String(requestBuffer.array(),0,requestBuffer.limit()) + "]" ); - ByteBuffer responseBuffer = server.getResponses( requestBuffer, 30, TimeUnit.SECONDS ); - HttpTester.Response response = HttpTester.parseResponse( responseBuffer ); - LOG.trace( "execute: responseBuffer=[" + new String(responseBuffer.array(),0,responseBuffer.limit()) + "]" ); - LOG.debug( "execute: reponse=" + response ); - return response; - } - - -} http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/FastTests.java ---------------------------------------------------------------------- diff --git a/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/FastTests.java b/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/FastTests.java deleted file mode 100644 index 7761430..0000000 --- a/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/FastTests.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * <p/> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p/> - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.test.category; - -public interface FastTests { -} http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/ManualTests.java ---------------------------------------------------------------------- diff --git a/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/ManualTests.java b/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/ManualTests.java deleted file mode 100644 index 840dbb3..0000000 --- a/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/ManualTests.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.test.category; - -public interface ManualTests { -} http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/MediumTests.java ---------------------------------------------------------------------- diff --git a/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/MediumTests.java b/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/MediumTests.java deleted file mode 100644 index 5cec811..0000000 --- a/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/MediumTests.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.test.category; - -public interface MediumTests { -} http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/ReleaseTest.java ---------------------------------------------------------------------- diff --git a/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/ReleaseTest.java b/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/ReleaseTest.java deleted file mode 100644 index bd52807..0000000 --- a/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/ReleaseTest.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.test.category; - -public interface ReleaseTest { -} http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/SlowTests.java ---------------------------------------------------------------------- diff --git a/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/SlowTests.java b/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/SlowTests.java deleted file mode 100644 index d395b02..0000000 --- a/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/SlowTests.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * <p/> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p/> - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.test.category; - -public interface SlowTests { -} http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/UnitTests.java ---------------------------------------------------------------------- diff --git a/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/UnitTests.java b/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/UnitTests.java deleted file mode 100644 index f36d539..0000000 --- a/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/UnitTests.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.test.category; - -public interface UnitTests { -} http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/VerifyTest.java ---------------------------------------------------------------------- diff --git a/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/VerifyTest.java b/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/VerifyTest.java deleted file mode 100644 index 0b0acaa..0000000 --- a/gateway-test-utils/src/main/java/org/apache/hadoop/test/category/VerifyTest.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.test.category; - -public interface VerifyTest { -} http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-test-utils/src/main/java/org/apache/hadoop/test/log/CollectAppender.java ---------------------------------------------------------------------- diff --git a/gateway-test-utils/src/main/java/org/apache/hadoop/test/log/CollectAppender.java b/gateway-test-utils/src/main/java/org/apache/hadoop/test/log/CollectAppender.java deleted file mode 100644 index d14ab7b..0000000 --- a/gateway-test-utils/src/main/java/org/apache/hadoop/test/log/CollectAppender.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.test.log; - -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.LinkedBlockingQueue; - -import org.apache.log4j.AppenderSkeleton; -import org.apache.log4j.spi.LoggingEvent; - -public class CollectAppender extends AppenderSkeleton { - - public CollectAppender() { - super(); - } - - public static BlockingQueue<LoggingEvent> queue = new LinkedBlockingQueue<LoggingEvent>(); - public static boolean closed = false; - - @Override - protected void append( LoggingEvent event ) { - event.getProperties(); - queue.add( event ); - } - - @Override - public void close() { - closed = true; - } - - @Override - public boolean requiresLayout() { - return false; - } - -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-test-utils/src/main/java/org/apache/hadoop/test/log/NoOpAppender.java ---------------------------------------------------------------------- diff --git a/gateway-test-utils/src/main/java/org/apache/hadoop/test/log/NoOpAppender.java b/gateway-test-utils/src/main/java/org/apache/hadoop/test/log/NoOpAppender.java deleted file mode 100644 index 647f0e2..0000000 --- a/gateway-test-utils/src/main/java/org/apache/hadoop/test/log/NoOpAppender.java +++ /dev/null @@ -1,98 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.test.log; - -import org.apache.log4j.Appender; -import org.apache.log4j.Layout; -import org.apache.log4j.Logger; -import org.apache.log4j.spi.ErrorHandler; -import org.apache.log4j.spi.Filter; -import org.apache.log4j.spi.LoggingEvent; - -import java.util.Enumeration; - -public class NoOpAppender implements Appender { - - public static Enumeration<Appender> setUp() { - Enumeration<Appender> appenders = (Enumeration<Appender>)Logger.getRootLogger().getAllAppenders(); - Logger.getRootLogger().removeAllAppenders(); - Logger.getRootLogger().addAppender( new NoOpAppender() ); - return appenders; - } - - public static void tearDown( Enumeration<Appender> appenders ) { - if( appenders != null ) { - while( appenders.hasMoreElements() ) { - Logger.getRootLogger().addAppender( appenders.nextElement() ); - } - } - } - - @Override - public void addFilter( Filter newFilter ) { - } - - @Override - public Filter getFilter() { - return null; - } - - @Override - public void clearFilters() { - } - - @Override - public void close() { - } - - @Override - public void doAppend( LoggingEvent event ) { - } - - @Override - public String getName() { - return this.getClass().getName(); - } - - @Override - public void setErrorHandler( ErrorHandler errorHandler ) { - } - - @Override - public ErrorHandler getErrorHandler() { - return null; - } - - @Override - public void setLayout( Layout layout ) { - } - - @Override - public Layout getLayout() { - return null; - } - - @Override - public void setName( String name ) { - } - - @Override - public boolean requiresLayout() { - return false; - } -} http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-test-utils/src/main/java/org/apache/hadoop/test/log/NoOpLogger.java ---------------------------------------------------------------------- diff --git a/gateway-test-utils/src/main/java/org/apache/hadoop/test/log/NoOpLogger.java b/gateway-test-utils/src/main/java/org/apache/hadoop/test/log/NoOpLogger.java deleted file mode 100644 index 8fd24ed..0000000 --- a/gateway-test-utils/src/main/java/org/apache/hadoop/test/log/NoOpLogger.java +++ /dev/null @@ -1,87 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.test.log; - -import org.eclipse.jetty.util.log.Logger; - -public class NoOpLogger implements Logger { - - @Override - public String getName() { - return ""; - } - - @Override - public void warn( String msg, Object... args ) { - } - - @Override - public void warn( Throwable thrown ) { - } - - @Override - public void warn( String msg, Throwable thrown ) { - } - - @Override - public void info( String msg, Object... args ) { - } - - @Override - public void info( Throwable thrown ) { - } - - @Override - public void info( String msg, Throwable thrown ) { - } - - @Override - public boolean isDebugEnabled() { - return false; - } - - @Override - public void setDebugEnabled( boolean enabled ) { - } - - @Override - public void debug( String msg, Object... args ) { - } - - @Override - public void debug( String msg, long arg ) { - } - - @Override - public void debug( Throwable thrown ) { - } - - @Override - public void debug( String msg, Throwable thrown ) { - } - - @Override - public Logger getLogger( String name ) { - return this; - } - - @Override - public void ignore( Throwable ignored ) { - } - -} http://git-wip-us.apache.org/repos/asf/knox/blob/1451428f/gateway-test-utils/src/main/java/org/apache/hadoop/test/mock/MockFilterConfig.java ---------------------------------------------------------------------- diff --git a/gateway-test-utils/src/main/java/org/apache/hadoop/test/mock/MockFilterConfig.java b/gateway-test-utils/src/main/java/org/apache/hadoop/test/mock/MockFilterConfig.java deleted file mode 100644 index eae1ef6..0000000 --- a/gateway-test-utils/src/main/java/org/apache/hadoop/test/mock/MockFilterConfig.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.test.mock; - -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; -import java.util.Enumeration; - -public class MockFilterConfig implements FilterConfig { - - @Override - public String getFilterName() { - return null; - } - - @Override - public ServletContext getServletContext() { - return null; - } - - @Override - public String getInitParameter( String s ) { - return null; - } - - @Override - public Enumeration<String> getInitParameterNames() { - return null; - } - -}