Repository: oozie Updated Branches: refs/heads/master e5c768977 -> 9937e4c4a
OOZIE-2846 TestSSLServerConnectorFactory fails with Jetty 9.3 and 9.4 (gezapeti) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/9937e4c4 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/9937e4c4 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/9937e4c4 Branch: refs/heads/master Commit: 9937e4c4ace15f8408d7f36a3dfb6d9de5dca877 Parents: e5c7689 Author: Gezapeti Cseh <[email protected]> Authored: Wed Jun 21 12:30:24 2017 +0200 Committer: Gezapeti Cseh <[email protected]> Committed: Wed Jun 21 12:30:24 2017 +0200 ---------------------------------------------------------------------- release-log.txt | 1 + .../apache/oozie/server/TestEmbeddedOozieServer.java | 14 ++++++++++++-- .../oozie/server/TestSSLServerConnectorFactory.java | 3 ++- 3 files changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/9937e4c4/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 771396f..f862b39 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-2846 TestSSLServerConnectorFactory fails with Jetty 9.3 and 9.4 (gezapeti) OOZIE-2936 Fix Javadoc warnings from build (Jan Hentschel via gezapeti) OOZIE-2920 Document Distcp can copy files within a cluster (Artem Ervits via rkanter) OOZIE-2796 oozie.action.keep.action.dir not getting notice (zgengxb2005 via gezapeti) http://git-wip-us.apache.org/repos/asf/oozie/blob/9937e4c4/server/src/test/java/org/apache/oozie/server/TestEmbeddedOozieServer.java ---------------------------------------------------------------------- diff --git a/server/src/test/java/org/apache/oozie/server/TestEmbeddedOozieServer.java b/server/src/test/java/org/apache/oozie/server/TestEmbeddedOozieServer.java index f073256..b72247e 100644 --- a/server/src/test/java/org/apache/oozie/server/TestEmbeddedOozieServer.java +++ b/server/src/test/java/org/apache/oozie/server/TestEmbeddedOozieServer.java @@ -24,6 +24,8 @@ import org.apache.oozie.service.ServiceException; import org.apache.oozie.service.Services; import org.eclipse.jetty.rewrite.handler.RewriteHandler; import org.eclipse.jetty.security.ConstraintSecurityHandler; +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.util.ssl.SslContextFactory; @@ -33,6 +35,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Spy; import org.mockito.runners.MockitoJUnitRunner; import java.io.IOException; @@ -40,7 +43,9 @@ import java.net.URISyntaxException; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.isA; +import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -54,16 +59,16 @@ public class TestEmbeddedOozieServer { @Mock private Services mockServices; @Mock private SslContextFactory mockSSLContextFactory; @Mock private SSLServerConnectorFactory mockSSLServerConnectorFactory; - @Mock private Server mockServer; + @Spy private Server mockServer; @Mock private ServerConnector mockServerConnector; @Mock private ConfigurationService mockConfigService; @Mock private Configuration mockConfiguration; @Mock private RewriteHandler mockOozieRewriteHandler; - @Mock private EmbeddedOozieServer embeddedOozieServer; @Mock private WebAppContext servletContextHandler; @Mock private ServletMapper oozieServletMapper; @Mock private FilterMapper oozieFilterMapper; @Mock private ConstraintSecurityHandler constraintSecurityHandler; + private EmbeddedOozieServer embeddedOozieServer; @Before public void setUp() { embeddedOozieServer = new EmbeddedOozieServer(mockServer, mockJspHandler, mockServices, mockSSLServerConnectorFactory, @@ -77,6 +82,11 @@ public class TestEmbeddedOozieServer { doReturn("https://localhost:11443/oozie";).when(mockConfiguration).get("oozie.base.url"); doReturn(mockConfiguration).when(mockConfigService).getConf(); doReturn(mockConfigService).when(mockServices).get(ConfigurationService.class); + doNothing().when(mockServer).setConnectors((Connector[]) anyObject()); + doNothing().when(mockServer).setHandler((Handler) anyObject()); + doReturn(new Handler[0]).when(mockOozieRewriteHandler).getChildHandlers(); + doReturn(new Handler[0]).when(servletContextHandler).getChildHandlers(); + doReturn(new Handler[0]).when(constraintSecurityHandler).getChildHandlers(); } @After public void tearDown() { http://git-wip-us.apache.org/repos/asf/oozie/blob/9937e4c4/server/src/test/java/org/apache/oozie/server/TestSSLServerConnectorFactory.java ---------------------------------------------------------------------- diff --git a/server/src/test/java/org/apache/oozie/server/TestSSLServerConnectorFactory.java b/server/src/test/java/org/apache/oozie/server/TestSSLServerConnectorFactory.java index da1a246..2b48f7f 100644 --- a/server/src/test/java/org/apache/oozie/server/TestSSLServerConnectorFactory.java +++ b/server/src/test/java/org/apache/oozie/server/TestSSLServerConnectorFactory.java @@ -28,6 +28,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.Spy; import org.mockito.runners.MockitoJUnitRunner; import static org.apache.oozie.server.HttpConfigurationWrapper.OOZIE_HTTP_REQUEST_HEADER_SIZE; @@ -53,7 +54,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; public class TestSSLServerConnectorFactory { @Mock private SslContextFactory mockSSLContextFactory; @Mock private SSLServerConnectorFactory mockSSLServerConnectorFactory; - @Mock private Server mockServer; + @Spy private Server mockServer; @Mock private ServerConnector mockServerConnector; private Configuration testConfig;
