From d5a65e2c047e0588539d87fc25e34bb252c80f6a Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Thu, 28 Jun 2012 12:41:18 +0000
Subject: [PATCH] SP-169 BIS-90 merge two test methods into one (fix problem
with tests interference)
SVN: 25937
---
.../LinkDataSetImportSystemTest.java | 25 +++++++------------
1 file changed, 9 insertions(+), 16 deletions(-)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/LinkDataSetImportSystemTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/LinkDataSetImportSystemTest.java
index c68ce70d058..44df81dfaf2 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/LinkDataSetImportSystemTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/LinkDataSetImportSystemTest.java
@@ -53,20 +53,6 @@ public class LinkDataSetImportSystemTest extends SystemTestCase
private HashSet<String> preexistingDataSetCodes;
- /**
- * The testcase that just imports the data. Other tests can depend on it, and assert stuff.
- */
- @Test
- public void testImportLinkDataSet() throws Exception
- {
- preparePreexistingDataSetCodes();
-
- File exampleDataSet = new File(workingDirectory, "my-data");
- createExampleDataSet(exampleDataSet);
- moveFileToIncoming(exampleDataSet);
- waitUntilDataSetImported();
- }
-
private void preparePreexistingDataSetCodes()
{
preexistingDataSetCodes = new HashSet<String>();
@@ -103,9 +89,16 @@ public class LinkDataSetImportSystemTest extends SystemTestCase
return dataSets;
}
- @Test(dependsOnMethods = "testImportLinkDataSet")
- public void checkLinkDataSetIsImported()
+ @Test
+ public void checkLinkDataSetIsImported() throws Exception
{
+ preparePreexistingDataSetCodes();
+
+ File exampleDataSet = new File(workingDirectory, "my-data");
+ createExampleDataSet(exampleDataSet);
+ moveFileToIncoming(exampleDataSet);
+ waitUntilDataSetImported();
+
IEncapsulatedOpenBISService openBISService = ServiceProvider.getOpenBISService();
List<String> codes = newDataSetCodes();
--
GitLab