From f2e59b9e8f149c9cdd93e730256f76a84c1d923e Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 4 Sep 2014 05:56:47 +0000
Subject: [PATCH] SSDM-802: bug fixed which prevented running
SimpleImageDropboxTest
SVN: 32405
---
.../systemtests/AbstractImageDropboxTestCase.java | 4 +---
.../screening/systemtests/MicroscopyImageDropboxTest.java | 7 +++++++
.../screening/systemtests/SimpleImageDropboxTest.java | 7 +++++++
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractImageDropboxTestCase.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractImageDropboxTestCase.java
index dd558dd27fb..97b090bb780 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractImageDropboxTestCase.java
+++ b/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();
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/MicroscopyImageDropboxTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/MicroscopyImageDropboxTest.java
index 6c1168ef180..ad3e9a3169e 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/MicroscopyImageDropboxTest.java
+++ b/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()
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/SimpleImageDropboxTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/SimpleImageDropboxTest.java
index f5ae05db0bb..7e82c70dfe4 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/SimpleImageDropboxTest.java
+++ b/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()
--
GitLab