SSDM-713: Refactoring screening system tests by moving common set ups into super class.

SVN: 32372

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

@@ -18,8 +18,21 @@ package ch.systemsx.cisd.openbis.screening.systemtests;
 
 import java.io.File;
 
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.testng.annotations.BeforeMethod;
+
+import ch.systemsx.cisd.common.servlet.SpringRequestContextProvider;
 import ch.systemsx.cisd.openbis.datastoreserver.systemtests.SystemTestCase;
 import ch.systemsx.cisd.openbis.generic.server.util.TestInitializer;
+import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
+import ch.systemsx.cisd.openbis.generic.shared.util.TestInstanceHostUtils;
+import ch.systemsx.cisd.openbis.plugin.screening.client.api.v1.IScreeningOpenbisServiceFacade;
+import ch.systemsx.cisd.openbis.plugin.screening.client.api.v1.ScreeningOpenbisServiceFacade;
+import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.IScreeningClientService;
+import ch.systemsx.cisd.openbis.plugin.screening.server.IAnalysisSettingSetter;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.IScreeningServer;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.ResourceNames;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.IScreeningApiServer;
 
 /**
  * System test case for screening. Starts both AS and DSS.
@@ -28,6 +41,34 @@ import ch.systemsx.cisd.openbis.generic.server.util.TestInitializer;
  */
 public abstract class AbstractScreeningSystemTestCase extends SystemTestCase
 {
+    protected IScreeningClientService screeningClientService;
+    protected IScreeningServer screeningServer;
+    protected IScreeningApiServer screeningApiServer;
+    protected IAnalysisSettingSetter analysisSettingServer;
+    protected String sessionToken;
+    protected IScreeningOpenbisServiceFacade screeningFacade;
+    protected ICommonServer commonServer;
+
+    @BeforeMethod
+    public void setUpServices()
+    {
+        commonServer =
+                (ICommonServer) applicationContext
+                        .getBean(ch.systemsx.cisd.openbis.generic.shared.ResourceNames.COMMON_SERVER);
+        screeningClientService =
+                (IScreeningClientService) applicationContext
+                        .getBean(ResourceNames.SCREENING_PLUGIN_SERVICE);
+        ((SpringRequestContextProvider) applicationContext.getBean("request-context-provider"))
+                .setRequest(new MockHttpServletRequest());
+        Object bean = applicationContext.getBean(ResourceNames.SCREENING_PLUGIN_SERVER);
+        screeningServer = (IScreeningServer) bean;
+        screeningApiServer = (IScreeningApiServer) bean;
+        analysisSettingServer = (IAnalysisSettingSetter) bean;
+        sessionToken = screeningClientService.tryToLogin("admin", "a").getSessionID();
+        screeningFacade =
+                ScreeningOpenbisServiceFacade.tryCreateForTest(sessionToken,
+                        TestInstanceHostUtils.getOpenBISUrl(), screeningApiServer);
+    }
 
     /**
      * Return the location of the openBIS application context config.

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

@@ -26,18 +26,14 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
 
-import org.springframework.mock.web.MockHttpServletRequest;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
-import ch.systemsx.cisd.common.servlet.SpringRequestContextProvider;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.DefaultResultSetConfig;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.GridRowModels;
 import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ResultSet;
-import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
 import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CodeAndLabel;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetType;
@@ -50,11 +46,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MaterialIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModelColumnHeader;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModelRowWithObject;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifierFactory;
-import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.IScreeningClientService;
-import ch.systemsx.cisd.openbis.plugin.screening.server.IAnalysisSettingSetter;
 import ch.systemsx.cisd.openbis.plugin.screening.server.logic.AnalysisSettings;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.IScreeningServer;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.ResourceNames;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.ExperimentFeatureVectorSummary;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.MaterialFeatureVectorSummary;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.MaterialReplicaFeatureSummary;
@@ -74,14 +66,6 @@ public class AggregatedFeatureVectorsTest extends AbstractScreeningSystemTestCas
     private static final DefaultResultSetConfig<String, TableModelRowWithObject<MaterialFeatureVectorSummary>> RESULT_SET_CONFIG =
             new DefaultResultSetConfig<String, TableModelRowWithObject<MaterialFeatureVectorSummary>>();
 
-    private MockHttpServletRequest request;
-    private String sessionToken;
-
-    private ICommonServer commonServer;
-    private IScreeningClientService screeningClientService;
-    private IScreeningServer screeningServer;
-    private IAnalysisSettingSetter analysisSettingSetter;
-
     @BeforeTest
     public void dropAnExampleDataSet() throws IOException, Exception
     {
@@ -90,28 +74,10 @@ public class AggregatedFeatureVectorsTest extends AbstractScreeningSystemTestCas
         waitUntilDataSetImported();
     }
     
-    @BeforeMethod
-    public void setUp() throws Exception
-    {
-        commonServer =
-                (ICommonServer) applicationContext
-                        .getBean(ch.systemsx.cisd.openbis.generic.shared.ResourceNames.COMMON_SERVER);
-        screeningClientService =
-                (IScreeningClientService) applicationContext
-                        .getBean(ResourceNames.SCREENING_PLUGIN_SERVICE);
-        request = new MockHttpServletRequest();
-        ((SpringRequestContextProvider) applicationContext.getBean("request-context-provider"))
-                .setRequest(request);
-        Object bean = applicationContext.getBean(ResourceNames.SCREENING_PLUGIN_SERVER);
-        screeningServer = (IScreeningServer) bean;
-        analysisSettingSetter = (IAnalysisSettingSetter) bean;
-        sessionToken = screeningClientService.tryToLogin("admin", "a").getSessionID();
-    }
-    
     @AfterMethod
     public void tearDown()
     {
-        analysisSettingSetter.setAnalysisSettings(new AnalysisSettings(new Properties()));
+        analysisSettingServer.setAnalysisSettings(new AnalysisSettings(new Properties()));
         File[] files = getIncomingDirectory().listFiles();
         for (File file : files)
         {
@@ -296,7 +262,7 @@ public class AggregatedFeatureVectorsTest extends AbstractScreeningSystemTestCas
         properties.setProperty(AnalysisSettings.KEY,
                 ScreeningConstants.DEFAULT_ANALYSIS_WELL_CONTAINER_DATASET_TYPE + ":"
                         + getClass().getSimpleName() + "-viewer");
-        analysisSettingSetter.setAnalysisSettings(new AnalysisSettings(properties));
+        analysisSettingServer.setAnalysisSettings(new AnalysisSettings(properties));
         List<DataSetType> dataSetTypes = commonServer.listDataSetTypes(sessionToken);
         for (DataSetType dataSetType : dataSetTypes)
         {

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

@@ -18,14 +18,10 @@ package ch.systemsx.cisd.openbis.screening.systemtests;
 
 import java.util.HashMap;
 
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import ch.systemsx.cisd.common.servlet.SpringRequestContextProvider;
 import ch.systemsx.cisd.openbis.plugin.query.server.api.v1.ResourceNames;
 import ch.systemsx.cisd.openbis.plugin.query.shared.api.v1.IQueryApiServer;
-import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.IScreeningClientService;
 
 /**
  * @author Chandrasekhar Ramakrishnan
@@ -34,30 +30,10 @@ import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.IScreeningCli
     { "slow", "systemtest" })
 public class AggregationServiceAggregatedFeatureVectorsTest extends AbstractScreeningSystemTestCase
 {
-    private IQueryApiServer queryApi;
-
-    private IScreeningClientService screeningClientService;
-
-    private MockHttpServletRequest request;
-
-    private String sessionToken;
-
-    @BeforeMethod
-    public void setUp() throws Exception
-    {
-        screeningClientService =
-                (IScreeningClientService) applicationContext
-                        .getBean(ch.systemsx.cisd.openbis.plugin.screening.shared.ResourceNames.SCREENING_PLUGIN_SERVICE);
-        request = new MockHttpServletRequest();
-        ((SpringRequestContextProvider) applicationContext.getBean("request-context-provider"))
-                .setRequest(request);
-        sessionToken = screeningClientService.tryToLogin("admin", "a").getSessionID();
-    }
-
     @Test
     public void testRegisteringFeatureVectors() throws Exception
     {
-        queryApi = (IQueryApiServer) applicationContext.getBean(ResourceNames.QUERY_PLUGIN_SERVER);
+        IQueryApiServer queryApi = (IQueryApiServer) applicationContext.getBean(ResourceNames.QUERY_PLUGIN_SERVER);
         queryApi.createReportFromAggregationService(sessionToken, "DSS-SCREENING",
                 "example-screening-jython-db-modifying-aggregation-service",
                 new HashMap<String, Object>());

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

@@ -24,20 +24,11 @@ import java.util.LinkedList;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-import org.springframework.mock.web.MockHttpServletRequest;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
-import ch.systemsx.cisd.common.servlet.SpringRequestContextProvider;
-import ch.systemsx.cisd.openbis.generic.shared.util.TestInstanceHostUtils;
-import ch.systemsx.cisd.openbis.plugin.screening.client.api.v1.IScreeningOpenbisServiceFacade;
-import ch.systemsx.cisd.openbis.plugin.screening.client.api.v1.ScreeningOpenbisServiceFacade;
-import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.IScreeningClientService;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.ResourceNames;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.IScreeningApiServer;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.FeatureInformation;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.FeatureVector;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.FeatureVectorDataset;
@@ -51,16 +42,6 @@ import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.Plate;
     { "slow", "systemtest" })
 public class FeatureVectorsDropboxTest extends AbstractScreeningSystemTestCase
 {
-    private MockHttpServletRequest request;
-
-    private String sessionToken;
-
-    private IScreeningClientService screeningClientService;
-
-    private IScreeningApiServer screeningServer;
-
-    private IScreeningOpenbisServiceFacade screeningFacade;
-
     @BeforeTest
     public void dropAnExampleDataSet() throws IOException, Exception
     {
@@ -69,23 +50,6 @@ public class FeatureVectorsDropboxTest extends AbstractScreeningSystemTestCase
         waitUntilDataSetImported(FINISHED_POST_REGISTRATION_CONDITION);
     }
 
-    @BeforeMethod
-    public void setUp() throws Exception
-    {
-        screeningClientService =
-                (IScreeningClientService) applicationContext
-                        .getBean(ResourceNames.SCREENING_PLUGIN_SERVICE);
-        request = new MockHttpServletRequest();
-        ((SpringRequestContextProvider) applicationContext.getBean("request-context-provider"))
-                .setRequest(request);
-        Object bean = applicationContext.getBean(ResourceNames.SCREENING_PLUGIN_SERVER);
-        screeningServer = (IScreeningApiServer) bean;
-        sessionToken = screeningClientService.tryToLogin("admin", "a").getSessionID();
-        screeningFacade =
-                ScreeningOpenbisServiceFacade.tryCreateForTest(sessionToken,
-                        TestInstanceHostUtils.getOpenBISUrl(), screeningServer);
-    }
-
     @AfterMethod
     public void tearDown()
     {

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

@@ -30,7 +30,6 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-import org.springframework.mock.web.MockHttpServletRequest;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
@@ -42,14 +41,8 @@ import com.googlecode.jsonrpc4j.ProxyUtil;
 
 import ch.systemsx.cisd.common.collection.IModifiable;
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
-import ch.systemsx.cisd.common.servlet.SpringRequestContextProvider;
 import ch.systemsx.cisd.openbis.dss.screening.shared.api.v1.IDssServiceRpcScreening;
 import ch.systemsx.cisd.openbis.generic.shared.util.TestInstanceHostUtils;
-import ch.systemsx.cisd.openbis.plugin.screening.client.api.v1.IScreeningOpenbisServiceFacade;
-import ch.systemsx.cisd.openbis.plugin.screening.client.api.v1.ScreeningOpenbisServiceFacade;
-import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.IScreeningClientService;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.ResourceNames;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.IScreeningApiServer;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.ImageDatasetReference;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.Plate;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.PlateImageReference;
@@ -65,16 +58,6 @@ public class ImageBase64EncodingTest extends AbstractScreeningSystemTestCase
     private static String IMAGE2_FILENAME = getTestDataFolder()
             + "TRANSFORMED-THUMB-PLATE/bPLATE_wA2_s1_cRGB.png";
 
-    private MockHttpServletRequest request;
-
-    private String sessionToken;
-
-    private IScreeningClientService screeningClientService;
-
-    private IScreeningApiServer screeningServer;
-
-    private IScreeningOpenbisServiceFacade screeningFacade;
-
     private IDssServiceRpcScreening screeningJsonApi;
 
     @BeforeTest
@@ -88,19 +71,6 @@ public class ImageBase64EncodingTest extends AbstractScreeningSystemTestCase
     @BeforeMethod
     public void setUp() throws Exception
     {
-        screeningClientService =
-                (IScreeningClientService) applicationContext
-                        .getBean(ResourceNames.SCREENING_PLUGIN_SERVICE);
-        request = new MockHttpServletRequest();
-        ((SpringRequestContextProvider) applicationContext.getBean("request-context-provider"))
-                .setRequest(request);
-        Object bean = applicationContext.getBean(ResourceNames.SCREENING_PLUGIN_SERVER);
-        screeningServer = (IScreeningApiServer) bean;
-        sessionToken = screeningClientService.tryToLogin("admin", "a").getSessionID();
-        screeningFacade =
-                ScreeningOpenbisServiceFacade.tryCreateForTest(sessionToken,
-                        TestInstanceHostUtils.getOpenBISUrl(), screeningServer);
-
         JsonRpcHttpClient client =
                 new JsonRpcHttpClient(new URL(TestInstanceHostUtils.getDSSUrl()
                         + "/rmi-datastore-server-screening-api-v1.json/"));
@@ -190,7 +160,7 @@ public class ImageBase64EncodingTest extends AbstractScreeningSystemTestCase
     @Override
     protected int dataSetImportWaitDurationInSeconds()
     {
-        return 600;
+        return 60;
     }
 
     private static class PlateImageReferenceList extends ArrayList<PlateImageReference> implements

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

@@ -22,23 +22,16 @@ import java.util.Collections;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-import org.springframework.mock.web.MockHttpServletRequest;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
-import ch.systemsx.cisd.common.servlet.SpringRequestContextProvider;
-import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
 import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Experiment;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ListSampleCriteria;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifierFactory;
-import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.IScreeningClientService;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.IScreeningServer;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.ResourceNames;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.DatasetImagesReference;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.ImageDatasetEnrichedReference;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.ImageResolution;
@@ -54,13 +47,6 @@ import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateMetadata;
     { "slow", "systemtest" })
 public class MiscellaneousDropBoxApiV2FeaturesTest extends AbstractScreeningSystemTestCase
 {
-    private MockHttpServletRequest request;
-    private String sessionToken;
-
-    private ICommonServer commonServer;
-    private IScreeningClientService screeningClientService;
-    private IScreeningServer screeningServer;
-
     @BeforeTest
     public void dropAnExampleDataSet() throws IOException, Exception
     {
@@ -69,23 +55,6 @@ public class MiscellaneousDropBoxApiV2FeaturesTest extends AbstractScreeningSyst
         waitUntilDataSetImported();
     }
 
-    @BeforeMethod
-    public void setUp() throws Exception
-    {
-        commonServer =
-                (ICommonServer) applicationContext
-                        .getBean(ch.systemsx.cisd.openbis.generic.shared.ResourceNames.COMMON_SERVER);
-        screeningClientService =
-                (IScreeningClientService) applicationContext
-                        .getBean(ResourceNames.SCREENING_PLUGIN_SERVICE);
-        request = new MockHttpServletRequest();
-        ((SpringRequestContextProvider) applicationContext.getBean("request-context-provider"))
-                .setRequest(request);
-        Object bean = applicationContext.getBean(ResourceNames.SCREENING_PLUGIN_SERVER);
-        screeningServer = (IScreeningServer) bean;
-        sessionToken = screeningClientService.tryToLogin("admin", "a").getSessionID();
-    }
-    
     @AfterMethod
     public void tearDown()
     {

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

@@ -30,11 +30,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSamplesWithTypes;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Person;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy.RoleCode;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Space;
-import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.DatabaseInstanceIdentifier;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.IScreeningServer;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.ResourceNames;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.IScreeningApiServer;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.ExperimentIdentifier;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.NewLibrary;
 
@@ -47,40 +43,31 @@ public class ScreeningServerAuthorizationTest extends AbstractScreeningSystemTes
 
     private static final String SPACE_CODE = "CISD";
 
-    private ICommonServerForInternalUse commonServer;
-
-    private IScreeningServer screeningServer;
-
-    private IScreeningApiServer screeningApiServer;
 
     private String userSessionToken;
 
     @BeforeMethod
     public void setUp()
     {
-        commonServer =
+        ICommonServerForInternalUse commonServerInternal =
                 (ICommonServerForInternalUse) applicationContext
                         .getBean(ch.systemsx.cisd.openbis.generic.shared.ResourceNames.COMMON_SERVER);
-        Object serverBean = applicationContext
-                .getBean(ResourceNames.SCREENING_PLUGIN_SERVER);
-        screeningServer = (IScreeningServer) serverBean;
-        screeningApiServer = (IScreeningApiServer) serverBean;
-        String sessionToken = commonServer.tryToAuthenticateAsSystem().getSessionToken();
-        if (hasSpace(sessionToken, SPACE_CODE) == false)
+        String systemSessionToken = commonServerInternal.tryToAuthenticateAsSystem().getSessionToken();
+        if (hasSpace(systemSessionToken, SPACE_CODE) == false)
         {
-            commonServer.registerSpace(sessionToken, SPACE_CODE, null);
+            commonServerInternal.registerSpace(systemSessionToken, SPACE_CODE, null);
         }
-        if (hasPerson(sessionToken, TEST_USER) == false)
+        if (hasPerson(systemSessionToken, TEST_USER) == false)
         {
-            commonServer.registerPerson(sessionToken, TEST_USER);
+            commonServerInternal.registerPerson(systemSessionToken, TEST_USER);
             Grantee grantee = Grantee.createPerson(TEST_USER);
-            commonServer.registerSpaceRole(sessionToken, RoleCode.OBSERVER, new SpaceIdentifier(
+            commonServerInternal.registerSpaceRole(systemSessionToken, RoleCode.OBSERVER, new SpaceIdentifier(
                     SPACE_CODE), grantee);
         }
-        userSessionToken = commonServer.tryAuthenticate(TEST_USER, "abc").getSessionToken();
+        userSessionToken = commonServerInternal.tryAuthenticate(TEST_USER, "abc").getSessionToken();
     }
 
-    private boolean hasSpace(String sessionToken, String spaceCode)
+    private boolean hasSpace(String systemSessionToken, String spaceCode)
     {
         List<Space> spaces =
                 commonServer.listSpaces(sessionToken);
@@ -94,7 +81,7 @@ public class ScreeningServerAuthorizationTest extends AbstractScreeningSystemTes
         return false;
     }
 
-    private boolean hasPerson(String sessionToken, String personID)
+    private boolean hasPerson(String systemSessionToken, String personID)
     {
         List<Person> persons = commonServer.listPersons(sessionToken);
         for (Person person : persons)

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

@@ -28,7 +28,6 @@ import java.util.List;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.springframework.mock.web.MockHttpServletRequest;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeTest;
@@ -38,16 +37,10 @@ import com.googlecode.jsonrpc4j.JsonRpcHttpClient;
 import com.googlecode.jsonrpc4j.ProxyUtil;
 
 import ch.systemsx.cisd.common.filesystem.FileUtilities;
-import ch.systemsx.cisd.common.servlet.SpringRequestContextProvider;
 import ch.systemsx.cisd.openbis.dss.client.api.v1.IDataSetDss;
 import ch.systemsx.cisd.openbis.dss.screening.shared.api.v1.IDssServiceRpcScreening;
 import ch.systemsx.cisd.openbis.generic.shared.util.TestInstanceHostUtils;
 import ch.systemsx.cisd.openbis.plugin.screening.client.api.v1.IPlateImageHandler;
-import ch.systemsx.cisd.openbis.plugin.screening.client.api.v1.IScreeningOpenbisServiceFacade;
-import ch.systemsx.cisd.openbis.plugin.screening.client.api.v1.ScreeningOpenbisServiceFacade;
-import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.IScreeningClientService;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.ResourceNames;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.IScreeningApiServer;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.DatasetImageRepresentationFormats;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.ImageDatasetReference;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.ImageRepresentationFormat;
@@ -63,16 +56,6 @@ import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.json.ScreeningObj
 { "slow", "systemtest" })
 public class TransformedImageRepresentationsTest extends AbstractScreeningSystemTestCase
 {
-    private MockHttpServletRequest request;
-
-    private String sessionToken;
-
-    private IScreeningClientService screeningClientService;
-
-    private IScreeningApiServer screeningServer;
-
-    private IScreeningOpenbisServiceFacade screeningFacade;
-
     private IDssServiceRpcScreening screeningJsonApi;
 
     @BeforeTest
@@ -86,19 +69,6 @@ public class TransformedImageRepresentationsTest extends AbstractScreeningSystem
     @BeforeMethod
     public void setUp() throws Exception
     {
-        screeningClientService =
-                (IScreeningClientService) applicationContext
-                        .getBean(ResourceNames.SCREENING_PLUGIN_SERVICE);
-        request = new MockHttpServletRequest();
-        ((SpringRequestContextProvider) applicationContext.getBean("request-context-provider"))
-                .setRequest(request);
-        Object bean = applicationContext.getBean(ResourceNames.SCREENING_PLUGIN_SERVER);
-        screeningServer = (IScreeningApiServer) bean;
-        sessionToken = screeningClientService.tryToLogin("admin", "a").getSessionID();
-        screeningFacade =
-                ScreeningOpenbisServiceFacade.tryCreateForTest(sessionToken,
-                        TestInstanceHostUtils.getOpenBISUrl(), screeningServer);
-
         JsonRpcHttpClient client =
                 new JsonRpcHttpClient(new ScreeningObjectMapper(), new URL(
                         TestInstanceHostUtils.getDSSUrl()
@@ -247,7 +217,7 @@ public class TransformedImageRepresentationsTest extends AbstractScreeningSystem
     @Override
     protected int dataSetImportWaitDurationInSeconds()
     {
-        return 6000;
+        return 60;
     }
 
 }