diff --git a/gradoop-store/gradoop-hbase/gradoop-hbase-integration-testng.xml b/gradoop-store/gradoop-hbase/gradoop-hbase-integration-testng.xml new file mode 100644 index 000000000000..76606badc2a9 --- /dev/null +++ b/gradoop-store/gradoop-hbase/gradoop-hbase-integration-testng.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/gradoop-store/gradoop-hbase/gradoop-hbase-unit-testng.xml b/gradoop-store/gradoop-hbase/gradoop-hbase-unit-testng.xml new file mode 100644 index 000000000000..0917fbb96f69 --- /dev/null +++ b/gradoop-store/gradoop-hbase/gradoop-hbase-unit-testng.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/gradoop-store/gradoop-hbase/pom.xml b/gradoop-store/gradoop-hbase/pom.xml index 46a347a8f011..75b49c07fcdd 100644 --- a/gradoop-store/gradoop-hbase/pom.xml +++ b/gradoop-store/gradoop-hbase/pom.xml @@ -70,7 +70,7 @@ maven-surefire-plugin - gradoop-hbase-testng.xml + gradoop-hbase-unit-testng.xml diff --git a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/GradoopHBaseTestBase.java b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/GradoopHBaseTestBase.java index 0fc555e6c074..3b6e42a4b003 100644 --- a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/GradoopHBaseTestBase.java +++ b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/GradoopHBaseTestBase.java @@ -75,7 +75,7 @@ public class GradoopHBaseTestBase { * * @throws Exception if setting up HBase test cluster fails */ - @BeforeSuite + @BeforeSuite(groups = {"integration"}) public static void setUpHBase() throws Exception { if (utility == null) { utility = new HBaseTestingUtility(HBaseConfiguration.create()); @@ -88,7 +88,7 @@ public static void setUpHBase() throws Exception { * * @throws Exception if closing HBase test cluster fails */ - @AfterSuite + @AfterSuite(groups = {"integration"}) public static void tearDownHBase() throws Exception { if (utility != null) { utility.shutdownMiniCluster(); diff --git a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/HBaseEPGMStoreTest.java b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/HBaseEPGMStoreTest.java index 3c89ab35afe3..9df6af1caa5a 100644 --- a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/HBaseEPGMStoreTest.java +++ b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/HBaseEPGMStoreTest.java @@ -55,7 +55,7 @@ public class HBaseEPGMStoreTest extends GradoopHBaseTestBase { * * @throws IOException on failure */ - @Test + @Test(groups = {"integration"}) public void writeCloseOpenReadTest() throws IOException { HBaseEPGMStore graphStore = createEmptyEPGMStore(); @@ -86,7 +86,7 @@ public void writeCloseOpenReadTest() throws IOException { * * @throws IOException on failure */ - @Test + @Test(groups = {"integration"}) public void writeCloseOpenReadTestWithPrefix() throws IOException { String prefix = "test."; HBaseEPGMStore graphStore = createEmptyEPGMStore(prefix); @@ -118,7 +118,7 @@ public void writeCloseOpenReadTestWithPrefix() throws IOException { * * @throws IOException on failure */ - @Test + @Test(groups = {"integration"}) public void writeFlushReadTest() throws IOException { HBaseEPGMStore graphStore = createEmptyEPGMStore(); graphStore.setAutoFlush(false); @@ -150,7 +150,7 @@ public void writeFlushReadTest() throws IOException { * * @throws IOException if read to or write from store fails */ - @Test + @Test(groups = "integration") public void iteratorTest() throws IOException { HBaseEPGMStore graphStore = createEmptyEPGMStore(); @@ -203,7 +203,7 @@ public void iteratorTest() throws IOException { * * @throws IOException on failure */ - @Test(expectedExceptions = UnsupportedTypeException.class) + @Test(expectedExceptions = UnsupportedTypeException.class, groups = {"integration"}) public void wrongPropertyTypeTest() throws IOException { HBaseEPGMStore graphStore = createEmptyEPGMStore(); @@ -229,7 +229,7 @@ public void wrongPropertyTypeTest() throws IOException { * * @throws IOException on failure */ - @Test + @Test(groups = {"integration"}) public void propertyTypeTest() throws IOException { HBaseEPGMStore graphStore = createEmptyEPGMStore(); @@ -328,7 +328,7 @@ public void propertyTypeTest() throws IOException { /** * Test the truncate tables functionality. */ - @Test + @Test(groups = {"integration"}) public void truncateTablesTest() throws IOException { HBaseEPGMStore store = createEmptyEPGMStore("truncateTest"); AsciiGraphLoader loader = getMinimalFullFeaturedGraphLoader(); diff --git a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/HBaseGraphStoreTest.java b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/HBaseGraphStoreTest.java index 09b47faa5e07..58131cd4b86b 100644 --- a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/HBaseGraphStoreTest.java +++ b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/HBaseGraphStoreTest.java @@ -60,7 +60,7 @@ public class HBaseGraphStoreTest extends GradoopHBaseTestBase { * * @throws IOException on failure */ - @BeforeClass + @BeforeClass(groups = {"integration"}) public static void setUp() throws IOException { epgmStores = new HBaseEPGMStore[3]; @@ -83,7 +83,7 @@ public static void setUp() throws IOException { * * @throws IOException on failure */ - @AfterClass + @AfterClass(groups = {"integration"}) public static void tearDown() throws IOException { for (HBaseEPGMStore store : epgmStores) { if (store != null) { @@ -106,7 +106,7 @@ public static Object[][] storeIndexProvider() { /** * Test, whether the store uses the correct region splitting. */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testConfig(int storeIndex) { switch (storeIndex) { case 1: @@ -128,7 +128,7 @@ public void testConfig(int storeIndex) { * * @throws IOException on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testGetGraphSpaceWithIdPredicate(int storeIndex) throws IOException { // Fetch all graph heads from gdl file List graphHeads = Lists.newArrayList(getSocialGraphHeads()); @@ -153,7 +153,7 @@ public void testGetGraphSpaceWithIdPredicate(int storeIndex) throws IOException * * @throws IOException on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = "integration") public void testGetGraphSpaceWithoutIdPredicate(int storeIndex) throws IOException { // Fetch all graph heads from gdl file List graphHeads = Lists.newArrayList(getSocialGraphHeads()); @@ -172,7 +172,7 @@ public void testGetGraphSpaceWithoutIdPredicate(int storeIndex) throws IOExcepti * * @throws IOException on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testGetVertexSpaceWithIdPredicate(int storeIndex) throws IOException { // Fetch all vertices from gdl file List vertices = Lists.newArrayList(getSocialVertices()); @@ -198,7 +198,7 @@ public void testGetVertexSpaceWithIdPredicate(int storeIndex) throws IOException * * @throws IOException on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testGetVertexSpaceWithoutIdPredicate(int storeIndex) throws IOException { // Fetch all vertices from gdl file List vertices = Lists.newArrayList(getSocialVertices()); @@ -217,7 +217,7 @@ public void testGetVertexSpaceWithoutIdPredicate(int storeIndex) throws IOExcept * * @throws IOException on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testGetEdgeSpaceWithIdPredicate(int storeIndex) throws IOException { // Fetch all edges from gdl file List edges = Lists.newArrayList(getSocialEdges()); @@ -242,7 +242,7 @@ public void testGetEdgeSpaceWithIdPredicate(int storeIndex) throws IOException { * * @throws IOException on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testGetEdgeSpaceWithoutIdPredicate(int storeIndex) throws IOException { // Fetch all edges from gdl file List edges = Lists.newArrayList(getSocialEdges()); @@ -262,7 +262,7 @@ public void testGetEdgeSpaceWithoutIdPredicate(int storeIndex) throws IOExceptio * * @throws IOException on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testGetElementSpaceWithLabelInPredicate(int storeIndex) throws IOException { // Extract parts of social graph to filter for List graphHeads = Lists.newArrayList(getSocialGraphHeads()) @@ -311,7 +311,7 @@ public void testGetElementSpaceWithLabelInPredicate(int storeIndex) throws IOExc * * @throws IOException on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testGetElementSpaceWithLabelRegPredicate(int storeIndex) throws IOException { // Extract parts of social graph to filter for List graphHeads = Lists.newArrayList(getSocialGraphHeads()) @@ -359,7 +359,7 @@ public void testGetElementSpaceWithLabelRegPredicate(int storeIndex) throws IOEx * * @throws IOException on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = "integration") public void testGetElementSpaceWithPropEqualsPredicate(int storeIndex) throws IOException { // Create the expected graph elements PropertyValue propertyValueVertexCount = PropertyValue.create(3); @@ -415,7 +415,7 @@ public void testGetElementSpaceWithPropEqualsPredicate(int storeIndex) throws IO * * @throws IOException on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testGetElementSpaceWithPropLargerThanPredicate(int storeIndex) throws IOException { // Create the expected graph elements PropertyValue propertyValueVertexCount = PropertyValue.create(3); @@ -475,7 +475,7 @@ public void testGetElementSpaceWithPropLargerThanPredicate(int storeIndex) throw * * @throws IOException on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testGetElementSpaceWithPropRegPredicate(int storeIndex) throws IOException { // Extract parts of social graph to filter for List graphHeads = Lists.newArrayList(getSocialGraphHeads()) @@ -533,7 +533,7 @@ public void testGetElementSpaceWithPropRegPredicate(int storeIndex) throws IOExc * * @throws IOException on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testGetElementSpaceWithChainedPredicates(int storeIndex) throws IOException { // Extract parts of social graph to filter for List graphHeads = getSocialGraphHeads() diff --git a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBaseLabelInTest.java b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBaseLabelInTest.java index afde712a2458..93d90db1aeac 100644 --- a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBaseLabelInTest.java +++ b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBaseLabelInTest.java @@ -37,7 +37,7 @@ public class HBaseLabelInTest { /** * Test the toHBaseFilter function */ - @Test + @Test(groups = {"unit"}) public void testToHBaseFilter() { String testLabel1 = "test1"; String testLabel2 = "test2"; diff --git a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBaseLabelRegTest.java b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBaseLabelRegTest.java index e39238d5a61c..d9791ecaf75b 100644 --- a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBaseLabelRegTest.java +++ b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBaseLabelRegTest.java @@ -37,7 +37,7 @@ public class HBaseLabelRegTest { /** * Test the toHBaseFilter function */ - @Test + @Test(groups = {"unit"}) public void testToHBaseFilter() { HBaseLabelReg vertexFilter = new HBaseLabelReg<>(PATTERN_VERTEX); diff --git a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropEqualsTest.java b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropEqualsTest.java index 934c27382214..b62672ce9b24 100644 --- a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropEqualsTest.java +++ b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropEqualsTest.java @@ -43,7 +43,7 @@ public class HBasePropEqualsTest { /** * Test the toHBaseFilter function */ - @Test(dataProvider = "property values") + @Test(dataProvider = "property values", groups = {"unit"}) public void testToHBaseFilter(String propertyKey, Object value) { PropertyValue propertyValue = PropertyValue.create(value); diff --git a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropLargerThanTest.java b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropLargerThanTest.java index 2ff12843af6d..9cf7d0a4b58b 100644 --- a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropLargerThanTest.java +++ b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropLargerThanTest.java @@ -40,7 +40,7 @@ public class HBasePropLargerThanTest { /** * Test the toHBaseFilter function */ - @Test(dataProvider = "property values") + @Test(dataProvider = "property values", groups = {"unit"}) public void testToHBaseFilter(String propertyKey, Object value, boolean isInclude) { PropertyValue propertyValue = PropertyValue.create(value); diff --git a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropRegTest.java b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropRegTest.java index bb3ab615fa64..21ef16d59969 100644 --- a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropRegTest.java +++ b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/predicate/filter/impl/HBasePropRegTest.java @@ -34,11 +34,12 @@ /** * Test class for {@link HBasePropReg} */ +@Test(groups = "unit") public class HBasePropRegTest { /** * Test the toHBaseFilter function */ - @Test + @Test(groups = {"unit"}) public void testToHBaseFilter() { String key = "key"; Pattern pattern = Pattern.compile("^FooBar.*$");