SSDM-802: bug fixed which prevented running SimpleImageDropboxTest

SVN: 32405

screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractImageDropboxTestCase.java

@@ -25,7 +25,6 @@ import java.util.List;
 import org.apache.commons.io.FileUtils;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetKind;
@@ -51,8 +50,7 @@ public abstract class AbstractImageDropboxTestCase extends AbstractScreeningSyst
 
     protected ImageChecker imageChecker;
 
-    @BeforeTest
-    public void dropAnExampleDataSet() throws Exception
+    protected void dropAnExampleDataSet() throws Exception
     {
         registerAdditionalOpenbisMetaData();
         File exampleDataSet = createTestDataContents();

screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/MicroscopyImageDropboxTest.java

@@ -19,6 +19,7 @@ package ch.systemsx.cisd.openbis.screening.systemtests;
 import java.io.File;
 import java.util.Collections;
 
+import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
@@ -36,6 +37,12 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifierF
 @Test(groups = { "slow", "systemtest" })
 public class MicroscopyImageDropboxTest extends AbstractImageDropboxTestCase
 {
+    @Override
+    @BeforeTest
+    public void dropAnExampleDataSet() throws Exception
+    {
+        super.dropAnExampleDataSet();
+    }
 
     @Override
     protected void registerAdditionalOpenbisMetaData()

screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/SimpleImageDropboxTest.java

@@ -18,6 +18,7 @@ package ch.systemsx.cisd.openbis.screening.systemtests;
 
 import java.io.File;
 
+import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData;
@@ -30,6 +31,12 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData;
 @Test(groups = { "slow", "systemtest" })
 public class SimpleImageDropboxTest extends AbstractImageDropboxTestCase
 {
+    @Override
+    @BeforeTest
+    public void dropAnExampleDataSet() throws Exception
+    {
+        super.dropAnExampleDataSet();
+    }
 
     @Override
     protected String getDataFolderToDrop()