You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/10/30 16:32:59 UTC
[5/6] qpid-broker-j git commit: QPID-7885: Fix failing tests
QPID-7885: Fix failing tests
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/a045ea8a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/a045ea8a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/a045ea8a
Branch: refs/heads/master
Commit: a045ea8a749fa3ee6a76e6398b35d39b4bf8af76
Parents: 73745fe
Author: Alex Rudyy <or...@apache.org>
Authored: Tue Oct 30 16:14:17 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Tue Oct 30 16:32:41 2018 +0000
----------------------------------------------------------------------
.../berkeleydb/BDBVirtualHostImplTest.java | 25 +++-----------
.../qpid/server/model/BrokerTestHelper.java | 34 +++++++++++++-------
.../server/security/NonJavaKeyStoreTest.java | 17 +++-------
.../virtualhost/jdbc/JDBCVirtualHostTest.java | 22 +++----------
.../jms_1_1/extensions/tls/TlsTest.java | 4 +++
5 files changed, 39 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a045ea8a/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java b/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java
index 52f27eb..de5f99a 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java
@@ -25,8 +25,6 @@ import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.Assume.assumeThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
import java.io.File;
import java.util.HashMap;
@@ -38,13 +36,8 @@ import org.junit.Before;
import org.junit.Test;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.VirtualHostNode;
-import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.util.FileUtils;
import org.apache.qpid.test.utils.TestFileUtils;
import org.apache.qpid.test.utils.UnitTestBase;
@@ -60,22 +53,12 @@ public class BDBVirtualHostImplTest extends UnitTestBase
{
assumeThat(getVirtualHostNodeStoreType(), is(equalTo(VirtualHostNodeStoreType.BDB)));
- Broker broker = BrokerTestHelper.createBrokerMock();
-
- TaskExecutor taskExecutor = CurrentThreadTaskExecutor.newStartedInstance();
- when(broker.getTaskExecutor()).thenReturn(taskExecutor);
- when(broker.getChildExecutor()).thenReturn(taskExecutor);
-
-
_storePath = TestFileUtils.createTestDirectory();
- _node = mock(VirtualHostNode.class);
- when(_node.getParent()).thenReturn(broker);
- when(_node.getModel()).thenReturn(BrokerModel.getInstance());
- when(_node.getTaskExecutor()).thenReturn(taskExecutor);
- when(_node.getChildExecutor()).thenReturn(taskExecutor);
- when(_node.getConfigurationStore()).thenReturn(mock(DurableConfigurationStore.class));
- when(_node.getId()).thenReturn(UUID.randomUUID());
+ _node = BrokerTestHelper.createVirtualHostNodeMock("testNode",
+ true,
+ BrokerTestHelper.createAccessControlMock(),
+ BrokerTestHelper.createBrokerMock());
}
@After
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a045ea8a/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java b/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
index db236f1..a8d594c 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/BrokerTestHelper.java
@@ -20,10 +20,9 @@
*/
package org.apache.qpid.server.model;
-import static org.mockito.ArgumentMatchers.isNotNull;
-import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.withSettings;
@@ -171,9 +170,28 @@ public class BrokerTestHelper
final UnitTestBase testBase)
{
ConfiguredObjectFactory objectFactory = broker.getObjectFactory();
+ String virtualHostNodeName = String.format("%s_%s", attributes.get(VirtualHostNode.NAME), "_node");
+ VirtualHostNode virtualHostNode =
+ createVirtualHostNodeMock(virtualHostNodeName, defaultVHN, accessControl, broker);
+
+ AbstractVirtualHost
+ host = (AbstractVirtualHost) objectFactory.create(VirtualHost.class, attributes, virtualHostNode );
+ host.start();
+ when(virtualHostNode.getVirtualHost()).thenReturn(host);
+ _createdVirtualHosts.add(host);
+
+ testBase.registerTearDown(_closeVirtualHosts);
+ return host;
+ }
+
+ public static VirtualHostNode createVirtualHostNodeMock(final String virtualHostNodeName,
+ final boolean defaultVHN,
+ final AccessControl accessControl,
+ final Broker<?> broker)
+ {
+ ConfiguredObjectFactory objectFactory = broker.getObjectFactory();
VirtualHostNode virtualHostNode = mockWithSystemPrincipalAndAccessControl(VirtualHostNode.class, SYSTEM_PRINCIPAL, accessControl);
- String virtualHostNodeName = String.format("%s_%s", attributes.get(VirtualHostNode.NAME), "_node");
when(virtualHostNode.getName()).thenReturn( virtualHostNodeName);
when(virtualHostNode.getTaskExecutor()).thenReturn(TASK_EXECUTOR);
when(virtualHostNode.getChildExecutor()).thenReturn(TASK_EXECUTOR);
@@ -194,15 +212,7 @@ public class BrokerTestHelper
when(virtualHostNode.getTaskExecutor()).thenReturn(TASK_EXECUTOR);
when(virtualHostNode.getChildExecutor()).thenReturn(TASK_EXECUTOR);
when(virtualHostNode.createPreferenceStore()).thenReturn(mock(PreferenceStore.class));
-
- AbstractVirtualHost
- host = (AbstractVirtualHost) objectFactory.create(VirtualHost.class, attributes, virtualHostNode );
- host.start();
- when(virtualHostNode.getVirtualHost()).thenReturn(host);
- _createdVirtualHosts.add(host);
-
- testBase.registerTearDown(_closeVirtualHosts);
- return host;
+ return virtualHostNode;
}
public static QueueManagingVirtualHost<?> createVirtualHost(String name,
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a045ea8a/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
index e8589e8..d5f500e 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
@@ -57,26 +57,21 @@ import org.junit.Test;
import org.mockito.ArgumentMatcher;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
-import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogMessage;
import org.apache.qpid.server.logging.MessageLogger;
import org.apache.qpid.server.logging.messages.KeyStoreMessages;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.BrokerModel;
+import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.KeyStore;
-import org.apache.qpid.server.model.Model;
import org.apache.qpid.test.utils.TestFileUtils;
import org.apache.qpid.test.utils.UnitTestBase;
public class NonJavaKeyStoreTest extends UnitTestBase
{
- private final Broker<?> _broker = mock(Broker.class);
- private final TaskExecutor _taskExecutor = CurrentThreadTaskExecutor.newStartedInstance();
- private final Model _model = BrokerModel.getInstance();
- private final ConfiguredObjectFactory _factory = _model.getObjectFactory();
+ private Broker<?> _broker;
+ private ConfiguredObjectFactory _factory;
private List<File> _testResources;
private MessageLogger _messageLogger;
@@ -84,11 +79,9 @@ public class NonJavaKeyStoreTest extends UnitTestBase
public void setUp() throws Exception
{
_messageLogger = mock(MessageLogger.class);
- when(_broker.getTaskExecutor()).thenReturn(_taskExecutor);
- when(_broker.getChildExecutor()).thenReturn(_taskExecutor);
- when(_broker.getModel()).thenReturn(_model);
+ _broker = BrokerTestHelper.createBrokerMock();
when(_broker.getEventLogger()).thenReturn(new EventLogger(_messageLogger));
- when(((Broker) _broker).getCategoryClass()).thenReturn(Broker.class);
+ _factory = _broker.getObjectFactory();
_testResources = new ArrayList<>();
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a045ea8a/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostTest.java b/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostTest.java
index 3b69808..395abe5 100644
--- a/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostTest.java
+++ b/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/virtualhost/jdbc/JDBCVirtualHostTest.java
@@ -22,7 +22,6 @@ package org.apache.qpid.server.virtualhost.jdbc;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
import java.util.Arrays;
import java.util.Collections;
@@ -37,13 +36,9 @@ import org.junit.Test;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
-import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.BrokerTestHelper;
import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
-import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.store.jdbc.JDBCContainer;
@@ -75,19 +70,10 @@ public class JDBCVirtualHostTest extends UnitTestBase
@Test
public void testInvalidTableNamePrefix() throws Exception
{
- final VirtualHostNode vhn = mock(VirtualHostNode.class);
- when(vhn.getCategoryClass()).thenReturn(VirtualHostNode.class);
- when(vhn.getChildExecutor()).thenReturn(_taskExecutor);
- final ConfiguredObjectFactoryImpl factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
- when(vhn.getObjectFactory()).thenReturn(factory);
- when(vhn.getModel()).thenReturn(factory.getModel());
-
- EventLogger eventLogger = mock(EventLogger.class);
- SystemConfig systemConfig = mock(SystemConfig.class);
- when(systemConfig.getEventLogger()).thenReturn(eventLogger);
- Broker broker = mock(Broker.class);
- when(broker.getParent()).thenReturn(systemConfig);
- when(vhn.getParent()).thenReturn(broker);
+ final VirtualHostNode vhn = BrokerTestHelper.createVirtualHostNodeMock("testNode",
+ true,
+ BrokerTestHelper.createAccessControlMock(),
+ BrokerTestHelper.createBrokerMock());
Map<String, Object> attributes = new HashMap<>();
attributes.put(ConfiguredObject.NAME, getTestName());
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a045ea8a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/tls/TlsTest.java
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/tls/TlsTest.java b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/tls/TlsTest.java
index 7f61e4f..8ece2c2 100644
--- a/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/tls/TlsTest.java
+++ b/systests/qpid-systests-jms_1.1/src/test/java/org/apache/qpid/systests/jms_1_1/extensions/tls/TlsTest.java
@@ -484,6 +484,10 @@ public class TlsTest extends JmsTestBase
getProtocol(),
is(not(equalTo(Protocol.AMQP_1_0))));
+ assumeThat("QPID-8255: certificate can only be loaded using jks keystore ",
+ java.security.KeyStore.getDefaultType(),
+ is(equalTo("jks")));
+
//Start the broker (NEEDing client certificate authentication)
int port = configureTlsPort(getTestPortName(), true, false, false);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org