http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java index 50d2e52..27217ae 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java @@ -23,11 +23,12 @@ import org.junit.BeforeClass; import org.junit.Test; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.util.List; import java.util.Map; @@ -41,7 +42,7 @@ public class ProviderConfigurationParserTest { private static File tmpDir; @BeforeClass - public static void createTempDir() { + public static void setUpBeforeClass() { try { tmpDir = TestUtils.createTempDir(ProviderConfigurationParser.class.getName()); } catch (IOException e) { @@ -50,7 +51,7 @@ public class ProviderConfigurationParserTest { } @AfterClass - public static void removeTempDir() { + public static void tearDownAfterClass() { if (tmpDir != null) { FileUtils.deleteQuietly(tmpDir); } @@ -291,7 +292,6 @@ public class ProviderConfigurationParserTest { } } - /** * Parse the specified configuration, and return the parse result for validation by the caller. * @@ -305,10 +305,11 @@ public class ProviderConfigurationParserTest { File testConfig = new File(tmpDir, fileName); - Writer fw = new OutputStreamWriter(new FileOutputStream(testConfig), StandardCharsets.UTF_8); - fw.write(config); - fw.flush(); - fw.close(); + try (OutputStream outputStream = Files.newOutputStream(testConfig.toPath()); + Writer fw = new OutputStreamWriter(outputStream, StandardCharsets.UTF_8)) { + fw.write(config); + fw.flush(); + } try { pc = ProviderConfigurationParser.parse(testConfig.getAbsolutePath()); @@ -318,6 +319,4 @@ public class ProviderConfigurationParserTest { return pc; } - - }
http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorFactoryTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorFactoryTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorFactoryTest.java index 5504d1c..52cc6ee 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorFactoryTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/SimpleDescriptorFactoryTest.java @@ -19,10 +19,13 @@ package org.apache.knox.gateway.topology.simple; import org.junit.Test; import java.io.File; -import java.io.FileOutputStream; +import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -34,7 +37,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; - public class SimpleDescriptorFactoryTest { private enum FileType { @@ -541,9 +543,9 @@ public class SimpleDescriptorFactoryTest { Map<String, Map<String, String>> serviceParams, Map<String, List<String>> apps, Map<String, Map<String, String>> appParams) throws Exception { - File f = new File(path); - - Writer fw = new OutputStreamWriter(new FileOutputStream(f), StandardCharsets.UTF_8); + Path pathObject = Paths.get(path); + try (OutputStream outputStream = Files.newOutputStream(pathObject); + Writer fw = new OutputStreamWriter(outputStream, StandardCharsets.UTF_8)) { fw.write("{" + "\n"); fw.write("\"discovery-type\":\"" + discoveryType + "\",\n"); fw.write("\"discovery-address\":\"" + discoveryAddress + "\",\n"); @@ -552,22 +554,21 @@ public class SimpleDescriptorFactoryTest { fw.write("\"cluster\":\"" + clusterName + "\""); if (services != null && !services.isEmpty()) { - fw.write(",\n\"services\":[\n"); - writeServiceOrApplicationJSON(fw, services, serviceParams, serviceVersions); - fw.write("]\n"); + fw.write(",\n\"services\":[\n"); + writeServiceOrApplicationJSON(fw, services, serviceParams, serviceVersions); + fw.write("]\n"); } if (apps != null && !apps.isEmpty()) { - fw.write(",\n\"applications\":[\n"); - writeServiceOrApplicationJSON(fw, apps, appParams, null); - fw.write("]\n"); + fw.write(",\n\"applications\":[\n"); + writeServiceOrApplicationJSON(fw, apps, appParams, null); + fw.write("]\n"); } fw.write("}\n"); fw.flush(); - fw.close(); - - return f; + } + return pathObject.toFile(); } private void writeServiceOrApplicationJSON(Writer fw, @@ -637,30 +638,29 @@ public class SimpleDescriptorFactoryTest { Map<String, List<String>> apps, Map<String, Map<String, String>> appParams) throws Exception { - File f = new File(path); - - Writer fw = new OutputStreamWriter(new FileOutputStream(f), StandardCharsets.UTF_8); + Path pathObject = Paths.get(path); + try (OutputStream outputStream = Files.newOutputStream(pathObject); + Writer fw = new OutputStreamWriter(outputStream, StandardCharsets.UTF_8)) { fw.write("---" + "\n"); fw.write("discovery-type: " + discoveryType + "\n"); fw.write("discovery-address: " + discoveryAddress + "\n"); fw.write("discovery-user: " + discoveryUser + "\n"); fw.write("provider-config-ref: " + providerConfig + "\n"); - fw.write("cluster: " + clusterName+ "\n"); + fw.write("cluster: " + clusterName + "\n"); if (services != null && !services.isEmpty()) { - fw.write("services:\n"); - writeServiceOrApplicationYAML(fw, services, serviceParams, serviceVersions); + fw.write("services:\n"); + writeServiceOrApplicationYAML(fw, services, serviceParams, serviceVersions); } if (apps != null && !apps.isEmpty()) { - fw.write("applications:\n"); - writeServiceOrApplicationYAML(fw, apps, appParams, null); + fw.write("applications:\n"); + writeServiceOrApplicationYAML(fw, apps, appParams, null); } fw.flush(); - fw.close(); - - return f; + } + return pathObject.toFile(); } private void writeServiceOrApplicationYAML(Writer fw, http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/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 89fd866..db422e2 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 @@ -38,10 +38,11 @@ import javax.xml.xpath.XPathFactory; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileNotFoundException; -import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStream; import java.io.StringWriter; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -155,8 +156,8 @@ public class SimpleDescriptorHandlerTest { DISCOVERY_PROPERTIES.setProperty(clusterName + ".HIVE.url", "http://hivehostname:10001/clipath";); DISCOVERY_PROPERTIES.setProperty(clusterName + ".RESOURCEMANAGER.url", "http://remanhost:8088/ws";); - try { - DISCOVERY_PROPERTIES.store(new FileOutputStream(discoveryConfig), null); + try (OutputStream outputStream = Files.newOutputStream(discoveryConfig.toPath())){ + DISCOVERY_PROPERTIES.store(outputStream, null); } catch (FileNotFoundException e) { fail(e.getMessage()); } @@ -338,9 +339,11 @@ public class SimpleDescriptorHandlerTest { serviceDiscoverySourceProps.setProperty(CLUSTER_NAME + ".HIVE.url", "{SCHEME}://localhost:10000/"); serviceDiscoverySourceProps.setProperty(CLUSTER_NAME + ".RESOURCEMANAGER.url", DEFAULT_VALID_SERVICE_URL); serviceDiscoverySourceProps.setProperty(CLUSTER_NAME + ".AMBARIUI.url", DEFAULT_VALID_SERVICE_URL); + File serviceDiscoverySource = File.createTempFile("service-discovery", ".properties"); - serviceDiscoverySourceProps.store(new FileOutputStream(serviceDiscoverySource), - "Test Service Discovery Source"); + try (OutputStream outputStream = Files.newOutputStream(serviceDiscoverySource.toPath())) { + serviceDiscoverySourceProps.store(outputStream, "Test Service Discovery Source"); + } // Prepare a mock SimpleDescriptor final String type = "PROPERTIES_FILE"; @@ -457,13 +460,11 @@ public class SimpleDescriptorHandlerTest { } } - /* * KNOX-1216 */ - @Test + @Test (expected = IllegalArgumentException.class) public void testMissingProviderConfigReference() throws Exception { - // Prepare a mock SimpleDescriptor final Map<String, List<String>> serviceURLs = new HashMap<>(); serviceURLs.put("NAMENODE", null); @@ -499,20 +500,9 @@ public class SimpleDescriptorHandlerTest { EasyMock.expect(testDescriptor.getServices()).andReturn(serviceMocks).anyTimes(); EasyMock.replay(testDescriptor); - try { - // Invoke the simple descriptor handler - SimpleDescriptorHandler.handle(gc, testDescriptor, destDir, destDir); - fail("Expected an IllegalArgumentException because the provider configuration reference is missing."); - } catch (IllegalArgumentException e) { - // Expected - } catch (Exception e) { - e.printStackTrace(); - fail("Unexpected exception for missing provider configuration reference: " + - e.getClass().getName() + " : " + e.getMessage()); - } + SimpleDescriptorHandler.handle(gc, testDescriptor, destDir, destDir); } - /* * KNOX-1153 * @@ -557,8 +547,8 @@ public class SimpleDescriptorHandlerTest { DISCOVERY_PROPERTIES.setProperty(clusterName + ".ATLAS-API.ensemble", ATLAS_HA_ENSEMBLE); DISCOVERY_PROPERTIES.setProperty(clusterName + ".ATLAS-API.url", "http://atlasapihost:2222";); - try { - DISCOVERY_PROPERTIES.store(new FileOutputStream(discoveryConfig), null); + try (OutputStream outputStream = Files.newOutputStream(discoveryConfig.toPath())){ + DISCOVERY_PROPERTIES.store(outputStream, null); } catch (FileNotFoundException e) { fail(e.getMessage()); } http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java b/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java index 9e7921f..f94e979 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java @@ -33,11 +33,12 @@ import org.junit.Test; import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStream; import java.io.PrintStream; import java.net.URL; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.util.UUID; import static org.hamcrest.CoreMatchers.containsString; @@ -60,7 +61,7 @@ public class KnoxCLITest { private final ByteArrayOutputStream errContent = new ByteArrayOutputStream(); @Before - public void setup() throws Exception { + public void setUp() throws Exception { System.setOut(new PrintStream(outContent, false, StandardCharsets.UTF_8.name())); System.setErr(new PrintStream(errContent, false, StandardCharsets.UTF_8.name())); } @@ -965,9 +966,9 @@ public class KnoxCLITest { config.setConfDir( new File(topoURL.getFile()).getParentFile().getParent() ); File tempFile = new File( config.getGatewayTopologyDir(), name + ".xml." + UUID.randomUUID() ); - FileOutputStream stream = new FileOutputStream( tempFile ); - xml.toStream( stream ); - stream.close(); + try(OutputStream stream = Files.newOutputStream(tempFile.toPath())) { + xml.toStream(stream); + } File descriptor = new File( config.getGatewayTopologyDir(), name + ".xml" ); tempFile.renameTo( descriptor ); return descriptor; @@ -1015,7 +1016,9 @@ public class KnoxCLITest { public void testValidateTopologyOutput() throws Exception { File bad = writeTestTopology( "test-cluster-bad", createBadTopology() ); + assertNotNull(bad); File good = writeTestTopology( "test-cluster-good", createGoodTopology() ); + assertNotNull(good); GatewayConfigMock config = new GatewayConfigMock(); URL topoURL = ClassLoader.getSystemResource("conf-demo/conf/topologies/admin.xml"); http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadBackendTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadBackendTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadBackendTest.java index ceaad86..6637813 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadBackendTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadBackendTest.java @@ -37,7 +37,6 @@ import java.util.concurrent.TimeUnit; /** * Test a case where the backend is down. - * */ public class BadBackendTest { /* Proxy */ http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadSocket.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadSocket.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadSocket.java new file mode 100644 index 0000000..0744f8c --- /dev/null +++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BadSocket.java @@ -0,0 +1,69 @@ +/* + * 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.knox.gateway.websockets; + +import org.eclipse.jetty.io.RuntimeIOException; +import org.eclipse.jetty.util.BufferUtil; +import org.eclipse.jetty.websocket.api.BatchMode; +import org.eclipse.jetty.websocket.api.RemoteEndpoint; +import org.eclipse.jetty.websocket.api.Session; +import org.eclipse.jetty.websocket.api.WebSocketAdapter; + +import java.io.IOException; + +/** + * Simulate a bad socket. + * + * @since 0.10 + */ +class BadSocket extends WebSocketAdapter { + @Override + public void onWebSocketConnect(final Session session) { + } + + @Override + public void onWebSocketBinary(byte[] payload, int offset, int len) { + if (isNotConnected()) { + return; + } + + try { + RemoteEndpoint remote = getRemote(); + remote.sendBytes(BufferUtil.toBuffer(payload, offset, len), null); + if (remote.getBatchMode() == BatchMode.ON) { + remote.flush(); + } + } catch (IOException x) { + throw new RuntimeIOException(x); + } + } + + @Override + public void onWebSocketError(Throwable cause) { + throw new RuntimeException(cause); + } + + @Override + public void onWebSocketText(String message) { + if (isNotConnected()) { + return; + } + // Throw an exception on purpose + throw new RuntimeException("Simulating bad connection ..."); + } +} http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/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 e61ddde..a3c5cf8 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 @@ -45,10 +45,11 @@ import javax.websocket.CloseReason; import javax.websocket.ContainerProvider; import javax.websocket.WebSocketContainer; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStream; import java.net.URI; import java.net.URL; +import java.nio.file.Files; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -95,12 +96,12 @@ public class BadUrlTest { } @BeforeClass - public static void startServers() throws Exception { + public static void setUpBeforeClass() throws Exception { startGatewayServer(); } @AfterClass - public static void stopServers() { + public static void tearDownAfterClass() { try { gatewayServer.stop(); } catch (final Exception e) { @@ -173,9 +174,9 @@ public class BadUrlTest { URL serviceUrl = ClassLoader.getSystemResource("websocket-services"); final File descriptor = new File(topoDir, "websocket.xml"); - final FileOutputStream stream = new FileOutputStream(descriptor); - createKnoxTopology(backend).toStream(stream); - stream.close(); + try(OutputStream stream = Files.newOutputStream(descriptor.toPath())) { + createKnoxTopology(backend).toStream(stream); + } final TestTopologyListener topoListener = new TestTopologyListener(); @@ -271,8 +272,7 @@ public class BadUrlTest { } private static class TestTopologyListener implements TopologyListener { - - public ArrayList<List<TopologyEvent>> events = new ArrayList<>(); + public List<List<TopologyEvent>> events = new ArrayList<>(); @Override public void handleTopologyEvent(List<TopologyEvent> events) { http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BigEchoSocketHandler.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BigEchoSocketHandler.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BigEchoSocketHandler.java new file mode 100644 index 0000000..080a5a1 --- /dev/null +++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/BigEchoSocketHandler.java @@ -0,0 +1,49 @@ +/* + * 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.knox.gateway.websockets; + +import org.eclipse.jetty.websocket.api.WebSocketAdapter; +import org.eclipse.jetty.websocket.server.WebSocketHandler; +import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest; +import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse; +import org.eclipse.jetty.websocket.servlet.WebSocketCreator; +import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory; + +/** + * A Mock websocket handler that just Echos messages + */ +class BigEchoSocketHandler extends WebSocketHandler implements WebSocketCreator { + private final WebSocketAdapter socket; + + BigEchoSocketHandler(final WebSocketAdapter socket) { + this.socket = socket; + } + + @Override + public void configure(WebSocketServletFactory factory) { + factory.getPolicy().setMaxTextMessageSize(10); + factory.getPolicy().setMaxBinaryMessageSize(10); + factory.setCreator(this); + } + + @Override + public Object createWebSocket(ServletUpgradeRequest req, + ServletUpgradeResponse resp) { + return socket; + } +} http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ConnectionDroppedTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ConnectionDroppedTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ConnectionDroppedTest.java index 88a3275..80e3509 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ConnectionDroppedTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ConnectionDroppedTest.java @@ -17,15 +17,9 @@ */ package org.apache.knox.gateway.websockets; -import org.eclipse.jetty.io.RuntimeIOException; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.handler.ContextHandler; -import org.eclipse.jetty.util.BufferUtil; -import org.eclipse.jetty.websocket.api.BatchMode; -import org.eclipse.jetty.websocket.api.RemoteEndpoint; -import org.eclipse.jetty.websocket.api.Session; -import org.eclipse.jetty.websocket.api.WebSocketAdapter; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -46,7 +40,6 @@ import java.util.concurrent.TimeUnit; * */ public class ConnectionDroppedTest { - private static Server backend; private static ServerConnector connector; private static URI serverUri; @@ -61,13 +54,13 @@ public class ConnectionDroppedTest { } @BeforeClass - public static void startServer() throws Exception { + public static void setUpBeforeClass() throws Exception { startBackend(); startProxy(); } @AfterClass - public static void stopServer() throws Exception { + public static void tearDownAfterClass() throws Exception { /* ORDER MATTERS ! */ proxy.stop(); backend.stop(); @@ -116,7 +109,6 @@ public class ConnectionDroppedTest { } int port = connector.getLocalPort(); serverUri = new URI(String.format(Locale.ROOT, "ws://%s:%d/", host, port)); - } private static void startProxy() throws Exception { @@ -142,51 +134,5 @@ public class ConnectionDroppedTest { } int port = proxyConnector.getLocalPort(); proxyUri = new URI(String.format(Locale.ROOT, "ws://%s:%d/", host, port)); - } - -} - -/** - * Simulate a bad socket. - * - * @since 0.10 - */ -class BadSocket extends WebSocketAdapter { - - private Session session; - - @Override - public void onWebSocketConnect(final Session session) { - this.session = session; - } - - @Override - public void onWebSocketBinary(byte[] payload, int offset, int len) { - if (isNotConnected()) - return; - - try { - RemoteEndpoint remote = getRemote(); - remote.sendBytes(BufferUtil.toBuffer(payload, offset, len), null); - if (remote.getBatchMode() == BatchMode.ON) - remote.flush(); - } catch (IOException x) { - throw new RuntimeIOException(x); - } - } - - @Override - public void onWebSocketError(Throwable cause) { - throw new RuntimeException(cause); - } - - @Override - public void onWebSocketText(String message) { - if (isNotConnected()) - return; - // Throw an exception on purpose - throw new RuntimeException("Simulating bad connection ..."); - } - } http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/gateway-server/src/test/java/org/apache/knox/gateway/websockets/EchoSocket.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/EchoSocket.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/EchoSocket.java index 4d55b60..3e025e7 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/EchoSocket.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/EchoSocket.java @@ -32,14 +32,16 @@ public class EchoSocket extends WebSocketAdapter { @Override public void onWebSocketBinary(byte[] payload, int offset, int len) { - if (isNotConnected()) + if (isNotConnected()) { return; + } try { RemoteEndpoint remote = getRemote(); remote.sendBytes(BufferUtil.toBuffer(payload, offset, len), null); - if (remote.getBatchMode() == BatchMode.ON) + if (remote.getBatchMode() == BatchMode.ON) { remote.flush(); + } } catch (IOException x) { throw new RuntimeIOException(x); } @@ -52,14 +54,16 @@ public class EchoSocket extends WebSocketAdapter { @Override public void onWebSocketText(String message) { - if (isNotConnected()) + if (isNotConnected()) { return; + } try { RemoteEndpoint remote = getRemote(); remote.sendString(message, null); - if (remote.getBatchMode() == BatchMode.ON) + if (remote.getBatchMode() == BatchMode.ON) { remote.flush(); + } } catch (IOException x) { throw new RuntimeIOException(x); } http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/gateway-server/src/test/java/org/apache/knox/gateway/websockets/MessageFailureTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/MessageFailureTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/MessageFailureTest.java index 9786dc1..a265f65 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/MessageFailureTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/MessageFailureTest.java @@ -20,12 +20,6 @@ package org.apache.knox.gateway.websockets; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.handler.ContextHandler; -import org.eclipse.jetty.websocket.api.WebSocketAdapter; -import org.eclipse.jetty.websocket.server.WebSocketHandler; -import org.eclipse.jetty.websocket.servlet.ServletUpgradeRequest; -import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse; -import org.eclipse.jetty.websocket.servlet.WebSocketCreator; -import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory; import org.hamcrest.CoreMatchers; import org.junit.AfterClass; import org.junit.Assert; @@ -41,11 +35,9 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; /** - * Dummy Test for max message size. - * + * Test for max message size. */ public class MessageFailureTest { - private static Server backend; private static ServerConnector connector; private static URI serverUri; @@ -60,13 +52,13 @@ public class MessageFailureTest { } @BeforeClass - public static void startServer() throws Exception { + public static void setUpBeforeClass() throws Exception { startBackend(); startProxy(); } @AfterClass - public static void stopServer() throws Exception { + public static void tearDownAfterClass() throws Exception { /* ORDER MATTERS ! */ proxy.stop(); backend.stop(); @@ -109,7 +101,6 @@ public class MessageFailureTest { client.messageQueue.awaitMessages(1, 1000, TimeUnit.MILLISECONDS); Assert.assertThat(client.messageQueue.get(0), CoreMatchers.is("Echo")); - } private static void startBackend() throws Exception { @@ -135,7 +126,6 @@ public class MessageFailureTest { } int port = connector.getLocalPort(); serverUri = new URI(String.format(Locale.ROOT, "ws://%s:%d/", host, port)); - } private static void startProxy() throws Exception { @@ -163,28 +153,3 @@ public class MessageFailureTest { proxyUri = new URI(String.format(Locale.ROOT, "ws://%s:%d/", host, port)); } } - -/** - * A Mock websocket handler that just Echos messages - */ -class BigEchoSocketHandler extends WebSocketHandler implements WebSocketCreator { - private final WebSocketAdapter socket; - - BigEchoSocketHandler(final WebSocketAdapter socket) { - this.socket = socket; - } - - @Override - public void configure(WebSocketServletFactory factory) { - factory.getPolicy().setMaxTextMessageSize(10); - factory.getPolicy().setMaxBinaryMessageSize(10); - factory.setCreator(this); - } - - @Override - public Object createWebSocket(ServletUpgradeRequest req, - ServletUpgradeResponse resp) { - return socket; - } - -} http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ProxyInboundClientTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ProxyInboundClientTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ProxyInboundClientTest.java index c445254..e812c13 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ProxyInboundClientTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/ProxyInboundClientTest.java @@ -45,15 +45,11 @@ import static org.hamcrest.Matchers.instanceOf; * @since 0.14.0 */ public class ProxyInboundClientTest { - private static Server server; private static URI serverUri; - private static Handler handler; - - String recievedMessage; - - byte[] recievedBinaryMessage; + private String receivedMessage; + private byte[] receivedBinaryMessage; /* create an instance */ public ProxyInboundClientTest() { @@ -61,13 +57,12 @@ public class ProxyInboundClientTest { } @BeforeClass - public static void startWSServer() throws Exception - { + public static void setUpBeforeClass() throws Exception { server = new Server(); ServerConnector connector = new ServerConnector(server); server.addConnector(connector); - handler = new WebsocketEchoHandler(); + Handler handler = new WebsocketEchoHandler(); ContextHandler context = new ContextHandler(); context.setContextPath("/"); @@ -77,8 +72,7 @@ public class ProxyInboundClientTest { server.start(); String host = connector.getHost(); - if (host == null) - { + if (host == null) { host = "localhost"; } int port = connector.getLocalPort(); @@ -86,14 +80,10 @@ public class ProxyInboundClientTest { } @AfterClass - public static void stopServer() - { - try - { + public static void tearDownAfterClass() { + try { server.stop(); - } - catch (Exception e) - { + } catch (Exception e) { e.printStackTrace(System.err); } } @@ -101,23 +91,18 @@ public class ProxyInboundClientTest { //@Test(timeout = 3000) @Test public void testClientInstance() throws IOException, DeploymentException { - final String textMessage = "Echo"; - final ByteBuffer binarymessage = ByteBuffer.wrap(textMessage.getBytes(StandardCharsets.UTF_8)); final AtomicBoolean isTestComplete = new AtomicBoolean(false); final WebSocketContainer container = ContainerProvider.getWebSocketContainer(); final ProxyInboundClient client = new ProxyInboundClient( new MessageEventCallback() { - @Override public void doCallback(String message) { - } @Override public void onConnectionOpen(Object session) { - } @Override @@ -132,16 +117,14 @@ public class ProxyInboundClientTest { @Override public void onMessageText(String message, Object session) { - recievedMessage = message; + receivedMessage = message; isTestComplete.set(true); } @Override - public void onMessageBinary(byte[] message, boolean last, - Object session) { - + public void onMessageBinary(byte[] message, boolean last, Object session) { } - } ); + }); Assert.assertThat(client, instanceOf(javax.websocket.Endpoint.class)); @@ -149,16 +132,15 @@ public class ProxyInboundClientTest { session.getBasicRemote().sendText(textMessage); - while(!isTestComplete.get()) { + while(!isTestComplete.get()) { // NOPMD /* just wait for the test to finish */ } - Assert.assertEquals("The received text message is not the same as the sent", textMessage, recievedMessage); + Assert.assertEquals("The received text message is not the same as the sent", textMessage, receivedMessage); } @Test(timeout = 3000) public void testBinarymessage() throws IOException, DeploymentException { - final String textMessage = "Echo"; final ByteBuffer binarymessage = ByteBuffer.wrap(textMessage.getBytes(StandardCharsets.UTF_8)); @@ -166,15 +148,12 @@ public class ProxyInboundClientTest { final WebSocketContainer container = ContainerProvider.getWebSocketContainer(); final ProxyInboundClient client = new ProxyInboundClient( new MessageEventCallback() { - @Override public void doCallback(String message) { - } @Override public void onConnectionOpen(Object session) { - } @Override @@ -189,17 +168,16 @@ public class ProxyInboundClientTest { @Override public void onMessageText(String message, Object session) { - recievedMessage = message; + receivedMessage = message; isTestComplete.set(true); } @Override - public void onMessageBinary(byte[] message, boolean last, - Object session) { - recievedBinaryMessage = message; + public void onMessageBinary(byte[] message, boolean last, Object session) { + receivedBinaryMessage = message; isTestComplete.set(true); } - } ); + }); Assert.assertThat(client, instanceOf(javax.websocket.Endpoint.class)); @@ -207,31 +185,27 @@ public class ProxyInboundClientTest { session.getBasicRemote().sendBinary(binarymessage); - while(!isTestComplete.get()) { + while(!isTestComplete.get()) { // NOPMD /* just wait for the test to finish */ } - Assert.assertEquals("Binary message does not match", textMessage, new String(recievedBinaryMessage, StandardCharsets.UTF_8)); + Assert.assertEquals("Binary message does not match", textMessage, new String(receivedBinaryMessage, StandardCharsets.UTF_8)); } @Test(timeout = 3000) public void testTextMaxBufferLimit() throws IOException, DeploymentException { - final String longMessage = RandomStringUtils.random(100000); final AtomicBoolean isTestComplete = new AtomicBoolean(false); final WebSocketContainer container = ContainerProvider.getWebSocketContainer(); final ProxyInboundClient client = new ProxyInboundClient( new MessageEventCallback() { - @Override public void doCallback(String message) { - } @Override public void onConnectionOpen(Object session) { - } @Override @@ -246,16 +220,14 @@ public class ProxyInboundClientTest { @Override public void onMessageText(String message, Object session) { - recievedMessage = message; + receivedMessage = message; isTestComplete.set(true); } @Override - public void onMessageBinary(byte[] message, boolean last, - Object session) { - + public void onMessageBinary(byte[] message, boolean last, Object session) { } - } ); + }); Assert.assertThat(client, instanceOf(javax.websocket.Endpoint.class)); @@ -263,14 +235,10 @@ public class ProxyInboundClientTest { session.getBasicRemote().sendText(longMessage); - while(!isTestComplete.get()) { + while(!isTestComplete.get()) { // NOPMD /* just wait for the test to finish */ } - Assert.assertEquals(longMessage, recievedMessage); - + Assert.assertEquals(longMessage, receivedMessage); } - - - } http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketClient.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketClient.java b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketClient.java index 6cb9cd1..772be94 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketClient.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/websockets/WebsocketClient.java @@ -19,6 +19,7 @@ package org.apache.knox.gateway.websockets; import java.io.IOException; import java.util.LinkedList; +import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -43,7 +44,7 @@ public class WebsocketClient { private Session session; public CloseReason close; public MessageQueue messageQueue = new MessageQueue(); - public LinkedList<Throwable> errors = new LinkedList<>(); + public List<Throwable> errors = new LinkedList<>(); public CountDownLatch closeLatch = new CountDownLatch(1); public boolean onError; http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/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 b8bfd2e..4d1f38f 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 @@ -43,10 +43,11 @@ import javax.websocket.ContainerProvider; import javax.websocket.Session; import javax.websocket.WebSocketContainer; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStream; import java.net.URI; import java.net.URL; +import java.nio.file.Files; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -113,13 +114,13 @@ public class WebsocketEchoTest { } @BeforeClass - public static void startServers() throws Exception { + public static void setUpBeforeClass() throws Exception { startWebsocketServer(); startGatewayServer(); } @AfterClass - public static void stopServers() { + public static void tearDownAfterClass() { try { gatewayServer.stop(); backendServer.stop(); @@ -258,9 +259,9 @@ public class WebsocketEchoTest { URL serviceUrl = ClassLoader.getSystemResource("websocket-services"); final File descriptor = new File(topoDir, "websocket.xml"); - final FileOutputStream stream = new FileOutputStream(descriptor); - createKnoxTopology(backend).toStream(stream); - stream.close(); + try(OutputStream stream = Files.newOutputStream(descriptor.toPath())) { + createKnoxTopology(backend).toStream(stream); + } final TestTopologyListener topoListener = new TestTopologyListener(); @@ -337,7 +338,6 @@ public class WebsocketEchoTest { .getService(GatewayServices.TOPOLOGY_SERVICE); monitor.addTopologyChangeListener(topoListener); monitor.reloadTopologies(); - } private static File createDir() throws IOException { @@ -353,8 +353,7 @@ public class WebsocketEchoTest { } private static class TestTopologyListener implements TopologyListener { - - public ArrayList<List<TopologyEvent>> events = new ArrayList<>(); + public List<List<TopologyEvent>> events = new ArrayList<>(); @Override public void handleTopologyEvent(List<TopologyEvent> events) { http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/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 eb635ef..1335696 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 @@ -47,12 +47,13 @@ import javax.websocket.MessageHandler; import javax.websocket.Session; import javax.websocket.WebSocketContainer; import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; +import java.io.OutputStream; import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; import java.net.URI; import java.net.URL; +import java.nio.file.Files; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -138,7 +139,7 @@ public class WebsocketMultipleConnectionTest { MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean(); - System.gc(); + System.gc(); // NOPMD final long heapt1 = memoryMXBean.getHeapMemoryUsage().getUsed(); final long nonHeapt1 = memoryMXBean.getNonHeapMemoryUsage().getUsed(); @@ -165,7 +166,7 @@ public class WebsocketMultipleConnectionTest { latch.await(5 * MAX_CONNECTIONS, TimeUnit.MILLISECONDS); - System.gc(); + System.gc(); // NOPMD final long heapUsed = memoryMXBean.getHeapMemoryUsage().getUsed() - heapt1; final long nonHeapUsed = memoryMXBean.getNonHeapMemoryUsage().getUsed() @@ -256,9 +257,9 @@ public class WebsocketMultipleConnectionTest { URL serviceUrl = ClassLoader.getSystemResource("websocket-services"); final File descriptor = new File(topoDir, "websocket.xml"); - final FileOutputStream stream = new FileOutputStream(descriptor); - createKnoxTopology(backend).toStream(stream); - stream.close(); + try(OutputStream stream = Files.newOutputStream(descriptor.toPath())) { + createKnoxTopology(backend).toStream(stream); + } final TestTopologyListener topoListener = new TestTopologyListener(); @@ -350,8 +351,7 @@ public class WebsocketMultipleConnectionTest { } private static class TestTopologyListener implements TopologyListener { - - public ArrayList<List<TopologyEvent>> events = new ArrayList<>(); + public List<List<TopologyEvent>> events = new ArrayList<>(); @Override public void handleTopologyEvent(List<TopologyEvent> events) { http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/gateway-service-knoxsso/src/test/java/org/apache/knox/gateway/service/knoxsso/WebSSOResourceTest.java ---------------------------------------------------------------------- diff --git a/gateway-service-knoxsso/src/test/java/org/apache/knox/gateway/service/knoxsso/WebSSOResourceTest.java b/gateway-service-knoxsso/src/test/java/org/apache/knox/gateway/service/knoxsso/WebSSOResourceTest.java index 2f3c38e..18bde96 100644 --- a/gateway-service-knoxsso/src/test/java/org/apache/knox/gateway/service/knoxsso/WebSSOResourceTest.java +++ b/gateway-service-knoxsso/src/test/java/org/apache/knox/gateway/service/knoxsso/WebSSOResourceTest.java @@ -79,7 +79,7 @@ public class WebSSOResourceTest { private static RSAPrivateKey gatewayPrivateKey; @BeforeClass - public static void setup() throws Exception { + public static void setUpBeforeClass() throws Exception { KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA"); kpg.initialize(2048); KeyPair keyPair = kpg.generateKeyPair(); http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/gateway-service-knoxtoken/src/test/java/org/apache/knox/gateway/service/knoxtoken/TokenServiceResourceTest.java ---------------------------------------------------------------------- diff --git a/gateway-service-knoxtoken/src/test/java/org/apache/knox/gateway/service/knoxtoken/TokenServiceResourceTest.java b/gateway-service-knoxtoken/src/test/java/org/apache/knox/gateway/service/knoxtoken/TokenServiceResourceTest.java index 44ab79f..fa3c623 100644 --- a/gateway-service-knoxtoken/src/test/java/org/apache/knox/gateway/service/knoxtoken/TokenServiceResourceTest.java +++ b/gateway-service-knoxtoken/src/test/java/org/apache/knox/gateway/service/knoxtoken/TokenServiceResourceTest.java @@ -62,7 +62,7 @@ public class TokenServiceResourceTest { private static RSAPrivateKey privateKey; @BeforeClass - public static void setup() throws Exception { + public static void setUpBeforeClass() throws Exception { KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA"); kpg.initialize(2048); KeyPair KPair = kpg.generateKeyPair(); @@ -616,9 +616,9 @@ public class TokenServiceResourceTest { value = value.substring(1); } if (value.contains("\"")) { - return value.substring(0, value.indexOf("\"")); + return value.substring(0, value.indexOf('\"')); } else if (value.contains(",")) { - return value.substring(0, value.indexOf(",")); + return value.substring(0, value.indexOf(',')); } else { return value.substring(0, value.length() - 1); } http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/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 363b12a..9e88147 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 @@ -49,7 +49,6 @@ public class DefaultRemoteConfigurationRegistriesTest { doTestPropertiesRemoteConfigurationRegistries(testProperties); } - /* * Test a single registry configuration with kerberos auth configuration. */ @@ -144,9 +143,9 @@ public class DefaultRemoteConfigurationRegistriesTest { Enumeration names = props.propertyNames(); while (names.hasMoreElements()) { String propertyName = (String) names.nextElement(); - propertyValueString.append(propertyName).append("=").append(props.get(propertyName)); + propertyValueString.append(propertyName).append('=').append(props.get(propertyName)); if (names.hasMoreElements()) { - propertyValueString.append(";"); + propertyValueString.append(';'); } } EasyMock.expect(gc.getRemoteRegistryConfiguration(registryName)) @@ -181,5 +180,4 @@ public class DefaultRemoteConfigurationRegistriesTest { assertEquals(Boolean.valueOf((String)expected.get(GatewayConfig.REMOTE_CONFIG_REGISTRY_USE_KEYTAB)), registryConfig.isUseKeyTab()); assertEquals(Boolean.valueOf((String)expected.get(GatewayConfig.REMOTE_CONFIG_REGISTRY_USE_TICKET_CACHE)), registryConfig.isUseTicketCache()); } - } http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/util/RemoteRegistryConfigTestUtils.java ---------------------------------------------------------------------- diff --git a/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/util/RemoteRegistryConfigTestUtils.java b/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/util/RemoteRegistryConfigTestUtils.java index 4caef66..80d22bf 100644 --- a/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/util/RemoteRegistryConfigTestUtils.java +++ b/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/util/RemoteRegistryConfigTestUtils.java @@ -34,8 +34,8 @@ public class RemoteRegistryConfigTestUtils { public static final String PROPERTY_USE_TICKET_CACHE = "useTicketCache"; public static String createRemoteConfigRegistriesXML(Collection<Map<String, String>> configProperties) { - StringBuilder result = new StringBuilder("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" + - "<remote-configuration-registries>\n"); + StringBuilder result = new StringBuilder(128); + result.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<remote-configuration-registries>\n"); for (Map<String, String> props : configProperties) { String authType = props.get(PROPERTY_AUTH_TYPE); http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryClientServiceTest.java ---------------------------------------------------------------------- diff --git a/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryClientServiceTest.java b/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryClientServiceTest.java index a335f15..72e2fa0 100644 --- a/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryClientServiceTest.java +++ b/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryClientServiceTest.java @@ -94,7 +94,6 @@ public class RemoteConfigurationRegistryClientServiceTest { final String REGISTRY_CLIENT_NAME_2 = "zkclient2"; final String PRINCIPAL = null; final String PWD = null; - final String CRED_ALIAS = null; // Configure and start a secure ZK cluster try (TestingCluster zkCluster = setupAndStartSecureTestZooKeeper(PRINCIPAL, PWD)) { http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryJAASConfigTest.java ---------------------------------------------------------------------- diff --git a/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryJAASConfigTest.java b/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryJAASConfigTest.java index 8ce2eca..752ed34 100644 --- a/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryJAASConfigTest.java +++ b/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryJAASConfigTest.java @@ -154,6 +154,7 @@ public class RemoteConfigurationRegistryJAASConfigTest { try { RemoteConfigurationRegistryJAASConfig jaasConfig = RemoteConfigurationRegistryJAASConfig.configure(registryConfigs, null); + assertNotNull(jaasConfig); fail("Expected IllegalArgumentException because the AliasService is not available."); } catch (IllegalArgumentException e) { // Expected http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/CappedBufferHttpEntityTest.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/CappedBufferHttpEntityTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/CappedBufferHttpEntityTest.java index be5ff41..06b9eb2 100644 --- a/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/CappedBufferHttpEntityTest.java +++ b/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/CappedBufferHttpEntityTest.java @@ -27,13 +27,14 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.fail; +import static org.junit.Assert.assertNotNull; public class CappedBufferHttpEntityTest { // Variables @@ -72,9 +73,7 @@ public class CappedBufferHttpEntityTest { basic.setContent( new ByteArrayInputStream( data.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 20 ); - String output; - - output = byteRead( replay.getContent(), -1 ); + String output = byteRead( replay.getContent(), -1 ); assertThat( output, is( data ) ); } @@ -88,13 +87,11 @@ public class CappedBufferHttpEntityTest { basic.setContent( new ByteArrayInputStream( data.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 20 ); - String output; - - output = blockRead( replay.getContent(), StandardCharsets.UTF_8, -1, 3 ); + String output = blockRead( replay.getContent(), StandardCharsets.UTF_8, -1, 3 ); assertThat( output, is( data ) ); } - @Test + @Test (expected = IOException.class) public void testS__C1_FC_OB() throws IOException { String data = "0123456789"; BasicHttpEntity basic; @@ -104,17 +101,10 @@ public class CappedBufferHttpEntityTest { basic.setContent( new ByteArrayInputStream( data.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 5 ); - String output; - - try { - output = byteRead( replay.getContent(), -1 ); - fail("expected IOException"); - } catch (IOException e) { - // expected - } + byteRead( replay.getContent(), -1 ); } - @Test + @Test (expected = IOException.class) public void testB__C1_FC_OB() throws IOException { String data = "0123456789"; BasicHttpEntity basic; @@ -124,14 +114,7 @@ public class CappedBufferHttpEntityTest { basic.setContent( new ByteArrayInputStream( data.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 5 ); - String output; - - try { - output = blockRead( replay.getContent(), StandardCharsets.UTF_8, -1, 3 ); - fail("expected IOException"); - } catch (IOException e) { - // expected - } + blockRead( replay.getContent(), StandardCharsets.UTF_8, -1, 3 ); } @Test @@ -172,7 +155,7 @@ public class CappedBufferHttpEntityTest { assertThat( output, is( data ) ); } - @Test + @Test (expected = IOException.class) public void testS_C1_FC_OB__C2_AC__EE() throws Exception { String data = "0123456789"; BasicHttpEntity basic; @@ -182,17 +165,10 @@ public class CappedBufferHttpEntityTest { basic.setContent( new ByteArrayInputStream( data.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 5 ); - String output; - - try { - output = byteRead( replay.getContent(), -1 ); - fail( "Expected IOException" ); - } catch( IOException e ) { - // Expected. - } + byteRead( replay.getContent(), -1 ); } - @Test + @Test (expected = IOException.class) public void testB_C1_FC_OB__C2_AC__EE() throws Exception { String data = "0123456789"; BasicHttpEntity basic; @@ -202,13 +178,7 @@ public class CappedBufferHttpEntityTest { basic.setContent( new ByteArrayInputStream( data.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 5 ); - String output; - try { - output = blockRead( replay.getContent(), StandardCharsets.UTF_8, -1, 3 ); - fail( "Expected IOException" ); - } catch( IOException e ) { - // Expected. - } + blockRead( replay.getContent(), StandardCharsets.UTF_8, -1, 3 ); } // C1 FC/IB; C1 XC; C2 FC. @@ -257,46 +227,34 @@ public class CappedBufferHttpEntityTest { } // C1 FC/OB; C1 XC; C2 AC; EE - @Test + @Test (expected = IOException.class) public void testS_C1_FC_OB__C1_XC__C2_AC__EE() throws IOException { String data = "0123456789"; BasicHttpEntity basic; CappedBufferHttpEntity replay; - InputStream stream; - String text; basic = new BasicHttpEntity(); basic.setContent( new ByteArrayInputStream( data.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 5 ); - stream = replay.getContent(); - try { - text = byteRead( stream, -1 ); - fail( "Expected IOException" ); - } catch( IOException e ) { - // Expected. + try(InputStream stream = replay.getContent()) { + byteRead(stream, -1); } } // C1 FC/OB; C1 XC; C2 AC; EE - @Test + @Test (expected = IOException.class) public void testB_C1_FC_OB__C1_XC__C2_AC_EE() throws IOException { String data = "0123456789"; BasicHttpEntity basic; CappedBufferHttpEntity replay; - InputStream stream; - String text; basic = new BasicHttpEntity(); basic.setContent( new ByteArrayInputStream( data.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 5 ); - stream = replay.getContent(); - try { - text = blockRead( stream, StandardCharsets.UTF_8, -1, 3 ); - fail( "Expected IOException" ); - } catch( IOException e ) { - // Expected. + try(InputStream stream = replay.getContent()) { + blockRead(stream, StandardCharsets.UTF_8, -1, 3); } } @@ -306,16 +264,15 @@ public class CappedBufferHttpEntityTest { String data = "0123456789"; BasicHttpEntity basic; CappedBufferHttpEntity replay; - InputStream stream; - String text; basic = new BasicHttpEntity(); basic.setContent( new ByteArrayInputStream( data.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 20 ); - stream = replay.getContent(); - text = byteRead( stream, 3 ); - assertThat( text, is( "012" ) ); + try(InputStream stream = replay.getContent()) { + String text = byteRead(stream, 3); + assertThat(text, is("012")); + } } // C1 PC/IB. @@ -324,61 +281,45 @@ public class CappedBufferHttpEntityTest { String data = "0123456789"; BasicHttpEntity basic; CappedBufferHttpEntity replay; - InputStream stream; - String text; basic = new BasicHttpEntity(); basic.setContent( new ByteArrayInputStream( data.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 20 ); - stream = replay.getContent(); - text = blockRead( stream, StandardCharsets.UTF_8, 3, 3 ); - assertThat( text, is( "012" ) ); + try(InputStream stream = replay.getContent()) { + String text = blockRead(stream, StandardCharsets.UTF_8, 3, 3); + assertThat(text, is("012")); + } } // C1 PC/OB. - @Test + @Test (expected = IOException.class) public void testS_C1_PC_OB() throws IOException { + String data = "0123456789"; + BasicHttpEntity basic; + CappedBufferHttpEntity replay; - try { - String data = "0123456789"; - BasicHttpEntity basic; - CappedBufferHttpEntity replay; - InputStream stream; - String text; - - basic = new BasicHttpEntity(); - basic.setContent(new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8))); - replay = new CappedBufferHttpEntity(basic, 5); - stream = replay.getContent(); - text = byteRead(stream, -1); - fail("Expected IOException"); - assertThat(text, is("0123456789")); - stream.close(); - } catch (IOException e) { - // expected + basic = new BasicHttpEntity(); + basic.setContent(new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8))); + replay = new CappedBufferHttpEntity(basic, 5); + try(InputStream stream = replay.getContent()) { + byteRead(stream, -1); } } // C1 PC/OB. - @Test + @Test (expected = IOException.class) public void testB_C1_PC_OB() throws IOException { String data = "0123456789"; BasicHttpEntity basic; CappedBufferHttpEntity replay; - InputStream stream; - String text; basic = new BasicHttpEntity(); basic.setContent( new ByteArrayInputStream( data.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 5 ); - stream = replay.getContent(); - try { - text = blockRead( stream, StandardCharsets.UTF_8, -1, 4 ); - fail( "Expected IOException" ); - } catch (IOException e) { - // expected + try (InputStream stream = replay.getContent()) { + blockRead(stream, StandardCharsets.UTF_8, -1, 4); } } @@ -388,21 +329,20 @@ public class CappedBufferHttpEntityTest { String data = "0123456789"; BasicHttpEntity basic; CappedBufferHttpEntity replay; - InputStream stream; - String text; basic = new BasicHttpEntity(); basic.setContent( new ByteArrayInputStream( data.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 20 ); - stream = replay.getContent(); - text = byteRead( stream, 4 ); - assertThat( text, is( "0123" ) ); - stream.close(); + try(InputStream stream = replay.getContent()) { + String text = byteRead(stream, 4); + assertThat(text, is("0123")); + } - stream = replay.getContent(); - text = byteRead( stream, -1 ); - assertThat( text, is( "0123456789" ) ); + try(InputStream stream = replay.getContent()) { + String text = byteRead(stream, -1); + assertThat(text, is("0123456789")); + } } // C1 PC/IB; C2 FC. @@ -411,66 +351,52 @@ public class CappedBufferHttpEntityTest { String data = "0123456789"; BasicHttpEntity basic; CappedBufferHttpEntity replay; - InputStream stream; - String text; basic = new BasicHttpEntity(); basic.setContent( new ByteArrayInputStream( data.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 20 ); - stream = replay.getContent(); - text = blockRead( stream, StandardCharsets.UTF_8, 4, 1 ); - assertThat( text, is( "0123" ) ); - stream.close(); + try(InputStream stream = replay.getContent()) { + String text = blockRead(stream, StandardCharsets.UTF_8, 4, 1); + assertThat(text, is("0123")); + } - stream = replay.getContent(); - text = blockRead( stream, StandardCharsets.UTF_8, -1, 7 ); - assertThat( text, is( "0123456789" ) ); + try(InputStream stream = replay.getContent()) { + String text = blockRead(stream, StandardCharsets.UTF_8, -1, 7); + assertThat(text, is("0123456789")); + } } // C1 PC/OB; C2 AC; EE - @Test + @Test (expected = IOException.class) public void testS_C1_PC_OB__C2_AC__EE() throws IOException { String data = "0123456789"; BasicHttpEntity basic; CappedBufferHttpEntity replay; - InputStream stream; - String text; - try { - basic = new BasicHttpEntity(); - basic.setContent(new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8))); - replay = new CappedBufferHttpEntity(basic, 5); + basic = new BasicHttpEntity(); + basic.setContent(new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8))); + replay = new CappedBufferHttpEntity(basic, 5); - stream = replay.getContent(); - text = byteRead(stream, 7); + try(InputStream stream = replay.getContent()) { + String text = byteRead(stream, 7); assertThat(text, is("0123456")); - stream.close(); - fail("Expected IOException"); - } catch (IOException e) { - // Expected. } } // C1 PC/OB; C2 AC; EE - @Test + @Test (expected = IOException.class) public void testB_C1_PC_OB__C2_AC__EE() throws IOException { String data = "0123456789"; BasicHttpEntity basic; CappedBufferHttpEntity replay; - InputStream stream; - String text; basic = new BasicHttpEntity(); basic.setContent( new ByteArrayInputStream( data.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 5 ); - stream = replay.getContent(); - try { - text = blockRead( stream, StandardCharsets.UTF_8, 7, 2 ); - fail("Expected IOExceptin"); - } catch (IOException e) { - // expected + try(InputStream stream = replay.getContent()) { + blockRead(stream, StandardCharsets.UTF_8, 7, 2); } } @@ -480,21 +406,20 @@ public class CappedBufferHttpEntityTest { String data = "0123456789"; BasicHttpEntity basic; CappedBufferHttpEntity replay; - InputStream stream; - String text; basic = new BasicHttpEntity(); basic.setContent( new ByteArrayInputStream( data.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 20 ); - stream = replay.getContent(); - text = byteRead( stream, 7 ); - assertThat( text, is( "0123456" ) ); - stream.close(); + try(InputStream stream = replay.getContent()) { + String text = byteRead(stream, 7); + assertThat(text, is("0123456")); + } - stream = replay.getContent(); - text = byteRead( stream, -1 ); - assertThat( text, is( "0123456789" ) ); + try(InputStream stream = replay.getContent()) { + String text = byteRead(stream, -1); + assertThat(text, is("0123456789")); + } } // C1 PC/IB; C1 XC; C2 FC. @@ -503,21 +428,20 @@ public class CappedBufferHttpEntityTest { String data = "0123456789"; BasicHttpEntity basic; CappedBufferHttpEntity replay; - InputStream stream; - String text; basic = new BasicHttpEntity(); basic.setContent( new ByteArrayInputStream( data.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 20 ); - stream = replay.getContent(); - text = blockRead( stream, StandardCharsets.UTF_8, 7, 2 ); - assertThat( text, is( "0123456" ) ); - stream.close(); + try(InputStream stream = replay.getContent()) { + String text = blockRead(stream, StandardCharsets.UTF_8, 7, 2); + assertThat(text, is("0123456")); + } - stream = replay.getContent(); - text = blockRead( stream, StandardCharsets.UTF_8, -1, 7 ); - assertThat( text, is( "0123456789" ) ); + try(InputStream stream = replay.getContent()) { + String text = blockRead( stream, StandardCharsets.UTF_8, -1, 7 ); + assertThat( text, is( "0123456789" ) ); + } } // C1 PC/OB; C1 XC; C2 AC; EE @@ -526,39 +450,29 @@ public class CappedBufferHttpEntityTest { String data = "0123456789"; BasicHttpEntity basic; CappedBufferHttpEntity replay; - InputStream stream; - String text; basic = new BasicHttpEntity(); basic.setContent( new ByteArrayInputStream( data.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 5 ); - try { - stream = replay.getContent(); - } catch ( IOException e ) { - // Expected. + try (InputStream stream = replay.getContent()) { + assertNotNull(stream); } } // C1 PC/OB; C1 XC; C2 AC; EE - @Test + @Test (expected = IOException.class) public void testB_C1_PC_OB__C1_XC__C2_AC__EE() throws IOException { String data = "0123456789"; BasicHttpEntity basic; CappedBufferHttpEntity replay; - InputStream stream; - String text; basic = new BasicHttpEntity(); basic.setContent( new ByteArrayInputStream( data.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 5 ); - stream = replay.getContent(); - try { - text = blockRead( stream, StandardCharsets.UTF_8, 7, 2 ); - fail( "Expected IOException" ); - } catch ( IOException e ) { - // Expected. + try(InputStream stream = replay.getContent()) { + blockRead( stream, StandardCharsets.UTF_8, 7, 2 ); } } @@ -568,23 +482,23 @@ public class CappedBufferHttpEntityTest { String data = "0123456789"; BasicHttpEntity basic; CappedBufferHttpEntity replay; - InputStream stream1, stream2; String text; basic = new BasicHttpEntity(); basic.setContent( new ByteArrayInputStream( data.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 20 ); - stream1 = replay.getContent(); - text = byteRead( stream1, 3 ); - assertThat( text, is( "012" ) ); + try(InputStream stream1 = replay.getContent(); + InputStream stream2 = replay.getContent()) { + text = byteRead(stream1, 3); + assertThat(text, is("012")); - stream2 = replay.getContent(); - text = byteRead( stream2, 4 ); - assertThat( text, is( "0123" ) ); + text = byteRead(stream2, 4); + assertThat(text, is("0123")); - text = byteRead( stream1, 3 ); - assertThat( text, is( "345" ) ); + text = byteRead(stream1, 3); + assertThat(text, is("345")); + } } // C1 PC/IB; C2 PC/IB; C1 PC/IB; C2 PC/IB - Back and forth before buffer overflow is OK. @@ -634,32 +548,28 @@ public class CappedBufferHttpEntityTest { } // C1 PC/IB; C2 PC/OB; C1 AC; EE - @Test + @Test (expected = IOException.class) public void testB_C1_PC_IB__C2_PC_OB__C1_AC__EE() throws IOException { String data = "0123456789"; BasicHttpEntity basic; CappedBufferHttpEntity replay; - InputStream stream1, stream2; String text; basic = new BasicHttpEntity(); basic.setContent( new ByteArrayInputStream( data.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 5 ); - stream1 = replay.getContent(); - text = blockRead( stream1, StandardCharsets.UTF_8, 3, 2 ); - assertThat( text, is( "012" ) ); + try (InputStream stream = replay.getContent()) { + text = blockRead( stream, StandardCharsets.UTF_8, 3, 2 ); + assertThat( text, is( "012" ) ); + } - stream2 = replay.getContent(); - try { - text = blockRead( stream2, StandardCharsets.UTF_8, 6, 4 ); - fail("expected IOException"); - } catch (IOException e) { - // expected + try (InputStream stream = replay.getContent()) { + blockRead( stream, StandardCharsets.UTF_8, 6, 4 ); } } - @Test + @Test (expected = IOException.class) public void testWriteTo() throws Exception { String input = "0123456789"; BasicHttpEntity basic; @@ -669,12 +579,8 @@ public class CappedBufferHttpEntityTest { basic.setContent( new ByteArrayInputStream( input.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 5 ); - ByteArrayOutputStream buffer = new ByteArrayOutputStream(); - try { - replay.writeTo( buffer ); - fail("expected IOException"); - } catch (IOException e) { - // expected + try(OutputStream buffer = new ByteArrayOutputStream()) { + replay.writeTo(buffer); } } @@ -790,7 +696,7 @@ public class CappedBufferHttpEntityTest { assertThat( replay.isStreaming(), is( true ) ); } - @Test + @Test (expected = UnsupportedOperationException.class) public void testConsumeContent() throws Exception { String input = "0123456789"; BasicHttpEntity basic; @@ -799,13 +705,7 @@ public class CappedBufferHttpEntityTest { basic = new BasicHttpEntity(); basic.setContent( new ByteArrayInputStream( input.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new CappedBufferHttpEntity( basic, 5 ); - - try { - replay.consumeContent(); - fail( "Expected UnsupportedOperationException" ); - } catch ( UnsupportedOperationException e ) { - // Expected. - } + replay.consumeContent(); } private static String byteRead( InputStream stream, int total ) throws IOException { @@ -846,5 +746,4 @@ public class CappedBufferHttpEntityTest { } return string == null ? null : string.toString(); } - } http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/HadoopAuthCookieStoreTest.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/HadoopAuthCookieStoreTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/HadoopAuthCookieStoreTest.java index 6330db3..909bb05 100644 --- a/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/HadoopAuthCookieStoreTest.java +++ b/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/HadoopAuthCookieStoreTest.java @@ -24,8 +24,9 @@ import org.easymock.EasyMock; import org.junit.Test; import java.io.File; -import java.io.FileOutputStream; +import java.io.OutputStream; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.util.List; import static org.hamcrest.CoreMatchers.is; @@ -166,10 +167,10 @@ public class HadoopAuthCookieStoreTest { File result = null; try { File f = File.createTempFile(filename, ".conf"); - FileOutputStream out = new FileOutputStream(f); - out.write(contents.getBytes(StandardCharsets.UTF_8)); - out.flush(); - out.close(); + try(OutputStream out = Files.newOutputStream(f.toPath())) { + out.write(contents.getBytes(StandardCharsets.UTF_8)); + out.flush(); + } result = f; } catch (Exception e) { // http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/PartiallyRepeatableHttpEntityTest.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/PartiallyRepeatableHttpEntityTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/PartiallyRepeatableHttpEntityTest.java index 4865d01..54a1a2c 100644 --- a/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/PartiallyRepeatableHttpEntityTest.java +++ b/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/PartiallyRepeatableHttpEntityTest.java @@ -33,7 +33,6 @@ import java.nio.charset.StandardCharsets; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.fail; public class PartiallyRepeatableHttpEntityTest { @@ -165,7 +164,7 @@ public class PartiallyRepeatableHttpEntityTest { assertThat( output, is( data ) ); } - @Test + @Test (expected = IOException.class) public void testS_C1_FC_OB__C2_AC__EE() throws Exception { String data = "0123456789"; BasicHttpEntity basic; @@ -180,15 +179,10 @@ public class PartiallyRepeatableHttpEntityTest { output = byteRead( replay.getContent(), -1 ); assertThat( output, is( data ) ); - try { - replay.getContent(); - fail( "Expected IOException" ); - } catch( IOException e ) { - // Expected. - } + replay.getContent(); } - @Test + @Test (expected = IOException.class) public void testB_C1_FC_OB__C2_AC__EE() throws Exception { String data = "0123456789"; BasicHttpEntity basic; @@ -203,12 +197,7 @@ public class PartiallyRepeatableHttpEntityTest { output = blockRead( replay.getContent(), StandardCharsets.UTF_8, -1, 3 ); assertThat( output, is( data ) ); - try { - replay.getContent(); - fail( "Expected IOException" ); - } catch( IOException e ) { - // Expected. - } + replay.getContent(); } // C1 FC/IB; C1 XC; C2 FC. @@ -257,7 +246,7 @@ public class PartiallyRepeatableHttpEntityTest { } // C1 FC/OB; C1 XC; C2 AC; EE - @Test + @Test (expected = IOException.class) public void testS_C1_FC_OB__C1_XC__C2_AC__EE() throws IOException { String data = "0123456789"; BasicHttpEntity basic; @@ -274,16 +263,11 @@ public class PartiallyRepeatableHttpEntityTest { assertThat( text, is( "0123456789" ) ); stream.close(); - try { - replay.getContent(); - fail( "Expected IOException" ); - } catch( IOException e ) { - // Expected. - } + replay.getContent(); } // C1 FC/OB; C1 XC; C2 AC; EE - @Test + @Test (expected = IOException.class) public void testB_C1_FC_OB__C1_XC__C2_AC_EE() throws IOException { String data = "0123456789"; BasicHttpEntity basic; @@ -300,12 +284,7 @@ public class PartiallyRepeatableHttpEntityTest { assertThat( text, is( "0123456789" ) ); stream.close(); - try { - replay.getContent(); - fail( "Expected IOException" ); - } catch( IOException e ) { - // Expected. - } + replay.getContent(); } // C1 PC/IB. @@ -429,7 +408,7 @@ public class PartiallyRepeatableHttpEntityTest { } // C1 PC/OB; C2 AC; EE - @Test + @Test (expected = IOException.class) public void testS_C1_PC_OB__C2_AC__EE() throws IOException { String data = "0123456789"; BasicHttpEntity basic; @@ -446,16 +425,11 @@ public class PartiallyRepeatableHttpEntityTest { assertThat( text, is( "0123456" ) ); stream.close(); - try { - replay.getContent(); - fail( "Expected IOException" ); - } catch ( IOException e ) { - // Expected. - } + replay.getContent(); } // C1 PC/OB; C2 AC; EE - @Test + @Test (expected = IOException.class) public void testB_C1_PC_OB__C2_AC__EE() throws IOException { String data = "0123456789"; BasicHttpEntity basic; @@ -472,12 +446,7 @@ public class PartiallyRepeatableHttpEntityTest { assertThat( text, is( "0123456" ) ); stream.close(); - try { - replay.getContent(); - fail( "Expected IOException" ); - } catch ( IOException e ) { - // Expected. - } + replay.getContent(); } // C1 PC/IB; C1 XC; C2 FC. @@ -527,7 +496,7 @@ public class PartiallyRepeatableHttpEntityTest { } // C1 PC/OB; C1 XC; C2 AC; EE - @Test + @Test (expected = IOException.class) public void testS_C1_PC_OB__C1_XC__C2_AC__EE() throws IOException { String data = "0123456789"; BasicHttpEntity basic; @@ -544,16 +513,11 @@ public class PartiallyRepeatableHttpEntityTest { assertThat( text, is( "0123456" ) ); stream.close(); - try { - replay.getContent(); - fail( "Expected IOException" ); - } catch ( IOException e ) { - // Expected. - } + replay.getContent(); } // C1 PC/OB; C1 XC; C2 AC; EE - @Test + @Test (expected = IOException.class) public void testB_C1_PC_OB__C1_XC__C2_AC__EE() throws IOException { String data = "0123456789"; BasicHttpEntity basic; @@ -570,12 +534,7 @@ public class PartiallyRepeatableHttpEntityTest { assertThat( text, is( "0123456" ) ); stream.close(); - try { - replay.getContent(); - fail( "Expected IOException" ); - } catch ( IOException e ) { - // Expected. - } + replay.getContent(); } // C1 PC/IB; C2 PC/IB; C1 PC/IB; C2 PC/IB - Back and forth before buffer overflow is OK. @@ -628,7 +587,7 @@ public class PartiallyRepeatableHttpEntityTest { } // C1 PC/IB; C2 PC/OB; C1 AC; EE - @Test + @Test (expected = IOException.class) public void testS_C1_PC_IB__C2_PC_OB__C1_AC__EE() throws IOException { String data = "0123456789"; BasicHttpEntity basic; @@ -648,16 +607,11 @@ public class PartiallyRepeatableHttpEntityTest { text = byteRead( stream2, 6 ); assertThat( text, is( "012345" ) ); - try { - byteRead( stream1, 1 ); - fail( "Expected IOException" ); - } catch ( IOException e ) { - // Expected. - } + byteRead( stream1, 1 ); } // C1 PC/IB; C2 PC/OB; C1 AC; EE - @Test + @Test (expected = IOException.class) public void testB_C1_PC_IB__C2_PC_OB__C1_AC__EE() throws IOException { String data = "0123456789"; BasicHttpEntity basic; @@ -677,12 +631,7 @@ public class PartiallyRepeatableHttpEntityTest { text = blockRead( stream2, StandardCharsets.UTF_8, 6, 4 ); assertThat( text, is( "012345" ) ); - try { - blockRead( stream1, StandardCharsets.UTF_8, 6, 4 ); - fail( "Expected IOException" ); - } catch ( IOException e ) { - // Expected. - } + blockRead( stream1, StandardCharsets.UTF_8, 6, 4 ); } @Test @@ -813,7 +762,7 @@ public class PartiallyRepeatableHttpEntityTest { assertThat( replay.isStreaming(), is( true ) ); } - @Test + @Test (expected = UnsupportedOperationException.class) public void testConsumeContent() throws Exception { String input = "0123456789"; BasicHttpEntity basic; @@ -823,12 +772,7 @@ public class PartiallyRepeatableHttpEntityTest { basic.setContent( new ByteArrayInputStream( input.getBytes( StandardCharsets.UTF_8 ) ) ); replay = new PartiallyRepeatableHttpEntity( basic, 5 ); - try { - replay.consumeContent(); - fail( "Expected UnsupportedOperationException" ); - } catch ( UnsupportedOperationException e ) { - // Expected. - } + replay.consumeContent(); } private static String byteRead( InputStream stream, int total ) throws IOException { @@ -869,5 +813,4 @@ public class PartiallyRepeatableHttpEntityTest { } return string == null ? null : string.toString(); } - } http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/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 066d546..8ee49f8 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 @@ -35,7 +35,7 @@ public class PrincipalMapperTest { PrincipalMapper mapper; @Before - public void setup() { + public void setUp() { mapper = new SimplePrincipalMapper(); } http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/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 358dfe9..8a21782 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 @@ -49,7 +49,7 @@ public class CMFKeystoreServiceTest { File certificateFile = new File("ambari"); @Before - public void setup() { + public void setUp() { try { ks = new CMFKeystoreService(".", "ambari"); ks.setMasterService(new MasterService() { http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/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 8c329f2..d4142fe 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 @@ -38,7 +38,7 @@ public class CMFMasterServiceTest { TestCMFMasterService ms; @Before - public void setup() { + public void setUp() { ms = new TestCMFMasterService("ambari"); } http://git-wip-us.apache.org/repos/asf/knox/blob/89caa5fe/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/impl/JWTTokenTest.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/impl/JWTTokenTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/impl/JWTTokenTest.java index ed23bd4..27ad390 100644 --- a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/impl/JWTTokenTest.java +++ b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/impl/JWTTokenTest.java @@ -43,7 +43,7 @@ public class JWTTokenTest extends org.junit.Assert { private static RSAPrivateKey privateKey; @BeforeClass - public static void setup() throws Exception { + public static void setUpBeforeClass() throws Exception { KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA"); kpg.initialize(2048); @@ -225,14 +225,16 @@ public class JWTTokenTest extends org.junit.Assert { @Test public void testUnsignedToken() throws Exception { - String unsignedToken = "eyJhbGciOiJub25lIn0.eyJzdWIiOiJhbGljZSIsImp0aSI6ImY2YmNj" - + "MDVjLWI4MTktNGM0Mi1iMGMyLWJlYmY1MDE4YWFiZiJ9."; - - try { - new JWTToken(unsignedToken); - fail("Failure expected on an unsigned token"); - } catch (ParseException ex) { - // expected - } + String unsignedToken = "eyJhbGciOiJub25lIn0.eyJzdWIiOiJhbGljZSIsImp0aSI6ImY2YmNj" + + "MDVjLWI4MTktNGM0Mi1iMGMyLWJlYmY1MDE4YWFiZiJ9."; + + try { + new JWTToken(unsignedToken); + fail("Failure expected on an unsigned token"); + } catch (ParseException ex) { + // expected + assertEquals("Invalid JWS header: The algorithm \"alg\" header parameter must be for signatures", + ex.getMessage()); + } } }
