From 2948e7d0b34c5c68ca0ea3eb8f1ccd4d3b434a14 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Mon, 29 Sep 2014 11:50:21 +0000
Subject: [PATCH] SSDM-911 update tests
SVN: 32518
---
datastore_server/.gitignore | 2 ++
.../plugins/standard/AbstractPackageArchiverTest.java | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/datastore_server/.gitignore b/datastore_server/.gitignore
index 1ce981cd993..ce6bb5a3d8e 100644
--- a/datastore_server/.gitignore
+++ b/datastore_server/.gitignore
@@ -14,3 +14,5 @@
.DS_Store
/.activity
sourceTest/java/ch/systemsx/cisd/etlserver/plugins/LastSeenDataSetFileContentTestResources/writeLastSeenFile
+.classpath
+.project
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractPackageArchiverTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractPackageArchiverTest.java
index 4e648e1beca..323be02a8e9 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractPackageArchiverTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractPackageArchiverTest.java
@@ -206,7 +206,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa
ProcessingStatus processingStatus = archiver.archive(Arrays.asList(dsd1), archiverTaskContext, false);
File archivedDataSetFile = new File(archive, ds1.getDataSetCode() + getPackageExtension());
- AssertionUtil.assertContainsLines("INFO OPERATION.IdentifierAttributeMappingManager - Mapping file '" + mappingFile
+ AssertionUtil.assertContainsLinesInAnyOrder("INFO OPERATION.IdentifierAttributeMappingManager - Mapping file '" + mappingFile
+ "' successfully loaded.\n"
+ "INFO OPERATION.AbstractDatastorePlugin - "
+ "Archiving of the following datasets has been requested: [Dataset 'ds1']\n"
@@ -673,7 +673,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa
ProcessingStatus processingStatus2 = archiver.deleteFromArchive(Arrays.asList(
new DatasetLocation(ds1.getCode(), ds1.getLocation(), DATA_STORE_CODE, "")));
- AssertionUtil.assertContainsLines("INFO OPERATION.IdentifierAttributeMappingManager - Mapping file '" + mappingFile
+ AssertionUtil.assertContainsLinesInAnyOrder("INFO OPERATION.IdentifierAttributeMappingManager - Mapping file '" + mappingFile
+ "' successfully loaded.\n"
+ "INFO OPERATION.AbstractDatastorePlugin - "
+ "Archiving of the following datasets has been requested: [Dataset 'ds1']\n"
@@ -789,7 +789,7 @@ public abstract class AbstractPackageArchiverTest extends AbstractArchiverTestCa
File archivedDataSetFile = new File(archive, LOCATION + "/" + ds1.getDataSetCode() + getPackageExtension());
String logContent = logRecorder.getLogContent().replaceFirst("in all shares in .*s", "in all shares in ? s");
- AssertionUtil.assertContainsLines("INFO OPERATION.IdentifierAttributeMappingManager - Mapping file '" + mappingFile
+ AssertionUtil.assertContainsLinesInAnyOrder("INFO OPERATION.IdentifierAttributeMappingManager - Mapping file '" + mappingFile
+ "' successfully loaded.\n"
+ "INFO OPERATION.AbstractDatastorePlugin - "
+ "Archiving of the following datasets has been requested: [Dataset 'ds1']\n"
--
GitLab