From 2b59dbf0d43774d240611b38ae55f64002ac6b8b Mon Sep 17 00:00:00 2001 From: Lucas Schons Date: Tue, 26 Nov 2019 14:11:15 +0100 Subject: [PATCH 1/5] [#1452] Add junit test category 'IntegrationTests' Adds a new interface 'IntegrationTests' to gradoop-accumulo. This interface is used to categorize every test class in the module. The category is excluded from surefire execution. --- gradoop-store/gradoop-accumulo/pom.xml | 1 + .../impl/accumulo/AccumuloStoreTestBase.java | 5 +---- .../impl/accumulo/IntegrationTests.java | 19 +++++++++++++++++++ .../impl/accumulo/basic/StoreTest.java | 3 +++ .../storage/impl/accumulo/io/IOBasicTest.java | 3 +++ .../io/source/IOEdgePredicateTest.java | 3 +++ .../io/source/IOElementIdRangeTest.java | 3 +++ .../io/source/IOGraphPredicateTest.java | 3 +++ .../io/source/IOVertexPredicateTest.java | 3 +++ .../predicate/StoreBasicPredicateTest.java | 3 +++ .../predicate/StoreIdsPredicateTest.java | 3 +++ .../predicate/StoreLabelPredicateTest.java | 3 +++ .../predicate/StorePropPredicateTest.java | 3 +++ 13 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/IntegrationTests.java diff --git a/gradoop-store/gradoop-accumulo/pom.xml b/gradoop-store/gradoop-accumulo/pom.xml index adb668a9fce4..6727962a9877 100644 --- a/gradoop-store/gradoop-accumulo/pom.xml +++ b/gradoop-store/gradoop-accumulo/pom.xml @@ -76,6 +76,7 @@ ${accumuloTestSuite} + org.gradoop.storage.impl.accumulo.IntegrationTests diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/AccumuloStoreTestBase.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/AccumuloStoreTestBase.java index 19fb00406f3c..982180705a08 100644 --- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/AccumuloStoreTestBase.java +++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/AccumuloStoreTestBase.java @@ -38,10 +38,7 @@ public class AccumuloStoreTestBase extends GradoopFlinkTestBase { * @param context loader context * @throws Throwable if error */ - protected void doTest( - String namespace, - SocialTestContext context - ) throws Throwable { + protected void doTest(String namespace, SocialTestContext context) throws Throwable { GradoopAccumuloConfig config = AccumuloTestSuite.getAcConfig(namespace); AccumuloEPGMStore graphStore = new AccumuloEPGMStore(config); diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/IntegrationTests.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/IntegrationTests.java new file mode 100644 index 000000000000..cc491ce2dd0d --- /dev/null +++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/IntegrationTests.java @@ -0,0 +1,19 @@ +/* + * Copyright © 2014 - 2019 Leipzig University (Database Research Group) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.gradoop.storage.impl.accumulo; + +public interface IntegrationTests { +} diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/basic/StoreTest.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/basic/StoreTest.java index 0943c3a0d5ed..654ec65d9e69 100644 --- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/basic/StoreTest.java +++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/basic/StoreTest.java @@ -37,8 +37,10 @@ import org.gradoop.storage.accumulo.impl.AccumuloEPGMStore; import org.gradoop.storage.impl.accumulo.AccumuloStoreTestBase; import org.gradoop.storage.impl.accumulo.AccumuloTestSuite; +import org.gradoop.storage.impl.accumulo.IntegrationTests; import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; import java.io.IOException; @@ -89,6 +91,7 @@ * Accumulo graph store test */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Category(IntegrationTests.class) public class StoreTest extends AccumuloStoreTestBase { private static final String TEST01 = "basic_01"; diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/IOBasicTest.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/IOBasicTest.java index 5817c2d6705e..0cd31e396212 100644 --- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/IOBasicTest.java +++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/IOBasicTest.java @@ -29,8 +29,10 @@ import org.gradoop.storage.accumulo.impl.io.AccumuloDataSink; import org.gradoop.storage.accumulo.impl.io.AccumuloDataSource; import org.gradoop.storage.impl.accumulo.AccumuloTestSuite; +import org.gradoop.storage.impl.accumulo.IntegrationTests; import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; import java.io.InputStream; @@ -43,6 +45,7 @@ * accumulo data read write test */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Category(IntegrationTests.class) public class IOBasicTest extends GradoopFlinkTestBase { private static final String TEST_01 = "io_basic_01"; diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOEdgePredicateTest.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOEdgePredicateTest.java index b02bd3aa29fc..8c3fb7e79335 100644 --- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOEdgePredicateTest.java +++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOEdgePredicateTest.java @@ -22,8 +22,10 @@ import org.gradoop.storage.impl.accumulo.AccumuloStoreTestBase; import org.gradoop.storage.accumulo.impl.io.AccumuloDataSource; import org.gradoop.storage.accumulo.utils.AccumuloFilters; +import org.gradoop.storage.impl.accumulo.IntegrationTests; import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; import java.util.List; @@ -32,6 +34,7 @@ import java.util.stream.Collectors; @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Category(IntegrationTests.class) public class IOEdgePredicateTest extends AccumuloStoreTestBase { private static final String TEST01 = "io_edge_predicate_01"; diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOElementIdRangeTest.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOElementIdRangeTest.java index 91f280fe778b..2ba59d9b4770 100644 --- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOElementIdRangeTest.java +++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOElementIdRangeTest.java @@ -23,9 +23,11 @@ import org.gradoop.storage.common.predicate.query.Query; import org.gradoop.storage.impl.accumulo.AccumuloStoreTestBase; import org.gradoop.storage.accumulo.impl.io.AccumuloDataSource; +import org.gradoop.storage.impl.accumulo.IntegrationTests; import org.junit.Assert; import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; import java.util.ArrayList; @@ -35,6 +37,7 @@ import static org.gradoop.common.GradoopTestUtils.validateElementCollections; @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Category(IntegrationTests.class) public class IOElementIdRangeTest extends AccumuloStoreTestBase { private static final String TEST01 = "io_element_id_range_01"; diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOGraphPredicateTest.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOGraphPredicateTest.java index 3641940c30d4..faa23d44d696 100644 --- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOGraphPredicateTest.java +++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOGraphPredicateTest.java @@ -21,8 +21,10 @@ import org.gradoop.storage.impl.accumulo.AccumuloStoreTestBase; import org.gradoop.storage.accumulo.impl.io.AccumuloDataSource; import org.gradoop.storage.accumulo.utils.AccumuloFilters; +import org.gradoop.storage.impl.accumulo.IntegrationTests; import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; import java.util.List; @@ -30,6 +32,7 @@ import java.util.stream.Collectors; @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Category(IntegrationTests.class) public class IOGraphPredicateTest extends AccumuloStoreTestBase { private static final String TEST01 = "io_graph_predicate_01"; diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOVertexPredicateTest.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOVertexPredicateTest.java index 735f02e1fd62..4610f50c6197 100644 --- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOVertexPredicateTest.java +++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/io/source/IOVertexPredicateTest.java @@ -21,8 +21,10 @@ import org.gradoop.storage.accumulo.impl.io.AccumuloDataSource; import org.gradoop.storage.accumulo.impl.predicate.filter.api.AccumuloElementFilter; import org.gradoop.storage.accumulo.utils.AccumuloFilters; +import org.gradoop.storage.impl.accumulo.IntegrationTests; import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; import java.util.List; @@ -32,6 +34,7 @@ import static org.gradoop.common.GradoopTestUtils.validateElementCollections; @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Category(IntegrationTests.class) public class IOVertexPredicateTest extends AccumuloStoreTestBase { private static final String TEST01 = "io_vertex_predicate_01"; diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreBasicPredicateTest.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreBasicPredicateTest.java index 5107f57f7d5a..3f471ae7a0b6 100644 --- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreBasicPredicateTest.java +++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreBasicPredicateTest.java @@ -26,8 +26,10 @@ import org.gradoop.storage.accumulo.impl.predicate.filter.calculate.Or; import org.gradoop.storage.accumulo.utils.AccumuloFilters; import org.gradoop.storage.common.predicate.query.Query; +import org.gradoop.storage.impl.accumulo.IntegrationTests; import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; import java.util.ArrayList; @@ -41,6 +43,7 @@ * Accumulo graph store predicate test */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Category(IntegrationTests.class) public class StoreBasicPredicateTest extends AccumuloStoreTestBase { private static final String TEST01 = "basic_predicate_01"; diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreIdsPredicateTest.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreIdsPredicateTest.java index be29fedc5b3b..baada8eac299 100644 --- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreIdsPredicateTest.java +++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreIdsPredicateTest.java @@ -22,8 +22,10 @@ import org.gradoop.common.model.impl.id.GradoopIdSet; import org.gradoop.common.model.impl.pojo.EPGMEdge; import org.gradoop.storage.common.predicate.query.Query; +import org.gradoop.storage.impl.accumulo.IntegrationTests; import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; import java.util.ArrayList; @@ -33,6 +35,7 @@ import static org.gradoop.common.GradoopTestUtils.validateElementCollections; @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Category(IntegrationTests.class) public class StoreIdsPredicateTest extends AccumuloStoreTestBase { private static final String TEST01 = "ids_predicate_01"; diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreLabelPredicateTest.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreLabelPredicateTest.java index 2e7944b0f3fb..81c8ab214cf3 100644 --- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreLabelPredicateTest.java +++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StoreLabelPredicateTest.java @@ -21,8 +21,10 @@ import org.gradoop.storage.common.predicate.query.Query; import org.gradoop.storage.impl.accumulo.AccumuloStoreTestBase; import org.gradoop.storage.accumulo.utils.AccumuloFilters; +import org.gradoop.storage.impl.accumulo.IntegrationTests; import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; import java.util.List; @@ -33,6 +35,7 @@ import static org.gradoop.common.GradoopTestUtils.validateElementCollections; @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Category(IntegrationTests.class) public class StoreLabelPredicateTest extends AccumuloStoreTestBase { private static final String TEST01 = "label_predicate_01"; diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StorePropPredicateTest.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StorePropPredicateTest.java index d93dc694dbaf..be981b56e005 100644 --- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StorePropPredicateTest.java +++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/predicate/StorePropPredicateTest.java @@ -22,8 +22,10 @@ import org.gradoop.storage.common.predicate.query.Query; import org.gradoop.storage.impl.accumulo.AccumuloStoreTestBase; import org.gradoop.storage.accumulo.utils.AccumuloFilters; +import org.gradoop.storage.impl.accumulo.IntegrationTests; import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runners.MethodSorters; import java.util.List; @@ -35,6 +37,7 @@ * accumulo graph store predicate test */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) +@Category(IntegrationTests.class) public class StorePropPredicateTest extends AccumuloStoreTestBase { private static final String TEST01 = "prop_predicate_01"; From 63042a82d61139be10887e983873d446e1b6b793 Mon Sep 17 00:00:00 2001 From: Lucas Schons Date: Tue, 26 Nov 2019 16:40:31 +0100 Subject: [PATCH 2/5] [#1452] Assign every test in gradoop-hbase to group 'intergration or 'unit' * Create two testng suite xml files to run either of the new groups * Configure surefire to only run unit tests --- .../gradoop-hbase-integration-testng.xml | 14 +++++++++ .../gradoop-hbase-unit-testng.xml | 14 +++++++++ gradoop-store/gradoop-hbase/pom.xml | 2 +- .../impl/hbase/GradoopHBaseTestBase.java | 4 +-- .../impl/hbase/HBaseEPGMStoreTest.java | 14 ++++----- .../impl/hbase/HBaseGraphStoreTest.java | 30 +++++++++---------- .../filter/impl/HBaseLabelInTest.java | 2 +- .../filter/impl/HBaseLabelRegTest.java | 2 +- .../filter/impl/HBasePropEqualsTest.java | 2 +- .../filter/impl/HBasePropLargerThanTest.java | 2 +- .../filter/impl/HBasePropRegTest.java | 3 +- 11 files changed, 59 insertions(+), 30 deletions(-) create mode 100644 gradoop-store/gradoop-hbase/gradoop-hbase-integration-testng.xml create mode 100644 gradoop-store/gradoop-hbase/gradoop-hbase-unit-testng.xml 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.*$"); From 7de2e718fe66faf056d6f471ef8275d7824da68c Mon Sep 17 00:00:00 2001 From: Lucas Schons Date: Fri, 6 Dec 2019 16:27:15 +0100 Subject: [PATCH 3/5] [#1452] configure test execution in gradoop-store * Add default profile in gradoop-accumulo pom to control exection of integration tests * Add integration profile to gradoop-hbase pom * fix typo --- gradoop-store/gradoop-accumulo/pom.xml | 42 ++++++++++++++++--- .../impl/accumulo/AccumuloTestSuite.java | 2 +- gradoop-store/gradoop-hbase/pom.xml | 22 ++++++++++ 3 files changed, 59 insertions(+), 7 deletions(-) diff --git a/gradoop-store/gradoop-accumulo/pom.xml b/gradoop-store/gradoop-accumulo/pom.xml index 6727962a9877..e26da37c8333 100644 --- a/gradoop-store/gradoop-accumulo/pom.xml +++ b/gradoop-store/gradoop-accumulo/pom.xml @@ -19,6 +19,42 @@ + + default + + true + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${accumuloTestSuite} + + org.gradoop.storage.impl.accumulo.IntegrationTests + + + + + + + integration + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${accumuloTestSuite} + + + + + + release @@ -72,12 +108,6 @@ org.apache.maven.plugins maven-surefire-plugin - - - ${accumuloTestSuite} - - org.gradoop.storage.impl.accumulo.IntegrationTests - org.apache.maven.plugins diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/AccumuloTestSuite.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/AccumuloTestSuite.java index 22c0c4e64768..fe73cffffb5f 100644 --- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/AccumuloTestSuite.java +++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/AccumuloTestSuite.java @@ -47,7 +47,7 @@ import static org.gradoop.storage.accumulo.config.GradoopAccumuloConfig.ZOOKEEPER_HOSTS; /** - * gradoop accumulo test suit + * gradoop accumulo test suite */ @RunWith(Suite.class) @Suite.SuiteClasses({ diff --git a/gradoop-store/gradoop-hbase/pom.xml b/gradoop-store/gradoop-hbase/pom.xml index 75b49c07fcdd..1c02a92ceaa3 100644 --- a/gradoop-store/gradoop-hbase/pom.xml +++ b/gradoop-store/gradoop-hbase/pom.xml @@ -15,6 +15,28 @@ Read/write graphs from/to HBase + + integration + + + + org.apache.maven.plugins + maven-surefire-plugin + + + gradoop-hbase-testng.xml + + + + surefire.testng.verbose + 2 + + + + + + + release From 64ec7f4a2902c19d2ccf217d88f4886de7a37447 Mon Sep 17 00:00:00 2001 From: Lucas Schons Date: Tue, 10 Dec 2019 11:43:32 +0100 Subject: [PATCH 4/5] [#1452] Add javadoc to IntegrationTests interface * fix testng integration test suite name --- .../org/gradoop/storage/impl/accumulo/IntegrationTests.java | 4 ++++ .../gradoop-hbase/gradoop-hbase-integration-testng.xml | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/IntegrationTests.java b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/IntegrationTests.java index cc491ce2dd0d..073dc2c38bb3 100644 --- a/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/IntegrationTests.java +++ b/gradoop-store/gradoop-accumulo/src/test/java/org/gradoop/storage/impl/accumulo/IntegrationTests.java @@ -15,5 +15,9 @@ */ package org.gradoop.storage.impl.accumulo; +/** + * This interface serves the sole purpose to label JUnit integration tests using the + * {@link org.junit.experimental.categories.Category} annotation. + */ public interface IntegrationTests { } diff --git a/gradoop-store/gradoop-hbase/gradoop-hbase-integration-testng.xml b/gradoop-store/gradoop-hbase/gradoop-hbase-integration-testng.xml index 76606badc2a9..9f944cada44a 100644 --- a/gradoop-store/gradoop-hbase/gradoop-hbase-integration-testng.xml +++ b/gradoop-store/gradoop-hbase/gradoop-hbase-integration-testng.xml @@ -1,7 +1,7 @@ - - + + From 4785dabc14d2a00777f0573b08187e23c959ce0a Mon Sep 17 00:00:00 2001 From: Lucas Schons Date: Tue, 17 Dec 2019 15:22:16 +0100 Subject: [PATCH 5/5] [#1452] Change test execution logic in module gradoop-hbase - Removes testng unit group (every test NOT belonging to the the integration test group gets countet as unit test. - Removes unneeded testng xml suite files. - Adds new testng suite xml file "complete" --- .../gradoop-hbase-complete-testng.xml | 9 ++++++ .../gradoop-hbase-integration-testng.xml | 14 -------- .../gradoop-hbase/gradoop-hbase-testng.xml | 24 -------------- .../gradoop-hbase-unit-testng.xml | 2 +- gradoop-store/gradoop-hbase/pom.xml | 14 +------- .../hbase/io/HBaseDataSinkSourceTest.java | 32 +++++++++---------- .../filter/impl/HBaseLabelInTest.java | 2 +- .../filter/impl/HBaseLabelRegTest.java | 2 +- .../filter/impl/HBasePropEqualsTest.java | 2 +- .../filter/impl/HBasePropLargerThanTest.java | 2 +- .../filter/impl/HBasePropRegTest.java | 4 +-- 11 files changed, 33 insertions(+), 74 deletions(-) create mode 100644 gradoop-store/gradoop-hbase/gradoop-hbase-complete-testng.xml delete mode 100644 gradoop-store/gradoop-hbase/gradoop-hbase-integration-testng.xml delete mode 100644 gradoop-store/gradoop-hbase/gradoop-hbase-testng.xml diff --git a/gradoop-store/gradoop-hbase/gradoop-hbase-complete-testng.xml b/gradoop-store/gradoop-hbase/gradoop-hbase-complete-testng.xml new file mode 100644 index 000000000000..e89e18e2a6c3 --- /dev/null +++ b/gradoop-store/gradoop-hbase/gradoop-hbase-complete-testng.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/gradoop-store/gradoop-hbase/gradoop-hbase-integration-testng.xml b/gradoop-store/gradoop-hbase/gradoop-hbase-integration-testng.xml deleted file mode 100644 index 9f944cada44a..000000000000 --- a/gradoop-store/gradoop-hbase/gradoop-hbase-integration-testng.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/gradoop-store/gradoop-hbase/gradoop-hbase-testng.xml b/gradoop-store/gradoop-hbase/gradoop-hbase-testng.xml deleted file mode 100644 index caf6c6f1a445..000000000000 --- a/gradoop-store/gradoop-hbase/gradoop-hbase-testng.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gradoop-store/gradoop-hbase/gradoop-hbase-unit-testng.xml b/gradoop-store/gradoop-hbase/gradoop-hbase-unit-testng.xml index 0917fbb96f69..61c61756415a 100644 --- a/gradoop-store/gradoop-hbase/gradoop-hbase-unit-testng.xml +++ b/gradoop-store/gradoop-hbase/gradoop-hbase-unit-testng.xml @@ -4,7 +4,7 @@ - + diff --git a/gradoop-store/gradoop-hbase/pom.xml b/gradoop-store/gradoop-hbase/pom.xml index 1c02a92ceaa3..292c7a01a816 100644 --- a/gradoop-store/gradoop-hbase/pom.xml +++ b/gradoop-store/gradoop-hbase/pom.xml @@ -24,14 +24,8 @@ maven-surefire-plugin - gradoop-hbase-testng.xml + gradoop-hbase-complete-testng.xml - - - surefire.testng.verbose - 2 - - @@ -94,12 +88,6 @@ gradoop-hbase-unit-testng.xml - - - surefire.testng.verbose - 2 - - diff --git a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/io/HBaseDataSinkSourceTest.java b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/io/HBaseDataSinkSourceTest.java index 8214543542bf..3b156e2e674e 100644 --- a/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/io/HBaseDataSinkSourceTest.java +++ b/gradoop-store/gradoop-hbase/src/test/java/org/gradoop/storage/impl/hbase/io/HBaseDataSinkSourceTest.java @@ -74,7 +74,7 @@ public class HBaseDataSinkSourceTest extends GradoopFlinkTestBase { * * @throws IOException on failure */ - @BeforeClass + @BeforeClass(groups = {"integration"}) public static void setUp() throws IOException { epgmStores = new HBaseEPGMStore[3]; @@ -97,7 +97,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) { @@ -120,7 +120,7 @@ public static Object[][] storeIndexProvider() { /** * Test the configuration of the stores. */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testConfig(int storeIndex) { switch (storeIndex) { case 1: @@ -158,7 +158,7 @@ public void testConfig(int storeIndex) { * * @throws IOException on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testReadFromSource(int storeIndex) throws Exception { // read social graph from HBase via EPGMDatabase GraphCollection collection = new HBaseDataSource(epgmStores[storeIndex], getConfig()) @@ -186,7 +186,7 @@ public void testReadFromSource(int storeIndex) throws Exception { * * @throws Exception on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testReadFromSourceWithEmptyPredicates(int storeIndex) throws Exception { // Define HBase source HBaseDataSource hBaseDataSource = new HBaseDataSource(epgmStores[storeIndex], getConfig()); @@ -225,7 +225,7 @@ public void testReadFromSourceWithEmptyPredicates(int storeIndex) throws Excepti /** * Test reading a graph collection from {@link HBaseDataSource} with graph head id predicates */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testReadWithGraphIdPredicate(int storeIndex) throws Throwable { List testGraphs = new ArrayList<>(getSocialGraphHeads()) .subList(1, 3); @@ -259,7 +259,7 @@ public void testReadWithGraphIdPredicate(int storeIndex) throws Throwable { /** * Test reading a graph collection from {@link HBaseDataSource} with vertex id predicates */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testReadWithVertexIdPredicate(int storeIndex) throws Throwable { List testVertices = new ArrayList<>(getSocialVertices()) .subList(0, 3); @@ -294,7 +294,7 @@ public void testReadWithVertexIdPredicate(int storeIndex) throws Throwable { /** * Test reading a graph collection from {@link HBaseDataSource} with edge id predicates */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testReadWithEdgeIdPredicate(int storeIndex) throws Throwable { List testEdges = new ArrayList<>(getSocialEdges()) .subList(0, 3); @@ -332,7 +332,7 @@ public void testReadWithEdgeIdPredicate(int storeIndex) throws Throwable { * * @throws Exception on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testReadWithLabelInPredicate(int storeIndex) throws Exception { // Extract parts of social graph to filter for List graphHeads = Lists.newArrayList(getSocialGraphHeads()) @@ -390,7 +390,7 @@ public void testReadWithLabelInPredicate(int storeIndex) throws Exception { * * @throws Exception on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testReadWithLabelRegPredicate(int storeIndex) throws Exception { // Extract parts of social graph to filter for List graphHeads = Lists.newArrayList(getSocialGraphHeads()) @@ -444,7 +444,7 @@ public void testReadWithLabelRegPredicate(int storeIndex) throws Exception { * * @throws Exception on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testReadWithPropEqualsPredicate(int storeIndex) throws Exception { PropertyValue propertyValueVertexCount = PropertyValue.create(3); PropertyValue propertyValueSince = PropertyValue.create(2013); @@ -506,7 +506,7 @@ public void testReadWithPropEqualsPredicate(int storeIndex) throws Exception { * * @throws Exception on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testReadWithPropLargerThanPredicate(int storeIndex) throws Exception { PropertyValue propertyValueVertexCount = PropertyValue.create(3); PropertyValue propertyValueSince = PropertyValue.create(2014); @@ -574,7 +574,7 @@ public void testReadWithPropLargerThanPredicate(int storeIndex) throws Exception * * @throws Exception on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testReadWithPropRegPredicate(int storeIndex) throws Exception { // Extract parts of social graph to filter for List graphHeads = Lists.newArrayList(getSocialGraphHeads()) @@ -642,7 +642,7 @@ public void testReadWithPropRegPredicate(int storeIndex) throws Exception { * * @throws Exception on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testReadWithChainedPredicates(int storeIndex) throws Exception { // Extract parts of social graph to filter for List graphHeads = getSocialGraphHeads() @@ -716,7 +716,7 @@ public void testReadWithChainedPredicates(int storeIndex) throws Exception { * * @throws Exception on failure */ - @Test(dataProvider = "store index") + @Test(dataProvider = "store index", groups = {"integration"}) public void testWriteToSink(int storeIndex) throws Exception { // Create an empty store HBaseEPGMStore newStore; @@ -786,7 +786,7 @@ public void testWriteToSink(int storeIndex) throws Exception { * * @throws Exception on failure */ - @Test + @Test(groups = {"integration"}) public void testWriteToSinkWithOverWrite() throws Exception { // Create an empty store HBaseEPGMStore store = createEmptyEPGMStore("testWriteToSinkWithOverwrite"); 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 93d90db1aeac..afde712a2458 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(groups = {"unit"}) + @Test 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 d9791ecaf75b..e39238d5a61c 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(groups = {"unit"}) + @Test 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 b62672ce9b24..934c27382214 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", groups = {"unit"}) + @Test(dataProvider = "property values") 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 9cf7d0a4b58b..2ff12843af6d 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", groups = {"unit"}) + @Test(dataProvider = "property values") 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 21ef16d59969..314a348ec0e2 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,12 +34,12 @@ /** * Test class for {@link HBasePropReg} */ -@Test(groups = "unit") +@Test public class HBasePropRegTest { /** * Test the toHBaseFilter function */ - @Test(groups = {"unit"}) + @Test public void testToHBaseFilter() { String key = "key"; Pattern pattern = Pattern.compile("^FooBar.*$");