BIS-51 / SP-139: Cleaning up tests

SVN: 25942

openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/EntityRelationshipChangeTest.java

@@ -42,8 +42,6 @@ import ch.systemsx.cisd.openbis.systemtest.base.BaseTest;
  * 
  * @author anttil
  */
-@Test(groups =
-    { "system-cleandb", "basic" })
 public class EntityRelationshipChangeTest extends BaseTest
 {
 
@@ -363,5 +361,4 @@ public class EntityRelationshipChangeTest extends BaseTest
 
         commonServer.updateSample(session, updates);
     }
-
 }

openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/RelationshipServiceAuthorizationTest.java

@@ -38,8 +38,6 @@ import ch.systemsx.cisd.openbis.systemtest.base.BaseTest;
 /**
  * @author anttil
  */
-@Test(groups =
-    { "system-cleandb", "stub-relationship-service" })
 @ContextConfiguration(locations =
     { "classpath:stub_relationship_service.xml" }, inheritLocations = true)
 public class RelationshipServiceAuthorizationTest extends BaseTest

openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/SystemTestCase.java

@@ -27,14 +27,12 @@ import java.util.List;
 import javax.servlet.http.HttpSession;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTransactionalTestNGSpringContextTests;
 import org.springframework.test.context.transaction.TransactionConfiguration;
 import org.testng.AssertJUnit;
-import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeSuite;
 
@@ -95,13 +93,6 @@ public abstract class SystemTestCase extends AbstractTransactionalTestNGSpringCo
         TestInitializer.init();
     }
 
-    @AfterTest()
-    public void testingThis()
-    {
-        System.out.println("!!!!!!!! AFTER TEST RUN - DESTROYING - IN SYSTEMTESTCASE!!!");
-        ((GenericApplicationContext) applicationContext).destroy();
-    }
-
     @BeforeClass
     public void loginAsSystem()
     {

openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/BaseTest.java

@@ -28,6 +28,7 @@ import org.springframework.test.context.transaction.TransactionConfiguration;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.authentication.ISessionManager;
 import ch.systemsx.cisd.common.logging.LogInitializer;
@@ -62,6 +63,8 @@ import ch.systemsx.cisd.openbis.plugin.generic.shared.IGenericServer;
  */
 @ContextConfiguration(locations = "classpath:applicationContext.xml")
 @TransactionConfiguration(transactionManager = "transaction-manager")
+@Test(groups =
+    { "system-cleandb" })
 public abstract class BaseTest extends AbstractTransactionalTestNGSpringContextTests
 {
 
@@ -133,7 +136,6 @@ public abstract class BaseTest extends AbstractTransactionalTestNGSpringContextT
         { "system-cleandb" })
     public void testingThis()
     {
-        System.out.println("!!!!!!!! AFTER TEST RUN - DESTROYING!!!");
         ((GenericApplicationContext) applicationContext).destroy();
     }
 
@@ -144,6 +146,7 @@ public abstract class BaseTest extends AbstractTransactionalTestNGSpringContextT
     }
 
     @Autowired
+    @Test(enabled = false)
     public final void setRequestContextProvider(final SpringRequestContextProvider contextProvider)
     {
         request = new MockHttpServletRequest();
@@ -151,49 +154,56 @@ public abstract class BaseTest extends AbstractTransactionalTestNGSpringContextT
     }
 
     @Autowired
+    @Test(enabled = false)
     public void setDaoFactory(IDAOFactory daoFactory)
     {
         this.daoFactory = daoFactory;
     }
 
     @Autowired
+    @Test(enabled = false)
     public final void setCommonServer(final ICommonServerForInternalUse commonServer)
     {
         this.commonServer = commonServer;
     }
 
     @Autowired
+    @Test(enabled = false)
     public final void setGenericServer(final IGenericServer genericServer)
     {
         this.genericServer = genericServer;
     }
 
     @Autowired
+    @Test(enabled = false)
     public final void setCommonClientService(final ICommonClientService commonClientService)
     {
         this.commonClientService = commonClientService;
     }
 
     @Autowired
+    @Test(enabled = false)
     public final void setGenericClientService(final IGenericClientService genericClientService)
     {
         this.genericClientService = genericClientService;
     }
 
     @Autowired
+    @Test(enabled = false)
     public void setETLService(IETLLIMSService etlService)
     {
         this.etlService = etlService;
-
     }
 
     @Autowired
+    @Test(enabled = false)
     public void setRelationshipService(final IRelationshipService relationshipService)
     {
         this.relationshipService = relationshipService;
     }
 
     @Autowired
+    @Test(enabled = false)
     public void setSessionManager(final ISessionManager<Session> sessionManager)
     {
         this.sessionManager = sessionManager;

openbis/sourceTest/java/tests_system_cleandb.xml

@@ -11,20 +11,6 @@
     </classes>
   </test>
 
-  <!--  test name="system-cleandb-basic" annotations="JDK">
-     <method-selectors>
-       <method-selector>
-         <script language="beanshell"><![CDATA[
-           groups.containsKey("system-cleandb") && groups.containsKey("basic")
-          ]]></script>
-        </method-selector>
-      </method-selectors>
-  
-    <packages>
-      <package name="ch.systemsx.cisd.openbis.*" />
-    </packages>
-  </test -->
-
   <test name="system-cleandb-stub-relationship-service" annotations="JDK">
     <classes>
       <class name="ch.systemsx.cisd.openbis.systemtest.RelationshipServiceAuthorizationTest" />