diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/FilterSystemTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/FilterSystemTest.java index 998597cc7ad6964f2c4dd8802368d2a83ecd770b..e5919642600186f9e891ed51c01dd49258e4457c 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/FilterSystemTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/FilterSystemTest.java @@ -23,23 +23,15 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import javassist.bytecode.ExceptionsAttribute; - -import org.jmock.Expectations; -import org.jmock.Mockery; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.lang.StringEscapeUtils; import ch.systemsx.cisd.openbis.generic.client.web.client.dto.CustomFilterInfo; import ch.systemsx.cisd.openbis.generic.client.web.client.dto.DefaultResultSetConfig; import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ParameterWithValue; -import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ResultSet; import ch.systemsx.cisd.openbis.generic.shared.basic.IColumnDefinition; import ch.systemsx.cisd.openbis.generic.shared.basic.TechId; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.GridCustomFilter; -import ch.systemsx.cisd.openbis.generic.shared.basic.dto.GridFilterInfo; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewColumnOrFilter; /** @@ -52,26 +44,6 @@ public class FilterSystemTest extends SystemTestCase { private static final String GRID_ID = "blabla"; - private Mockery context; - - private IColumnDefinition<GridCustomFilter> columnDefinition; - - @SuppressWarnings("unchecked") - @BeforeMethod - public void setUp() - { - context = new Mockery(); - columnDefinition = context.mock(IColumnDefinition.class); - } - - @AfterMethod - public void tearDown() - { - // To following line of code should also be called at the end of each test method. - // Otherwise one does not known which test failed. - context.assertIsSatisfied(); - } - @Test public void testRegisterAndDeleteFilter() { @@ -135,8 +107,6 @@ public class FilterSystemTest extends SystemTestCase Long id = commonClientService.listFilters(GRID_ID).get(0).getId(); commonClientService.deleteFilters(Arrays.asList(new TechId(id))); - - context.assertIsSatisfied(); } private DefaultResultSetConfig<String, GridCustomFilter> createConfig(String thresholdValue)