* This method is annotated with {@link BeforeAll} and is responsible for:
@@ -161,6 +182,7 @@ public void shutdownRealMessageBus() {
}
messageBus = null;
}
+ activemq.stop();
}
}
@@ -169,13 +191,30 @@ public void shutdownRealMessageBus() {
*
* This includes stopping the embedded reference pillar and calling the superclass's shutdown method.
*/
- @AfterSuite
+ @AfterAll
@Override
public void shutdownSuite() {
- stopEmbeddedReferencePillar();
+ if (embeddedPillar != null) {
+ embeddedPillar.shutdown();
+ auditTrailDB.stop();
+ checksumDB.stop();
+ }
super.shutdownSuite();
}
+ @Override
+ protected void initializeCUT() {
+ super.initializeCUT();
+ reloadMessageBus();
+ clientProvider = new ClientProvider(securityManager, settingsForTestClient);
+ pillarFileManager = new PillarFileManager(collectionID,
+ getPillarID(),
+ settingsForTestClient,
+ clientProvider,
+ httpServerConfiguration);
+ clientEventHandler = new ClientEventLogger();
+ }
+
/**
* Adds context information to the test result in case of failure.
*
@@ -191,6 +230,7 @@ public void addFailureContextInfo(TestInfo result) {
protected void setupRealMessageBus() {
if (!useEmbeddedMessageBus()) {
MessageBusManager.clear();
+ startContainer(activemq);
messageBus = MessageBusManager.getMessageBus(settingsForCUT, securityManager);
} else {
messageBus = new SimpleMessageBus();
@@ -204,15 +244,20 @@ protected void setupRealMessageBus() {
}
}
- @Override
- public void initMessagebus() {
- //Shortcircuit this so the messagebus is NOT INITIALISED BEFORE THE CONFIGURATION
- //super.initMessagebus();
+ private static void startContainer(final GenericContainer container) {
+ container.start();
+ while (!container.isRunning()) {
+ try {
+ Thread.sleep(2000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
/**
* Will start an embedded reference pillar if specified in the pillar-integration-test.properties.
- * The type of pillar (full or checksum) is baed on the test group used, eg. if the group is
+ * The type of pillar (full or checksum) is baed on the test group used, i.e. if the group is
* checksumPillarTest a checksum pillar is started, else a normal 'full' reference pillar is started.
*
*
@@ -220,6 +265,8 @@ public void initMessagebus() {
*/
protected void startEmbeddedPillar(SuiteInfo testInfo) {
if (testConfiguration.useEmbeddedPillar()) {
+ startContainer(auditTrailDB);
+ startContainer(checksumDB);
SettingsUtils.initialize(settingsForCUT);
//TODO the tags are for the tags on the class, not the method
// And they are not the tags from Suite, so you will not get the behaivour you want...
@@ -231,15 +278,9 @@ protected void startEmbeddedPillar(SuiteInfo testInfo) {
}
}
- protected void stopEmbeddedReferencePillar() {
- if (embeddedPillar != null) {
- embeddedPillar.shutdown();
- }
- }
-
@Override
public boolean useEmbeddedMessageBus() {
- return true;
+ return false;
}
/**
@@ -263,14 +304,16 @@ protected long getOperationTimeout() {
/**
* Overrides the default settings modification, as this only works if the test can inject the modified settings into
* the pillar. This means that if we are not using an embedded pillar we need to use the 'raw' collection settings,
- * eg. we can not add a special postfix.
+ * i.e. we can not add a special postfix.
*
* @Override
*/
protected String getTopicPostfix() {
if (testConfiguration.useEmbeddedPillar()) {
return "-" + System.getProperty("user.name");
- } else return "";
+ } else {
+ return "";
+ }
}
@Override
@@ -306,8 +349,22 @@ protected void afterMethodVerification() {
protected void putDefaultFile() {
try {
+
+ Path path = new File(settingsForCUT.getReferenceSettings().getFileExchangeSettings().getPath()).toPath();
+
+ try {
+ FileUtils.forceMkdir(path.toFile());
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
+ URL resource = Thread.currentThread()
+ .getContextClassLoader()
+ .getResource("default-test-file.txt");
+ Assertions.assertNotNull(resource);
+ Path srcFile = new File(resource.getFile()).toPath();
+
FileExchange fe = ProtocolComponentFactory.getInstance().getFileExchange(settingsForCUT);
- try (InputStream fis = getClass().getClassLoader().getResourceAsStream("default-test-file.txt")) {
+ try (InputStream fis = new BufferedInputStream(Files.newInputStream(srcFile))) {
fe.putFile(fis, defaultFileUrl);
} catch (IOException e) {
throw new UncheckedIOException("Failed to upload default test file", e);
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/ReferencePillarDerbyDBTestUtils.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/ReferencePillarDerbyDBTestUtils.java
index 246b5ad61..b9a670211 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/ReferencePillarDerbyDBTestUtils.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/ReferencePillarDerbyDBTestUtils.java
@@ -5,16 +5,16 @@
* Copyright (C) 2010 - 2012 The State and University Library, The Royal Library and The State Archives, Denmark
* %%
* This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 2.1 of the
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
* License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Lesser Public License for more details.
- *
- * You should have received a copy of the GNU General Lesser Public
+ *
+ * You should have received a copy of the GNU General Lesser Public
* License along with this program. If not, see
* .
* #L%
@@ -46,17 +46,41 @@ public ReferencePillarDerbyDBTestUtils(Settings pillarSettings) {
*/
public void createEmptyDatabases() {
DatabaseSpecifics auditTrailDB =
- pillarSettings.getReferenceSettings().getPillarSettings().getAuditTrailContributerDatabase();
- DerbyDatabaseDestroyer.deleteDatabase(auditTrailDB);
- PillarAuditTrailDatabaseCreator pillarAuditTrailDatabaseCreator =
- new PillarAuditTrailDatabaseCreator();
- pillarAuditTrailDatabaseCreator.createAuditTrailContributorDatabase(pillarSettings, null);
+ pillarSettings.getReferenceSettings().getPillarSettings().getAuditTrailContributerDatabase();
+ var pillarAuditTrailDBCreator = new PillarAuditTrailDatabaseCreator();
+ switch (auditTrailDB.getDriverClass()) {
+ case "org.postgresql.Driver": {
+ pillarAuditTrailDBCreator.createAuditTrailContributorDatabase(pillarSettings,
+ "sql/postgres/auditContributorDBCreation.sql");
+ break;
+ }
+ case "org.apache.derby.jdbc.EmbeddedDriver":
+ default: {
+
+ DerbyDatabaseDestroyer.deleteDatabase(auditTrailDB);
+ PillarAuditTrailDatabaseCreator pillarAuditTrailDatabaseCreator =
+ new PillarAuditTrailDatabaseCreator();
+ pillarAuditTrailDatabaseCreator.createAuditTrailContributorDatabase(pillarSettings,
+ "sql/derby/auditContributorDBCreation.sql");
+ break;
+ }
+ }
DatabaseSpecifics checksumDB =
- pillarSettings.getReferenceSettings().getPillarSettings().getChecksumDatabase();
- DerbyDatabaseDestroyer.deleteDatabase(checksumDB);
+ pillarSettings.getReferenceSettings().getPillarSettings().getChecksumDatabase();
+ var checksumDBCreator = new ChecksumDatabaseCreator();
+ switch (checksumDB.getDriverClass()) {
+ case "org.postgresql.Driver": {
+ checksumDBCreator.createChecksumDatabase(pillarSettings, "sql/postgres/checksumDBCreation.sql");
+ break;
+ }
+ case "org.apache.derby.jdbc.EmbeddedDriver":
+ default: {
+ DerbyDatabaseDestroyer.deleteDatabase(checksumDB);
+ checksumDBCreator.createChecksumDatabase(pillarSettings, "sql/derby/checksumDBCreation.sql");
+ break;
+ }
+ }
- ChecksumDatabaseCreator checksumDatabaseCreator = new ChecksumDatabaseCreator();
- checksumDatabaseCreator.createChecksumDatabase(pillarSettings, null);
}
}
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/DefaultPillarIdentificationTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/DefaultPillarIdentificationIT.java
similarity index 89%
rename from bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/DefaultPillarIdentificationTest.java
rename to bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/DefaultPillarIdentificationIT.java
index e144e35e2..3d67d4aba 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/DefaultPillarIdentificationTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/DefaultPillarIdentificationIT.java
@@ -33,14 +33,14 @@
import static org.bitrepository.common.utils.AllureTestUtils.addDescription;
import static org.bitrepository.common.utils.AllureTestUtils.addStep;
-public abstract class DefaultPillarIdentificationTest extends DefaultPillarMessagingTest {
+public abstract class DefaultPillarIdentificationIT extends DefaultPillarMessagingIT {
@Test
@Tag(PillarTestGroups.FULL_PILLAR_TEST)
@Tag(PillarTestGroups.CHECKSUM_PILLAR_TEST)
public void irrelevantCollectionTest() {
addDescription("Verifies identification works correctly for a collection not defined for the pillar");
- addStep("Sending a putFile identification with a irrelevant collectionID. eg. the " +
+ addStep("Sending a putFile identification with a irrelevant collectionID. i.e. the " +
" pillar is not part of the collection",
"The pillar under test should not make a response");
MessageRequest request = createRequest();
@@ -49,8 +49,8 @@ public void irrelevantCollectionTest() {
assertNoResponseIsReceived();
}
- protected void assertPositivResponseIsReceived() {
- MessageResponse receivedResponse = receiveResponse();
+ protected void assertPositivResponseIsReceived(MessageRequest request) {
+ MessageResponse receivedResponse = receiveResponse(request);
Assertions.assertEquals(ResponseCode.IDENTIFICATION_POSITIVE, receivedResponse.getResponseInfo().getResponseCode());
}
}
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/DefaultPillarMessagingTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/DefaultPillarMessagingIT.java
similarity index 79%
rename from bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/DefaultPillarMessagingTest.java
rename to bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/DefaultPillarMessagingIT.java
index e5f7a1068..cc7479400 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/DefaultPillarMessagingTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/DefaultPillarMessagingIT.java
@@ -26,6 +26,7 @@
import org.bitrepository.bitrepositorymessages.MessageRequest;
import org.bitrepository.bitrepositorymessages.MessageResponse;
import org.bitrepository.pillar.PillarTestGroups;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -38,7 +39,7 @@
* implement the abstract methods and add any operation specific tests. The test will not work for Alarm and status
* messaging, as it is assumed that operations are collection scope.
*/
-public abstract class DefaultPillarMessagingTest extends PillarFunctionTest {
+public abstract class DefaultPillarMessagingIT extends PillarFunctionIT {
@Test
@Tag(PillarTestGroups.FULL_PILLAR_TEST)
@@ -51,7 +52,7 @@ public void missingCollectionIDTest() {
request.setCollectionID(null);
messageBus.sendMessage(request);
- MessageResponse receivedResponse = receiveResponse();
+ MessageResponse receivedResponse = receiveResponse(request);
Assertions.assertEquals(ResponseCode.REQUEST_NOT_UNDERSTOOD_FAILURE, receivedResponse.getResponseInfo().getResponseCode());
}
@@ -66,14 +67,19 @@ public void otherCollectionTest() {
MessageRequest request = createRequest();
request.setCollectionID(nonDefaultCollectionId);
messageBus.sendMessage(request);
- assertPositivResponseIsReceived();
+ MessageResponse receivedResponse = receiveResponse(request);
+
+ if (this.getClass().getSimpleName().startsWith("Identify")){
+ // I challenge the next guy to figure out when the code is IDENTIFICATION_POSITIVE and when it is OPERATION_COMPLETED
+ Assertions.assertEquals(ResponseCode.IDENTIFICATION_POSITIVE, receivedResponse.getResponseInfo().getResponseCode());
+ } else {
+ Assertions.assertEquals(ResponseCode.OPERATION_COMPLETED, receivedResponse.getResponseInfo().getResponseCode());
+ }
}
protected abstract MessageRequest createRequest();
- protected abstract MessageResponse receiveResponse();
-
- protected abstract void assertPositivResponseIsReceived();
+ protected abstract MessageResponse receiveResponse(MessageRequest request);
protected abstract void assertNoResponseIsReceived();
}
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/DefaultPillarOperationTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/DefaultPillarOperationIT.java
similarity index 80%
rename from bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/DefaultPillarOperationTest.java
rename to bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/DefaultPillarOperationIT.java
index 63a4d834e..d9e477a5c 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/DefaultPillarOperationTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/DefaultPillarOperationIT.java
@@ -23,13 +23,14 @@
package org.bitrepository.pillar.integration.func;
import org.bitrepository.bitrepositoryelements.ResponseCode;
+import org.bitrepository.bitrepositorymessages.MessageRequest;
import org.bitrepository.bitrepositorymessages.MessageResponse;
import org.junit.jupiter.api.Assertions;
-public abstract class DefaultPillarOperationTest extends DefaultPillarMessagingTest {
+public abstract class DefaultPillarOperationIT extends DefaultPillarMessagingIT {
- protected void assertPositivResponseIsReceived() {
- MessageResponse receivedResponse = receiveResponse();
+ protected void assertPositivResponseIsReceived(MessageRequest request) {
+ MessageResponse receivedResponse = receiveResponse(request);
Assertions.assertEquals(ResponseCode.OPERATION_COMPLETED, receivedResponse.getResponseInfo().getResponseCode());
}
}
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/PillarFunctionTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/PillarFunctionIT.java
similarity index 85%
rename from bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/PillarFunctionTest.java
rename to bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/PillarFunctionIT.java
index 1cc90df5f..2c80f5f93 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/PillarFunctionTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/PillarFunctionIT.java
@@ -21,9 +21,10 @@
*/
package org.bitrepository.pillar.integration.func;
-import org.bitrepository.pillar.integration.PillarIntegrationTest;
+import org.bitrepository.pillar.integration.PillarIntegrationIT;
import org.bitrepository.pillar.messagefactories.PutFileMessageFactory;
import org.bitrepository.protocol.bus.MessageReceiver;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestInfo;
@@ -34,7 +35,7 @@
* The parent class for pillar acceptance tests. The tests can be run in a multi pillar collection has the tests will
* ignore responses from other pillars.
*/
-public abstract class PillarFunctionTest extends PillarIntegrationTest {
+public abstract class PillarFunctionIT extends PillarIntegrationIT {
protected static final Long DEFAULT_FILE_SIZE = 10L;
protected PutFileMessageFactory msgFactory;
protected String testSpecificFileID;
@@ -50,11 +51,15 @@ public void generalMethodSetup(TestInfo testInfo) throws Exception {
protected void registerMessageReceivers() {
super.registerMessageReceivers();
- clientReceiver = new MessageReceiver(settingsForTestClient.getReceiverDestinationID());
- addReceiver(clientReceiver);
+ clientReceiver = addReceiver(new MessageReceiver(settingsForTestClient.getReceiverDestinationID()));
Collection pillarFilter = Collections.singletonList(testConfiguration.getPillarUnderTestID());
clientReceiver.setFromFilter(pillarFilter);
alarmReceiver.setFromFilter(pillarFilter);
}
+
+ @AfterEach
+ void clearReceiver(){
+ clientReceiver.clearMessages();
+ }
}
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/deletefile/DeleteFileRequestIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/deletefile/DeleteFileRequestIT.java
index 9ec15f4b8..283864b72 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/deletefile/DeleteFileRequestIT.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/deletefile/DeleteFileRequestIT.java
@@ -35,7 +35,7 @@
import org.bitrepository.common.utils.Base16Utils;
import org.bitrepository.common.utils.TestFileHelper;
import org.bitrepository.pillar.PillarTestGroups;
-import org.bitrepository.pillar.integration.func.DefaultPillarOperationTest;
+import org.bitrepository.pillar.integration.func.DefaultPillarOperationIT;
import org.bitrepository.pillar.messagefactories.DeleteFileMessageFactory;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -47,7 +47,7 @@
import static org.bitrepository.common.utils.AllureTestUtils.addDescription;
import static org.bitrepository.common.utils.AllureTestUtils.addStep;
-class DeleteFileRequestIT extends DefaultPillarOperationTest {
+class DeleteFileRequestIT extends DefaultPillarOperationIT {
protected DeleteFileMessageFactory msgFactory;
private String pillarDestination;
@@ -71,19 +71,20 @@ void normalDeleteFileTest() {
addStep("Send a DeleteFile request to " + testConfiguration.getPillarUnderTestID(),
"The pillar should generate a OPERATION_ACCEPTED_PROGRESS progress response followed by a " +
"OPERATION_COMPLETED final response");
- DeleteFileRequest deleteRequest = (DeleteFileRequest) createRequest();
+ DeleteFileRequest deleteRequest = createRequest();
deleteRequest.setFileID(testSpecificFileID);
messageBus.sendMessage(deleteRequest);
DeleteFileProgressResponse progressResponse =
- clientReceiver.waitForMessage(DeleteFileProgressResponse.class, getOperationTimeout(), TimeUnit.SECONDS);
+ clientReceiver.waitForMessage(DeleteFileProgressResponse.class, getOperationTimeout(), TimeUnit.SECONDS,
+ deleteRequest.getCorrelationID());
Assertions.assertNotNull(progressResponse);
Assertions.assertEquals(deleteRequest.getCorrelationID(), progressResponse.getCorrelationID());
Assertions.assertEquals(getPillarID(), progressResponse.getFrom());
Assertions.assertEquals(getPillarID(), progressResponse.getPillarID());
Assertions.assertEquals(ResponseCode.OPERATION_ACCEPTED_PROGRESS, progressResponse.getResponseInfo().getResponseCode());
- DeleteFileFinalResponse finalResponse = (DeleteFileFinalResponse) receiveResponse();
+ DeleteFileFinalResponse finalResponse = receiveResponse(deleteRequest);
Assertions.assertNotNull(finalResponse);
Assertions.assertEquals(ResponseCode.OPERATION_COMPLETED, finalResponse.getResponseInfo().getResponseCode());
Assertions.assertEquals(deleteRequest.getCorrelationID(), finalResponse.getCorrelationID());
@@ -111,15 +112,18 @@ void requestNewChecksumDeleteFileTest() {
TestFileHelper.getDefaultFileChecksum(), requestedChecksumSpec, testSpecificFileID);
messageBus.sendMessage(deleteRequest);
- DeleteFileProgressResponse progressResponse = clientReceiver.waitForMessage(DeleteFileProgressResponse.class,
- getOperationTimeout(), TimeUnit.SECONDS);
+ var progressResponse = clientReceiver.waitForMessage(
+ DeleteFileProgressResponse.class,
+ getOperationTimeout(),
+ TimeUnit.SECONDS,
+ deleteRequest.getCorrelationID());
Assertions.assertNotNull(progressResponse);
Assertions.assertEquals(deleteRequest.getCorrelationID(), progressResponse.getCorrelationID());
Assertions.assertEquals(getPillarID(), progressResponse.getFrom());
Assertions.assertEquals(getPillarID(), progressResponse.getPillarID());
Assertions.assertEquals(ResponseCode.OPERATION_ACCEPTED_PROGRESS, progressResponse.getResponseInfo().getResponseCode());
- DeleteFileFinalResponse finalResponse = (DeleteFileFinalResponse) receiveResponse();
+ DeleteFileFinalResponse finalResponse = receiveResponse(deleteRequest);
Assertions.assertNotNull(finalResponse);
Assertions.assertEquals(ResponseCode.OPERATION_COMPLETED, finalResponse.getResponseInfo().getResponseCode());
Assertions.assertEquals(deleteRequest.getCorrelationID(), finalResponse.getCorrelationID());
@@ -136,14 +140,15 @@ void requestNewChecksumDeleteFileTest() {
}
@Override
- protected MessageRequest createRequest() {
+ protected DeleteFileRequest createRequest() {
return msgFactory.createDeleteFileRequest(TestFileHelper.getDefaultFileChecksum(), null, defaultFileId);
}
@Override
- protected MessageResponse receiveResponse() {
- return clientReceiver.waitForMessage(DeleteFileFinalResponse.class, getOperationTimeout(),
- TimeUnit.SECONDS);
+ protected DeleteFileFinalResponse receiveResponse(MessageRequest request) {
+ return clientReceiver.waitForMessage(DeleteFileFinalResponse.class,
+ getOperationTimeout(), TimeUnit.SECONDS,
+ request.getCorrelationID());
}
protected void assertNoResponseIsReceived() {
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/deletefile/IdentifyPillarsForDeleteFileIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/deletefile/IdentifyPillarsForDeleteFileIT.java
index 4e0f1f85f..fea93898b 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/deletefile/IdentifyPillarsForDeleteFileIT.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/deletefile/IdentifyPillarsForDeleteFileIT.java
@@ -27,7 +27,7 @@
import org.bitrepository.bitrepositorymessages.MessageRequest;
import org.bitrepository.bitrepositorymessages.MessageResponse;
import org.bitrepository.pillar.PillarTestGroups;
-import org.bitrepository.pillar.integration.func.DefaultPillarIdentificationTest;
+import org.bitrepository.pillar.integration.func.DefaultPillarIdentificationIT;
import org.bitrepository.pillar.messagefactories.DeleteFileMessageFactory;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -38,7 +38,7 @@
import static org.bitrepository.common.utils.AllureTestUtils.addStep;
-class IdentifyPillarsForDeleteFileIT extends DefaultPillarIdentificationTest {
+class IdentifyPillarsForDeleteFileIT extends DefaultPillarIdentificationIT {
protected DeleteFileMessageFactory msgFactory;
@BeforeEach
@@ -53,11 +53,10 @@ void normalIdentificationTest() {
addDescription("Verifies the normal behaviour for deleteFile identification");
addStep("Sending a deleteFile identification.",
"The pillar under test should make a response with the correct elements.");
- IdentifyPillarsForDeleteFileRequest identifyRequest = (IdentifyPillarsForDeleteFileRequest) createRequest();
+ IdentifyPillarsForDeleteFileRequest identifyRequest = createRequest();
messageBus.sendMessage(identifyRequest);
- IdentifyPillarsForDeleteFileResponse receivedIdentifyResponse = clientReceiver.waitForMessage(
- IdentifyPillarsForDeleteFileResponse.class);
+ IdentifyPillarsForDeleteFileResponse receivedIdentifyResponse = receiveResponse(identifyRequest);
Assertions.assertEquals(identifyRequest.getCollectionID(), receivedIdentifyResponse.getCollectionID());
Assertions.assertEquals(identifyRequest.getCorrelationID(), receivedIdentifyResponse.getCorrelationID());
Assertions.assertEquals(getPillarID(), receivedIdentifyResponse.getFrom());
@@ -75,11 +74,10 @@ void identificationTestForChecksumPillar() {
addStep("Sending a deleteFile identification.",
"The pillar under test should make a response with the correct elements. The only different from a " +
"full pillar is that the checksum pillar will respond with the default checksum spec.");
- IdentifyPillarsForDeleteFileRequest identifyRequest = (IdentifyPillarsForDeleteFileRequest) createRequest();
+ IdentifyPillarsForDeleteFileRequest identifyRequest = createRequest();
messageBus.sendMessage(identifyRequest);
- IdentifyPillarsForDeleteFileResponse receivedIdentifyResponse = clientReceiver.waitForMessage(
- IdentifyPillarsForDeleteFileResponse.class);
+ IdentifyPillarsForDeleteFileResponse receivedIdentifyResponse = receiveResponse(identifyRequest);
Assertions.assertEquals(identifyRequest.getCollectionID(), receivedIdentifyResponse.getCollectionID());
Assertions.assertEquals(identifyRequest.getCorrelationID(), receivedIdentifyResponse.getCorrelationID());
Assertions.assertEquals(getPillarID(), receivedIdentifyResponse.getFrom());
@@ -100,20 +98,19 @@ void fileDoesNotExistsTest() {
nonDefaultFileId);
messageBus.sendMessage(identifyRequest);
- IdentifyPillarsForDeleteFileResponse receivedIdentifyResponse = clientReceiver.waitForMessage(
- IdentifyPillarsForDeleteFileResponse.class);
+ IdentifyPillarsForDeleteFileResponse receivedIdentifyResponse = receiveResponse(identifyRequest);
Assertions.assertEquals(ResponseCode.FILE_NOT_FOUND_FAILURE,
receivedIdentifyResponse.getResponseInfo().getResponseCode());
}
@Override
- protected MessageRequest createRequest() {
+ protected IdentifyPillarsForDeleteFileRequest createRequest() {
return msgFactory.createIdentifyPillarsForDeleteFileRequest(defaultFileId);
}
@Override
- protected MessageResponse receiveResponse() {
- return clientReceiver.waitForMessage(IdentifyPillarsForDeleteFileResponse.class);
+ protected IdentifyPillarsForDeleteFileResponse receiveResponse(MessageRequest request) {
+ return clientReceiver.waitForMessage(IdentifyPillarsForDeleteFileResponse.class, request.getCorrelationID());
}
@Override
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getaudittrails/GetAuditTrailsTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getaudittrails/GetAuditTrailsIT.java
similarity index 98%
rename from bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getaudittrails/GetAuditTrailsTest.java
rename to bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getaudittrails/GetAuditTrailsIT.java
index 3255baabf..afb121bbe 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getaudittrails/GetAuditTrailsTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getaudittrails/GetAuditTrailsIT.java
@@ -26,7 +26,7 @@
import org.bitrepository.bitrepositoryelements.AuditTrailEvent;
import org.bitrepository.client.exceptions.NegativeResponseException;
import org.bitrepository.pillar.PillarTestGroups;
-import org.bitrepository.pillar.integration.func.PillarFunctionTest;
+import org.bitrepository.pillar.integration.func.PillarFunctionIT;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -40,7 +40,7 @@
@Tag(PillarTestGroups.FULL_PILLAR_TEST)
@Tag(PillarTestGroups.CHECKSUM_PILLAR_TEST)
-class GetAuditTrailsTest extends PillarFunctionTest {
+class GetAuditTrailsIT extends PillarFunctionIT {
@Override
protected void initializeCUT() {
super.initializeCUT();
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/GetChecksumTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/GetChecksumIT.java
similarity index 97%
rename from bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/GetChecksumTest.java
rename to bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/GetChecksumIT.java
index 516cce89d..bc474c26d 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/GetChecksumTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/GetChecksumIT.java
@@ -28,7 +28,7 @@
import org.bitrepository.client.exceptions.NegativeResponseException;
import org.bitrepository.common.utils.Base16Utils;
import org.bitrepository.pillar.PillarTestGroups;
-import org.bitrepository.pillar.integration.func.PillarFunctionTest;
+import org.bitrepository.pillar.integration.func.PillarFunctionIT;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Tag;
@@ -41,7 +41,7 @@
import static org.bitrepository.common.utils.AllureTestUtils.addStep;
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class GetChecksumTest extends PillarFunctionTest {
+class GetChecksumIT extends PillarFunctionIT {
@BeforeAll
void retrieveFirst2Files() {
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/GetChecksumQueryTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/GetChecksumQueryIT.java
similarity index 82%
rename from bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/GetChecksumQueryTest.java
rename to bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/GetChecksumQueryIT.java
index 95036e038..dc793b5cb 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/GetChecksumQueryTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/GetChecksumQueryIT.java
@@ -25,7 +25,7 @@
import org.bitrepository.bitrepositoryelements.ChecksumDataForChecksumSpecTYPE;
import org.bitrepository.common.utils.CalendarUtils;
import org.bitrepository.pillar.PillarTestGroups;
-import org.bitrepository.pillar.integration.func.PillarFunctionTest;
+import org.bitrepository.pillar.integration.func.PillarFunctionIT;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -40,7 +40,7 @@
import static org.bitrepository.common.utils.AllureTestUtils.addFixture;
import static org.bitrepository.common.utils.AllureTestUtils.addStep;
-class GetChecksumQueryTest extends PillarFunctionTest {
+class GetChecksumQueryIT extends PillarFunctionIT {
@Test
@Tag(PillarTestGroups.FULL_PILLAR_TEST)
@@ -84,7 +84,7 @@ void maxNumberOfResultTest() {
singleChecksumQuery, null);
Assertions.assertEquals(1, singleChecksumList.size(),
"The result didn't contain a single checksum");
- Assertions.assertEquals(originalChecksumList.get(0), singleChecksumList.get(0),
+ Assertions.assertEquals(originalChecksumList.getFirst(), singleChecksumList.getFirst(),
"The returned checksum wasn't equal to " +
"the oldest checksum");
}
@@ -105,47 +105,47 @@ void minTimeStampTest() {
"but the test needs this to be satisfied to make sense).");
List originalChecksumList =
pillarFileManager.getChecksums(null, null, null);
- Assertions.assertTrue(originalChecksumList.get(0).getCalculationTimestamp().compare(
- originalChecksumList.get(originalChecksumList.size() - 1).getCalculationTimestamp()) != 0,
+ Assertions.assertTrue(originalChecksumList.getFirst().getCalculationTimestamp().compare(
+ originalChecksumList.getLast().getCalculationTimestamp()) != 0,
"The timestamps of the first and last checksum are the same.");
addStep("Request checksums with MinTimeStamp set to the timestamp of the oldest checksum",
"All checksums should be returned.");
- XMLGregorianCalendar oldestTimestamp = originalChecksumList.get(0).getCalculationTimestamp();
+ XMLGregorianCalendar oldestTimestamp = originalChecksumList.getFirst().getCalculationTimestamp();
ContributorQuery query = new ContributorQuery(getPillarID(),
- oldestTimestamp.toGregorianCalendar().getTime(), null, null);
+ oldestTimestamp.toGregorianCalendar().toInstant(), null, null);
List limitedChecksumList =
pillarFileManager.getChecksums(null, query, null);
Assertions.assertEquals(originalChecksumList.size(), limitedChecksumList.size(),
"Differing size of checksum lists");
- Assertions.assertEquals(originalChecksumList.get(0), limitedChecksumList.get(0),
+ Assertions.assertEquals(originalChecksumList.getFirst(), limitedChecksumList.getFirst(),
"Different first list element when " +
"setting oldest minTimestamp");
- Assertions.assertEquals(originalChecksumList.get(originalChecksumList.size() - 1),
- limitedChecksumList.get(limitedChecksumList.size() - 1),
+ Assertions.assertEquals(originalChecksumList.getLast(),
+ limitedChecksumList.getLast(),
"Different last list element when setting " +
"oldest minTimestamp");
- Assertions.assertTrue(limitedChecksumList.get(0).getCalculationTimestamp().compare(
- limitedChecksumList.get(limitedChecksumList.size() - 1).getCalculationTimestamp()) <= 0,
+ Assertions.assertTrue(limitedChecksumList.getFirst().getCalculationTimestamp().compare(
+ limitedChecksumList.getLast().getCalculationTimestamp()) <= 0,
"First checksum has newer timestamp than last checksum");
addStep("Request checksums with MinTimeStamp set to the timestamp of the newest checksum",
"Only checksum with the timestamp equal to MinTimeStamp are returned.");
XMLGregorianCalendar newestTimestamp =
- originalChecksumList.get(originalChecksumList.size() - 1).getCalculationTimestamp();
- query = new ContributorQuery(getPillarID(), newestTimestamp.toGregorianCalendar().getTime(),
+ originalChecksumList.getLast().getCalculationTimestamp();
+ query = new ContributorQuery(getPillarID(), newestTimestamp.toGregorianCalendar().toInstant(),
null, null);
limitedChecksumList = pillarFileManager.getChecksums(null, query, null);
Assertions.assertFalse(limitedChecksumList.isEmpty(),
"Empty list returned when when minTimestamp is set to newest calculated checksum timestamp");
- Assertions.assertEquals(0, limitedChecksumList.get(0).getCalculationTimestamp().compare(newestTimestamp),
+ Assertions.assertEquals(0, limitedChecksumList.getFirst().getCalculationTimestamp().compare(newestTimestamp),
"Different timestamps in the set of newest checksums." + limitedChecksumList);
addStep("Request checksums with MinTimeStamp set to the timestamp of the newest checksum + 10 ms",
"No checksums are returned.");
GregorianCalendar newerThanNewestTimestamp = newestTimestamp.toGregorianCalendar();
newerThanNewestTimestamp.add(Calendar.MILLISECOND, 10);
- query = new ContributorQuery(getPillarID(), newerThanNewestTimestamp.getTime(), null, null);
+ query = new ContributorQuery(getPillarID(), newerThanNewestTimestamp.toInstant(), null, null);
limitedChecksumList = pillarFileManager.getChecksums(null, query, null);
Assertions.assertTrue(limitedChecksumList.isEmpty(),
"Non-empty checksum list returned with newerThanNewestTimestamp(" +
@@ -169,48 +169,47 @@ void maxTimeStampTest() {
"but the test needs this to be satisfied to make sense).");
List originalChecksumList = pillarFileManager.getChecksums(null,
null, null);
- Assertions.assertTrue(originalChecksumList.get(0).getCalculationTimestamp().compare(
- originalChecksumList.get(originalChecksumList.size() - 1).getCalculationTimestamp()) != 0,
+ Assertions.assertTrue(originalChecksumList.getFirst().getCalculationTimestamp().compare(
+ originalChecksumList.getLast().getCalculationTimestamp()) != 0,
"The timestamps of the first and last checksum are the same.");
addStep("Request checksums with MaxTimeStamp set to the timestamp of the newest checksum",
"All checksums should be returned.");
XMLGregorianCalendar newestTimestamp =
- originalChecksumList.get(originalChecksumList.size() - 1).getCalculationTimestamp();
+ originalChecksumList.getLast().getCalculationTimestamp();
ContributorQuery query = new ContributorQuery(getPillarID(),
- null, newestTimestamp.toGregorianCalendar().getTime(), null);
+ null, newestTimestamp.toGregorianCalendar().toInstant(), null);
List limitedChecksumList = pillarFileManager.getChecksums(null,
query, null);
Assertions.assertEquals(originalChecksumList.size(), limitedChecksumList.size(),
"Differing size of checksum lists");
- Assertions.assertEquals(originalChecksumList.get(0), limitedChecksumList.get(0),
+ Assertions.assertEquals(originalChecksumList.getFirst(), limitedChecksumList.getFirst(),
"Different first list element when " +
"setting newest maxTimestamp");
- Assertions.assertEquals(originalChecksumList.get(originalChecksumList.size() - 1),
- limitedChecksumList.get(limitedChecksumList.size() - 1),
+ Assertions.assertEquals(originalChecksumList.getLast(), limitedChecksumList.getLast(),
"Different last list element when setting " +
"newest maxTimestamp");
- Assertions.assertTrue(limitedChecksumList.get(0).getCalculationTimestamp().compare(
- limitedChecksumList.get(limitedChecksumList.size() - 1).getCalculationTimestamp()) <= 0,
+ Assertions.assertTrue(limitedChecksumList.getFirst().getCalculationTimestamp().compare(
+ limitedChecksumList.getLast().getCalculationTimestamp()) <= 0,
"First checksum has newer timestamp than last checksum");
addStep("Request checksums with MaxTimeStamp set to the timestamp of the oldest checksum",
"Only checksum with the timestamp equal to MaxTimeStamp are returned.");
- XMLGregorianCalendar oldestTimestamp = originalChecksumList.get(0).getCalculationTimestamp();
+ XMLGregorianCalendar oldestTimestamp = originalChecksumList.getFirst().getCalculationTimestamp();
query = new ContributorQuery(getPillarID(),
- null, oldestTimestamp.toGregorianCalendar().getTime(), null);
+ null, oldestTimestamp.toGregorianCalendar().toInstant(), null);
limitedChecksumList = pillarFileManager.getChecksums(null, query, null);
Assertions.assertFalse(limitedChecksumList.isEmpty(),
"At least one checksum with the oldest timestamp should be " +
"returned.");
- Assertions.assertEquals(0, limitedChecksumList.get(0).getCalculationTimestamp().compare(oldestTimestamp),
+ Assertions.assertEquals(0, limitedChecksumList.getFirst().getCalculationTimestamp().compare(oldestTimestamp),
"Different timestamps in the set of oldest checksums." + limitedChecksumList);
addStep("Request checksums with MaxTimeStamp set to the timestamp of the oldest checksum - 10 ms",
"No checksums are returned.");
GregorianCalendar olderThanOldestTimestamp = oldestTimestamp.toGregorianCalendar();
olderThanOldestTimestamp.add(Calendar.MILLISECOND, -10);
- query = new ContributorQuery(getPillarID(), null, olderThanOldestTimestamp.getTime(), null);
+ query = new ContributorQuery(getPillarID(), null, olderThanOldestTimestamp.toInstant(), null);
limitedChecksumList = pillarFileManager.getChecksums(null, query, null);
Assertions.assertTrue(limitedChecksumList.isEmpty(),
"Non-empty checksum list returned with olderThanOldestTimestamp(" +
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/IdentifyPillarsForGetChecksumsIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/IdentifyPillarsForGetChecksumsIT.java
index 28f724bbf..a597009e2 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/IdentifyPillarsForGetChecksumsIT.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getchecksums/IdentifyPillarsForGetChecksumsIT.java
@@ -31,7 +31,7 @@
import org.bitrepository.common.utils.ChecksumUtils;
import org.bitrepository.common.utils.FileIDsUtils;
import org.bitrepository.pillar.PillarTestGroups;
-import org.bitrepository.pillar.integration.func.DefaultPillarIdentificationTest;
+import org.bitrepository.pillar.integration.func.DefaultPillarIdentificationIT;
import org.bitrepository.pillar.messagefactories.GetChecksumsMessageFactory;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -41,7 +41,7 @@
import static org.bitrepository.common.utils.AllureTestUtils.addDescription;
import static org.bitrepository.common.utils.AllureTestUtils.addStep;
-class IdentifyPillarsForGetChecksumsIT extends DefaultPillarIdentificationTest {
+class IdentifyPillarsForGetChecksumsIT extends DefaultPillarIdentificationIT {
protected GetChecksumsMessageFactory msgFactory;
@BeforeEach
@@ -71,8 +71,7 @@ void normalIdentificationTest() {
addStep("Retrieve and validate the response getPillarID() the pillar.",
"The pillar should make a response.");
- IdentifyPillarsForGetChecksumsResponse receivedIdentifyResponse = clientReceiver.waitForMessage(
- IdentifyPillarsForGetChecksumsResponse.class);
+ IdentifyPillarsForGetChecksumsResponse receivedIdentifyResponse = receiveResponse(identifyRequest);
Assertions.assertNotNull(receivedIdentifyResponse);
Assertions.assertEquals(identifyRequest.getCollectionID(), receivedIdentifyResponse.getCollectionID(),
"Received unexpected 'CollectionID' in response.");
@@ -107,8 +106,7 @@ void nonExistingFileTest() {
addStep("Retrieve and validate the response getPillarID() the pillar.",
"The pillar should make a response.");
- IdentifyPillarsForGetChecksumsResponse receivedIdentifyResponse = clientReceiver.waitForMessage(
- IdentifyPillarsForGetChecksumsResponse.class);
+ IdentifyPillarsForGetChecksumsResponse receivedIdentifyResponse = receiveResponse(identifyRequest);
Assertions.assertNotNull(receivedIdentifyResponse.getFileIDs().getFileID());
Assertions.assertEquals(ResponseCode.FILE_NOT_FOUND_FAILURE,
receivedIdentifyResponse.getResponseInfo().getResponseCode(),
@@ -132,22 +130,21 @@ void allFilesTest() {
addStep("Retrieve and validate the response getPillarID() the pillar.",
"The pillar should make a response.");
- IdentifyPillarsForGetChecksumsResponse receivedIdentifyResponse = clientReceiver.waitForMessage(
- IdentifyPillarsForGetChecksumsResponse.class);
+ IdentifyPillarsForGetChecksumsResponse receivedIdentifyResponse = receiveResponse(identifyRequest);
Assertions.assertEquals(ResponseCode.IDENTIFICATION_POSITIVE,
receivedIdentifyResponse.getResponseInfo().getResponseCode(),
"Received unexpected 'ResponseCode' in response.");
}
@Override
- protected MessageRequest createRequest() {
+ protected IdentifyPillarsForGetChecksumsRequest createRequest() {
return msgFactory.createIdentifyPillarsForGetChecksumsRequest(ChecksumUtils.getDefault(settingsForCUT),
FileIDsUtils.getAllFileIDs());
}
@Override
- protected MessageResponse receiveResponse() {
- return clientReceiver.waitForMessage(IdentifyPillarsForGetChecksumsResponse.class);
+ protected IdentifyPillarsForGetChecksumsResponse receiveResponse(MessageRequest request) {
+ return clientReceiver.waitForMessage(IdentifyPillarsForGetChecksumsResponse.class, request.getCorrelationID());
}
@Override
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfile/GetFileRequestIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfile/GetFileRequestIT.java
index c5b841298..bae1f7fb1 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfile/GetFileRequestIT.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfile/GetFileRequestIT.java
@@ -11,7 +11,7 @@
import org.bitrepository.bitrepositorymessages.MessageResponse;
import org.bitrepository.common.utils.TestFileHelper;
import org.bitrepository.pillar.PillarTestGroups;
-import org.bitrepository.pillar.integration.func.PillarFunctionTest;
+import org.bitrepository.pillar.integration.func.PillarFunctionIT;
import org.bitrepository.pillar.messagefactories.GetFileMessageFactory;
import org.bitrepository.protocol.FileExchange;
import org.bitrepository.protocol.ProtocolComponentFactory;
@@ -35,7 +35,7 @@
import static org.bitrepository.common.utils.AllureTestUtils.addDescription;
import static org.bitrepository.common.utils.AllureTestUtils.addStep;
-class GetFileRequestIT extends PillarFunctionTest {
+class GetFileRequestIT extends PillarFunctionIT {
private final Logger log = LoggerFactory.getLogger(this.getClass());
protected GetFileMessageFactory msgFactory;
protected URL testFileURL = null;
@@ -77,10 +77,10 @@ void normalGetFileTest() throws IOException {
"
'ResponseInfo.ResponseCode' element should be OPERATION_COMPLETED
" +
"");
- GetFileRequest getRequest = (GetFileRequest) createRequest();
+ GetFileRequest getRequest = createRequest();
messageBus.sendMessage(getRequest);
- GetFileFinalResponse finalResponse = (GetFileFinalResponse) receiveResponse();
+ GetFileFinalResponse finalResponse = receiveResponse(getRequest);
Assertions.assertNotNull(finalResponse);
Assertions.assertEquals(getRequest.getCorrelationID(), finalResponse.getCorrelationID(),
"Received unexpected " +
@@ -123,7 +123,7 @@ void getFileWithFilePartTest() throws IOException {
addStep("Send a getFile request to " + testConfiguration.getPillarUnderTestID() + " with a specified " +
"FilePart",
"The pillar should send a final response with the FilePart element for the supplied file");
- GetFileRequest getRequest = (GetFileRequest) createRequest();
+ GetFileRequest getRequest = createRequest();
final int offsetAndLength = 5;
FilePart filePart = new FilePart();
@@ -132,7 +132,7 @@ void getFileWithFilePartTest() throws IOException {
getRequest.setFilePart(filePart);
messageBus.sendMessage(getRequest);
- GetFileFinalResponse finalResponse = (GetFileFinalResponse) receiveResponse();
+ GetFileFinalResponse finalResponse = receiveResponse(getRequest);
Assertions.assertEquals(getRequest.getFilePart(), finalResponse.getFilePart(),
"Received unexpected 'FilePart' element.");
@@ -154,11 +154,11 @@ void getMissingFileTest() {
addStep("Send a getFile request to " + testConfiguration.getPillarUnderTestID() + " with a " +
"non-existing fileID", "The pillar should send a failure response");
- GetFileRequest getRequest = (GetFileRequest) createRequest();
+ GetFileRequest getRequest = createRequest();
getRequest.setFileID("NonExistingFile");
messageBus.sendMessage(getRequest);
- GetFileFinalResponse finalResponse = (GetFileFinalResponse) receiveResponse();
+ GetFileFinalResponse finalResponse = receiveResponse(getRequest);
Assertions.assertEquals(ResponseCode.FILE_NOT_FOUND_FAILURE, finalResponse.getResponseInfo().getResponseCode(),
"Received unexpected 'ResponseCode' element.");
}
@@ -169,11 +169,11 @@ void missingCollectionIDTest() {
addDescription("Verifies the a missing collectionID in the request is rejected");
addStep("Sending a request without a collectionID.",
"The pillar should send a REQUEST_NOT_UNDERSTOOD_FAILURE Response.");
- MessageRequest request = createRequest();
+ GetFileRequest request = createRequest();
request.setCollectionID(null);
messageBus.sendMessage(request);
- MessageResponse receivedResponse = receiveResponse();
+ MessageResponse receivedResponse = receiveResponse(request);
Assertions.assertEquals(ResponseCode.REQUEST_NOT_UNDERSTOOD_FAILURE,
receivedResponse.getResponseInfo().getResponseCode());
}
@@ -188,16 +188,16 @@ void otherCollectionTest() {
MessageRequest request = createRequest();
request.setCollectionID(nonDefaultCollectionId);
messageBus.sendMessage(request);
- assertPositivResponseIsReceived();
+ assertPositivResponseIsReceived(request);
}
- protected MessageRequest createRequest() {
+ protected GetFileRequest createRequest() {
return msgFactory.createGetFileRequest(testFileURL.toExternalForm(), defaultFileId);
}
- protected MessageResponse receiveResponse() {
+ protected GetFileFinalResponse receiveResponse(final MessageRequest request) {
return clientReceiver.waitForMessage(GetFileFinalResponse.class, getOperationTimeout(),
- TimeUnit.SECONDS);
+ TimeUnit.SECONDS, request.getCorrelationID());
}
protected void assertNoResponseIsReceived() {
@@ -213,8 +213,8 @@ public String lookupGetFileDestination() {
return clientReceiver.waitForMessage(IdentifyPillarsForGetFileResponse.class).getReplyTo();
}
- protected void assertPositivResponseIsReceived() {
- MessageResponse receivedResponse = receiveResponse();
+ protected void assertPositivResponseIsReceived(final MessageRequest request) {
+ MessageResponse receivedResponse = receiveResponse(request);
Assertions.assertEquals(ResponseCode.OPERATION_COMPLETED, receivedResponse.getResponseInfo().getResponseCode());
}
}
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfile/IdentifyPillarsForGetFileIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfile/IdentifyPillarsForGetFileIT.java
index 94403fc65..7909c52c8 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfile/IdentifyPillarsForGetFileIT.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfile/IdentifyPillarsForGetFileIT.java
@@ -25,7 +25,7 @@
import org.bitrepository.bitrepositorymessages.IdentifyPillarsForGetFileRequest;
import org.bitrepository.bitrepositorymessages.IdentifyPillarsForGetFileResponse;
import org.bitrepository.pillar.PillarTestGroups;
-import org.bitrepository.pillar.integration.func.PillarFunctionTest;
+import org.bitrepository.pillar.integration.func.PillarFunctionIT;
import org.bitrepository.pillar.messagefactories.GetFileMessageFactory;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
@@ -35,7 +35,7 @@
import static org.bitrepository.common.utils.AllureTestUtils.addStep;
import static org.junit.jupiter.api.Assertions.assertEquals;
-class IdentifyPillarsForGetFileIT extends PillarFunctionTest {
+class IdentifyPillarsForGetFileIT extends PillarFunctionIT {
protected GetFileMessageFactory msgFactory;
@BeforeEach
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/GetFileIDsTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/GetFileIDsIT.java
similarity index 89%
rename from bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/GetFileIDsTest.java
rename to bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/GetFileIDsIT.java
index 6874d0324..6125710d3 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/GetFileIDsTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/GetFileIDsIT.java
@@ -27,12 +27,12 @@
import org.bitrepository.bitrepositorymessages.GetFileIDsFinalResponse;
import org.bitrepository.bitrepositorymessages.GetFileIDsProgressResponse;
import org.bitrepository.bitrepositorymessages.GetFileIDsRequest;
+import org.bitrepository.bitrepositorymessages.IdentifyPillarsForGetFileIDsRequest;
import org.bitrepository.bitrepositorymessages.IdentifyPillarsForGetFileIDsResponse;
import org.bitrepository.bitrepositorymessages.MessageRequest;
-import org.bitrepository.bitrepositorymessages.MessageResponse;
import org.bitrepository.common.utils.FileIDsUtils;
import org.bitrepository.pillar.PillarTestGroups;
-import org.bitrepository.pillar.integration.func.DefaultPillarOperationTest;
+import org.bitrepository.pillar.integration.func.DefaultPillarOperationIT;
import org.bitrepository.pillar.messagefactories.GetFileIDsMessageFactory;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -46,7 +46,7 @@
import static org.bitrepository.common.utils.AllureTestUtils.addStep;
@ExtendWith(SuiteInfoParameterResolver.class)
-class GetFileIDsTest extends DefaultPillarOperationTest {
+class GetFileIDsIT extends DefaultPillarOperationIT {
protected GetFileIDsMessageFactory msgFactory;
private String pillarDestination;
@@ -76,7 +76,7 @@ void pillarGetFileIDsTestSuccessCase() throws Exception {
addStep("Retrieve the ProgressResponse for the GetFileIDs request",
"A GetFileIDs progress response should be sent to the client with correct attributes.");
GetFileIDsProgressResponse progressResponse = clientReceiver.waitForMessage(GetFileIDsProgressResponse.class,
- getOperationTimeout(), TimeUnit.SECONDS);
+ getOperationTimeout(), TimeUnit.SECONDS, getFileIDsRequest.getCorrelationID());
Assertions.assertNotNull(progressResponse);
Assertions.assertEquals(getFileIDsRequest.getCorrelationID(), progressResponse.getCorrelationID());
Assertions.assertEquals(getFileIDsRequest.getFileIDs(), progressResponse.getFileIDs());
@@ -88,7 +88,7 @@ void pillarGetFileIDsTestSuccessCase() throws Exception {
addStep("Retrieve the FinalResponse for the GetFileIDs request",
"The GetFileIDs response should be sent by the pillar.");
- GetFileIDsFinalResponse finalResponse = (GetFileIDsFinalResponse) receiveResponse();
+ GetFileIDsFinalResponse finalResponse = receiveResponse(getFileIDsRequest);
Assertions.assertNotNull(finalResponse);
Assertions.assertEquals(ResponseCode.OPERATION_COMPLETED, finalResponse.getResponseInfo().getResponseCode());
Assertions.assertEquals(getFileIDsRequest.getCorrelationID(), finalResponse.getCorrelationID());
@@ -117,7 +117,7 @@ void pillarGetFileIDsTestFailedNoSuchFileInOperation() throws Exception {
"A FILE_NOT_FOUND_FAILURE response should be generated.");
GetFileIDsRequest getFileIDsRequest = msgFactory.createGetFileIDsRequest(fileids, null);
messageBus.sendMessage(getFileIDsRequest);
- GetFileIDsFinalResponse finalResponse = (GetFileIDsFinalResponse) receiveResponse();
+ GetFileIDsFinalResponse finalResponse = receiveResponse(getFileIDsRequest);
Assertions.assertEquals(ResponseCode.FILE_NOT_FOUND_FAILURE, finalResponse.getResponseInfo().getResponseCode());
}
@@ -137,7 +137,7 @@ void pillarGetFileIDsSpecificFileIDRequest() throws Exception {
addStep("Retrieve the FinalResponse for the GetFileIDs request.",
"A OPERATION_COMPLETE final response only containing the requested file-id.");
- GetFileIDsFinalResponse finalResponse = (GetFileIDsFinalResponse) receiveResponse();
+ GetFileIDsFinalResponse finalResponse = receiveResponse(getFileIDsRequest);
Assertions.assertEquals(1,
finalResponse.getResultingFileIDs().getFileIDsData().getFileIDsDataItems().getFileIDsDataItem().size());
Assertions.assertEquals(defaultFileId,
@@ -151,14 +151,14 @@ void pillarGetFileIDsSpecificFileIDRequest() throws Exception {
@Tag(PillarTestGroups.CHECKSUM_PILLAR_TEST)
void pillarGetFileIDsTestBadDeliveryURL() throws Exception {
addDescription("Test the case when the delivery URL is unaccessible.");
- String badURL = "http://localhost:61616/¾";
+ String badURL = "http://localhost:54321/¾";
GetFileIDsRequest getFileIDsRequest = msgFactory.createGetFileIDsRequest(
FileIDsUtils.getAllFileIDs(), badURL);
messageBus.sendMessage(getFileIDsRequest);
addStep("Retrieve the FinalResponse for the GetFileIDs request.",
"A FILE_TRANSFER_FAILURE final response is expected.");
- GetFileIDsFinalResponse finalResponse = (GetFileIDsFinalResponse) receiveResponse();
+ GetFileIDsFinalResponse finalResponse = receiveResponse(getFileIDsRequest);
Assertions.assertEquals(ResponseCode.FILE_TRANSFER_FAILURE, finalResponse.getResponseInfo().getResponseCode());
}
@@ -174,7 +174,7 @@ void pillarGetFileIDsTestDeliveryThroughUpload() throws Exception {
addStep("Retrieve the FinalResponse for the GetFileIDs request.",
"A OPERATION_COMPLETE final response is expected containing the result provided address.");
- GetFileIDsFinalResponse finalResponse = (GetFileIDsFinalResponse) receiveResponse();
+ GetFileIDsFinalResponse finalResponse = receiveResponse(getFileIDsRequest);
Assertions.assertEquals(ResponseCode.OPERATION_COMPLETED, finalResponse.getResponseInfo().getResponseCode());
Assertions.assertEquals(defaultUploadFileAddress, finalResponse.getResultingFileIDs().getResultAddress());
}
@@ -185,9 +185,9 @@ protected MessageRequest createRequest() {
}
@Override
- protected MessageResponse receiveResponse() {
+ protected GetFileIDsFinalResponse receiveResponse(MessageRequest request) {
return clientReceiver.waitForMessage(GetFileIDsFinalResponse.class, getOperationTimeout(),
- TimeUnit.SECONDS);
+ TimeUnit.SECONDS, request.getCorrelationID());
}
protected void assertNoResponseIsReceived() {
@@ -195,7 +195,8 @@ protected void assertNoResponseIsReceived() {
}
public String lookupPillarDestination() {
- messageBus.sendMessage(msgFactory.createIdentifyPillarsForGetFileIDsRequest(null));
- return clientReceiver.waitForMessage(IdentifyPillarsForGetFileIDsResponse.class).getReplyTo();
+ IdentifyPillarsForGetFileIDsRequest identifyPillarsForGetFileIDsRequest = msgFactory.createIdentifyPillarsForGetFileIDsRequest(null);
+ messageBus.sendMessage(identifyPillarsForGetFileIDsRequest);
+ return clientReceiver.waitForMessage(IdentifyPillarsForGetFileIDsResponse.class, identifyPillarsForGetFileIDsRequest.getCorrelationID()).getReplyTo();
}
}
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/GetFileIDsQueryTest.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/GetFileIDsQueryIT.java
similarity index 87%
rename from bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/GetFileIDsQueryTest.java
rename to bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/GetFileIDsQueryIT.java
index dc8536aad..a34b581f3 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/GetFileIDsQueryTest.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/GetFileIDsQueryIT.java
@@ -26,7 +26,7 @@
import org.bitrepository.common.utils.CalendarUtils;
import org.bitrepository.pillar.PillarTestGroups;
import org.bitrepository.pillar.integration.func.Assert;
-import org.bitrepository.pillar.integration.func.PillarFunctionTest;
+import org.bitrepository.pillar.integration.func.PillarFunctionIT;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@@ -41,7 +41,7 @@
import static org.bitrepository.common.utils.AllureTestUtils.addFixture;
import static org.bitrepository.common.utils.AllureTestUtils.addStep;
-class GetFileIDsQueryTest extends PillarFunctionTest {
+class GetFileIDsQueryIT extends PillarFunctionIT {
@Test
@Tag(PillarTestGroups.FULL_PILLAR_TEST)
@@ -86,7 +86,7 @@ void maxNumberOfResultTest() {
ContributorQuery singleFileIDQuery = new ContributorQuery(getPillarID(), (Instant) null, (Instant) null, 1);
List singleFileIDList = pillarFileManager.getFileIDs(singleFileIDQuery);
Assertions.assertEquals(1, singleFileIDList.size(), "The result didn't contain a single file id");
- Assertions.assertEquals(originalFileIDsList.get(0), singleFileIDList.get(0),
+ Assertions.assertEquals(originalFileIDsList.getFirst(), singleFileIDList.getFirst(),
"The returned file id wasn't equal to the oldest file id");
}
@@ -104,15 +104,15 @@ void minTimeStampTest() {
List originalFileIDsList = pillarFileManager.getFileIDs(null);
Assertions.assertTrue(originalFileIDsList.size() >= 2,
"Must initially have at least two file ids, but had: " + originalFileIDsList.size());
- Assertions.assertTrue(originalFileIDsList.get(0).getLastModificationTime().compare(
- originalFileIDsList.get(originalFileIDsList.size() - 1).getLastModificationTime()) != 0,
+ Assertions.assertTrue(originalFileIDsList.getFirst().getLastModificationTime().compare(
+ originalFileIDsList.getLast().getLastModificationTime()) != 0,
"The timestamps of the first and last file id are the same.");
addStep("Request file ids with MinTimeStamp set to the timestamp of the oldest file id",
"All file ids should be returned.");
- XMLGregorianCalendar oldestTimestamp = originalFileIDsList.get(0).getLastModificationTime();
+ XMLGregorianCalendar oldestTimestamp = originalFileIDsList.getFirst().getLastModificationTime();
ContributorQuery query = new ContributorQuery(getPillarID(),
- oldestTimestamp.toGregorianCalendar().getTime(), null, null);
+ oldestTimestamp.toGregorianCalendar().toInstant(), null, null);
List limitedFileIDsList = pillarFileManager.getFileIDs(query);
Assertions.assertEquals(originalFileIDsList, limitedFileIDsList,
"Different list return when setting old minTimestamp: "
@@ -121,21 +121,21 @@ void minTimeStampTest() {
addStep("Request file ids with MinTimeStamp set to the timestamp of the newest file id",
"Only file id with the timestamp equal to MinTimeStamp are returned.");
XMLGregorianCalendar newestTimestamp =
- originalFileIDsList.get(originalFileIDsList.size() - 1).getLastModificationTime();
+ originalFileIDsList.getLast().getLastModificationTime();
query = new ContributorQuery(getPillarID(),
- newestTimestamp.toGregorianCalendar().getTime(), null, null);
+ newestTimestamp.toGregorianCalendar().toInstant(), null, null);
limitedFileIDsList = pillarFileManager.getFileIDs(query);
Assertions.assertFalse(limitedFileIDsList.isEmpty(),
"Empty list returned when when minTimestamp is set to newest " +
"calculated checksum timestamp");
- Assertions.assertEquals(0, limitedFileIDsList.get(0).getLastModificationTime().compare(newestTimestamp),
+ Assertions.assertEquals(0, limitedFileIDsList.getFirst().getLastModificationTime().compare(newestTimestamp),
"Different timestamps in the set of newest file ids." + limitedFileIDsList);
addStep("Request file ids with MinTimeStamp set to the timestamp of the newest file id + 10 ms",
"No file ids are returned.");
GregorianCalendar newerThanNewestTimestamp = newestTimestamp.toGregorianCalendar();
newerThanNewestTimestamp.add(Calendar.MILLISECOND, 10);
- query = new ContributorQuery(getPillarID(), newerThanNewestTimestamp.getTime(), null, null);
+ query = new ContributorQuery(getPillarID(), newerThanNewestTimestamp.toInstant(), null, null);
limitedFileIDsList = pillarFileManager.getFileIDs(query);
Assert.assertEmpty(limitedFileIDsList, "Non-empty list returned with olderThanOldestTimestamp(" +
CalendarUtils.getXmlGregorianCalendar(newerThanNewestTimestamp) + ") query");
@@ -155,37 +155,37 @@ void maxTimeStampTest() {
List originalFileIDsList = pillarFileManager.getFileIDs(null);
Assertions.assertTrue(originalFileIDsList.size() >= 2,
"Must initially have at least two file ids, but had: " + originalFileIDsList.size());
- Assertions.assertTrue(originalFileIDsList.get(0).getLastModificationTime().compare(
- originalFileIDsList.get(originalFileIDsList.size() - 1).getLastModificationTime()) != 0,
+ Assertions.assertTrue(originalFileIDsList.getFirst().getLastModificationTime().compare(
+ originalFileIDsList.getLast().getLastModificationTime()) != 0,
"The timestamps of the first and last file id are the same.");
addStep("Request file ids with MaxTimeStamp set to the timestamp of the newest file id",
"All file ids should be returned.");
XMLGregorianCalendar newestTimestamp =
- originalFileIDsList.get(originalFileIDsList.size() - 1).getLastModificationTime();
+ originalFileIDsList.getLast().getLastModificationTime();
ContributorQuery query = new ContributorQuery(getPillarID(),
- null, newestTimestamp.toGregorianCalendar().getTime(), null);
+ null, newestTimestamp.toGregorianCalendar().toInstant(), null);
List limitedFileIDsList = pillarFileManager.getFileIDs(query);
Assertions.assertEquals(originalFileIDsList, limitedFileIDsList,
"Different list return when setting newest maxTimestamp");
addStep("Request file ids with MaxTimeStamp set to the timestamp of the oldest file id",
"Only file id with the timestamp equal to MaxTimeStamp are returned.");
- XMLGregorianCalendar oldestTimestamp = originalFileIDsList.get(0).getLastModificationTime();
+ XMLGregorianCalendar oldestTimestamp = originalFileIDsList.getFirst().getLastModificationTime();
query = new ContributorQuery(getPillarID(),
- null, oldestTimestamp.toGregorianCalendar().getTime(), null);
+ null, oldestTimestamp.toGregorianCalendar().toInstant(), null);
limitedFileIDsList = pillarFileManager.getFileIDs(query);
Assertions.assertFalse(limitedFileIDsList.isEmpty(),
"At least one file id with the oldest timestamp should be " +
"returned. The folliwing fileIDs where received: ");
- Assertions.assertEquals(0, limitedFileIDsList.get(0).getLastModificationTime().compare(oldestTimestamp),
+ Assertions.assertEquals(0, limitedFileIDsList.getFirst().getLastModificationTime().compare(oldestTimestamp),
"Different timestamps in the set of oldest file ids." + limitedFileIDsList);
addStep("Request file ids with MaxTimeStamp set to the timestamp of the oldest file id - 10 ms",
"No file ids are returned.");
GregorianCalendar olderThanOldestTimestamp = oldestTimestamp.toGregorianCalendar();
olderThanOldestTimestamp.add(Calendar.MILLISECOND, -10);
- query = new ContributorQuery(getPillarID(), null, olderThanOldestTimestamp.getTime(), null);
+ query = new ContributorQuery(getPillarID(), null, olderThanOldestTimestamp.toInstant(), null);
limitedFileIDsList = pillarFileManager.getFileIDs(query);
Assert.assertEmpty(limitedFileIDsList, "Non-empty list returned with olderThanOldestTimestamp(" +
CalendarUtils.getXmlGregorianCalendar(olderThanOldestTimestamp) + ") query");
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/IdentifyPillarsForGetFileIDsIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/IdentifyPillarsForGetFileIDsIT.java
index 5640c41f9..a987d8018 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/IdentifyPillarsForGetFileIDsIT.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getfileids/IdentifyPillarsForGetFileIDsIT.java
@@ -29,7 +29,7 @@
import org.bitrepository.bitrepositorymessages.MessageResponse;
import org.bitrepository.common.utils.FileIDsUtils;
import org.bitrepository.pillar.PillarTestGroups;
-import org.bitrepository.pillar.integration.func.DefaultPillarIdentificationTest;
+import org.bitrepository.pillar.integration.func.DefaultPillarIdentificationIT;
import org.bitrepository.pillar.messagefactories.GetFileIDsMessageFactory;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -39,7 +39,7 @@
import static org.bitrepository.common.utils.AllureTestUtils.addDescription;
import static org.bitrepository.common.utils.AllureTestUtils.addStep;
-class IdentifyPillarsForGetFileIDsIT extends DefaultPillarIdentificationTest {
+class IdentifyPillarsForGetFileIDsIT extends DefaultPillarIdentificationIT {
protected GetFileIDsMessageFactory msgFactory;
@BeforeEach
@@ -137,13 +137,13 @@ void allFilesTest() {
}
@Override
- protected MessageRequest createRequest() {
+ protected IdentifyPillarsForGetFileIDsRequest createRequest() {
return msgFactory.createIdentifyPillarsForGetFileIDsRequest(null);
}
@Override
- protected MessageResponse receiveResponse() {
- return clientReceiver.waitForMessage(IdentifyPillarsForGetFileIDsResponse.class);
+ protected IdentifyPillarsForGetFileIDsResponse receiveResponse(MessageRequest request) {
+ return clientReceiver.waitForMessage(IdentifyPillarsForGetFileIDsResponse.class, request.getCorrelationID());
}
@Override
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getstatus/GetStatusRequestIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getstatus/GetStatusRequestIT.java
index 2555db86e..c1ec48bf0 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getstatus/GetStatusRequestIT.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getstatus/GetStatusRequestIT.java
@@ -29,7 +29,7 @@
import org.bitrepository.bitrepositorymessages.IdentifyContributorsForGetStatusRequest;
import org.bitrepository.bitrepositorymessages.IdentifyContributorsForGetStatusResponse;
import org.bitrepository.pillar.PillarTestGroups;
-import org.bitrepository.pillar.integration.func.PillarFunctionTest;
+import org.bitrepository.pillar.integration.func.PillarFunctionIT;
import org.bitrepository.pillar.messagefactories.GetStatusMessageFactory;
import org.bitrepository.settings.referencesettings.AlarmLevel;
import org.junit.jupiter.api.Assertions;
@@ -40,7 +40,7 @@
import static org.bitrepository.common.utils.AllureTestUtils.addDescription;
import static org.bitrepository.common.utils.AllureTestUtils.addStep;
-class GetStatusRequestIT extends PillarFunctionTest {
+class GetStatusRequestIT extends PillarFunctionIT {
protected GetStatusMessageFactory msgFactory;
private String pillarDestination;
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getstatus/IdentifyContributorsForGetStatusIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getstatus/IdentifyContributorsForGetStatusIT.java
index e2a900ae7..956e3cfad 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getstatus/IdentifyContributorsForGetStatusIT.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/getstatus/IdentifyContributorsForGetStatusIT.java
@@ -26,7 +26,7 @@
import org.bitrepository.bitrepositorymessages.IdentifyContributorsForGetStatusRequest;
import org.bitrepository.bitrepositorymessages.IdentifyContributorsForGetStatusResponse;
import org.bitrepository.pillar.PillarTestGroups;
-import org.bitrepository.pillar.integration.func.PillarFunctionTest;
+import org.bitrepository.pillar.integration.func.PillarFunctionIT;
import org.bitrepository.pillar.messagefactories.GetStatusMessageFactory;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -36,7 +36,7 @@
import static org.bitrepository.common.utils.AllureTestUtils.addDescription;
import static org.bitrepository.common.utils.AllureTestUtils.addStep;
-class IdentifyContributorsForGetStatusIT extends PillarFunctionTest {
+class IdentifyContributorsForGetStatusIT extends PillarFunctionIT {
protected GetStatusMessageFactory msgFactory;
@BeforeEach
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/multicollection/MultipleCollectionIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/multicollection/MultipleCollectionIT.java
index 301130b06..d3dba9576 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/multicollection/MultipleCollectionIT.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/multicollection/MultipleCollectionIT.java
@@ -25,7 +25,7 @@
import org.bitrepository.client.exceptions.NegativeResponseException;
import org.bitrepository.common.utils.TestFileHelper;
import org.bitrepository.pillar.PillarTestGroups;
-import org.bitrepository.pillar.integration.PillarIntegrationTest;
+import org.bitrepository.pillar.integration.PillarIntegrationIT;
import org.bitrepository.protocol.bus.MessageReceiver;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Tag;
@@ -38,7 +38,7 @@
import static org.bitrepository.common.utils.AllureTestUtils.addDescription;
import static org.bitrepository.common.utils.AllureTestUtils.addStep;
-public class MultipleCollectionIT extends PillarIntegrationTest {
+public class MultipleCollectionIT extends PillarIntegrationIT {
/**
* Used for receiving responses from the pillar
*/
@@ -78,8 +78,7 @@ public void fileInOtherCollectionTest() throws Exception {
protected void registerMessageReceivers() {
super.registerMessageReceivers();
- clientReceiver = new MessageReceiver(settingsForTestClient.getReceiverDestinationID());
- addReceiver(clientReceiver);
+ clientReceiver = addReceiver(new MessageReceiver(settingsForTestClient.getReceiverDestinationID()));
Collection pillarFilter = Collections.singletonList(testConfiguration.getPillarUnderTestID());
clientReceiver.setFromFilter(pillarFilter);
diff --git a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/putfile/IdentifyPillarsForPutFileIT.java b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/putfile/IdentifyPillarsForPutFileIT.java
index 7249c4fba..5a5e311cc 100644
--- a/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/putfile/IdentifyPillarsForPutFileIT.java
+++ b/bitrepository-reference-pillar/src/test/java/org/bitrepository/pillar/integration/func/putfile/IdentifyPillarsForPutFileIT.java
@@ -27,7 +27,7 @@
import org.bitrepository.bitrepositorymessages.MessageRequest;
import org.bitrepository.bitrepositorymessages.MessageResponse;
import org.bitrepository.pillar.PillarTestGroups;
-import org.bitrepository.pillar.integration.func.DefaultPillarIdentificationTest;
+import org.bitrepository.pillar.integration.func.DefaultPillarIdentificationIT;
import org.bitrepository.pillar.messagefactories.PutFileMessageFactory;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
@@ -37,7 +37,7 @@
import static org.bitrepository.common.utils.AllureTestUtils.addDescription;
import static org.bitrepository.common.utils.AllureTestUtils.addStep;
-class IdentifyPillarsForPutFileIT extends DefaultPillarIdentificationTest {
+class IdentifyPillarsForPutFileIT extends DefaultPillarIdentificationIT {
protected PutFileMessageFactory msgFactory;
@BeforeEach
@@ -62,11 +62,11 @@ void normalIdentificationTest() {
"
'ResponseInfo.ResponseCode' element should be IDENTIFICATION_POSITIVE