[Refactoring] Transition integration tests to JUnit 5, test code impr…

…ovements.
kbss-cvut · Jul 15, 2019 · 1ed698b · 1ed698b
1 parent 520bf96
commit 1ed698b
Show file tree

Hide file tree

Showing 30 changed files with 905 additions and 1,147 deletions.
diff --git a/...ests-jena/src/test/java/cz/cvut/kbss/jopa/test/query/jena/PolymorphicSelectQueryTest.java b/...ests-jena/src/test/java/cz/cvut/kbss/jopa/test/query/jena/PolymorphicSelectQueryTest.java
@@ -1,16 +1,14 @@
 /**
  * Copyright (C) 2019 Czech Technical University in Prague
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details. You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * <p>
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  */
 package cz.cvut.kbss.jopa.test.query.jena;
 
@@ -19,8 +17,8 @@
 import cz.cvut.kbss.jopa.test.query.QueryTestEnvironment;
 import cz.cvut.kbss.jopa.test.query.runner.PolymorphicSelectQueryRunner;
 import cz.cvut.kbss.ontodriver.jena.config.JenaOntoDriverProperties;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,12 +31,12 @@ public class PolymorphicSelectQueryTest extends PolymorphicSelectQueryRunner {
 
     private static EntityManager em;
 
-    public PolymorphicSelectQueryTest() {
+    PolymorphicSelectQueryTest() {
         super(LOG);
     }
 
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         final JenaPersistenceFactory persistenceFactory = new JenaPersistenceFactory();
         final Map<String, String> properties = new HashMap<>();
         properties.put(JenaOntoDriverProperties.JENA_STORAGE_TYPE, JenaOntoDriverProperties.IN_MEMORY);
@@ -49,7 +47,7 @@ public void setUp() {
         em.getEntityManagerFactory().getCache().evictAll();
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         em.close();
         em.getEntityManagerFactory().close();

diff --git a/jopa-integration-tests-jena/src/test/java/cz/cvut/kbss/jopa/test/query/jena/QueryTest.java b/jopa-integration-tests-jena/src/test/java/cz/cvut/kbss/jopa/test/query/jena/QueryTest.java
@@ -1,16 +1,14 @@
 /**
  * Copyright (C) 2019 Czech Technical University in Prague
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details. You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * <p>
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  */
 package cz.cvut.kbss.jopa.test.query.jena;
 
@@ -19,8 +17,8 @@
 import cz.cvut.kbss.jopa.test.query.QueryTestEnvironment;
 import cz.cvut.kbss.jopa.test.query.runner.QueryRunner;
 import cz.cvut.kbss.ontodriver.jena.config.JenaOntoDriverProperties;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,12 +31,12 @@ public class QueryTest extends QueryRunner {
 
     private static EntityManager em;
 
-    public QueryTest() {
+    QueryTest() {
         super(LOG);
     }
 
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         final JenaPersistenceFactory persistenceFactory = new JenaPersistenceFactory();
         final Map<String, String> properties = new HashMap<>();
         properties.put(JenaOntoDriverProperties.JENA_STORAGE_TYPE, JenaOntoDriverProperties.IN_MEMORY);
@@ -49,8 +47,8 @@ public void setUp() {
         em.getEntityManagerFactory().getCache().evictAll();
     }
 
-    @After
-    public void tearDown() {
+    @AfterEach
+    void tearDown() {
         em.close();
         em.getEntityManagerFactory().close();
     }

diff --git a/...ntegration-tests-jena/src/test/java/cz/cvut/kbss/jopa/test/query/jena/TypedQueryTest.java b/...ntegration-tests-jena/src/test/java/cz/cvut/kbss/jopa/test/query/jena/TypedQueryTest.java
@@ -1,16 +1,14 @@
 /**
  * Copyright (C) 2019 Czech Technical University in Prague
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details. You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * <p>
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  */
 package cz.cvut.kbss.jopa.test.query.jena;
 
@@ -19,8 +17,8 @@
 import cz.cvut.kbss.jopa.test.query.QueryTestEnvironment;
 import cz.cvut.kbss.jopa.test.query.runner.TypedQueryRunner;
 import cz.cvut.kbss.ontodriver.jena.config.JenaOntoDriverProperties;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,12 +31,12 @@ public class TypedQueryTest extends TypedQueryRunner {
 
     private static EntityManager em;
 
-    public TypedQueryTest() {
+    TypedQueryTest() {
         super(LOG);
     }
 
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         final JenaPersistenceFactory persistenceFactory = new JenaPersistenceFactory();
         final Map<String, String> properties = new HashMap<>();
         properties.put(JenaOntoDriverProperties.JENA_STORAGE_TYPE, JenaOntoDriverProperties.IN_MEMORY);
@@ -49,8 +47,8 @@ public void setUp() {
         em.getEntityManagerFactory().getCache().evictAll();
     }
 
-    @After
-    public void tearDown() {
+    @AfterEach
+    void tearDown() {
         em.close();
         em.getEntityManagerFactory().close();
     }

diff --git a/...-owlapi/src/test/java/cz/cvut/kbss/jopa/test/query/owlapi/PolymorphicSelectQueryTest.java b/...-owlapi/src/test/java/cz/cvut/kbss/jopa/test/query/owlapi/PolymorphicSelectQueryTest.java
@@ -1,27 +1,25 @@
 /**
  * Copyright (C) 2019 Czech Technical University in Prague
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details. You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * <p>
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  */
 package cz.cvut.kbss.jopa.test.query.owlapi;
 
 import cz.cvut.kbss.jopa.model.EntityManager;
 import cz.cvut.kbss.jopa.test.environment.OwlapiPersistenceFactory;
 import cz.cvut.kbss.jopa.test.query.QueryTestEnvironment;
 import cz.cvut.kbss.jopa.test.query.runner.PolymorphicSelectQueryRunner;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,21 +31,21 @@ public class PolymorphicSelectQueryTest extends PolymorphicSelectQueryRunner {
 
     private static EntityManager em;
 
-    public PolymorphicSelectQueryTest() {
+    PolymorphicSelectQueryTest() {
         super(LOG);
     }
 
-    @BeforeClass
-    public static void setUpBeforeClass() {
+    @BeforeAll
+    static void setUpBeforeClass() {
         final OwlapiPersistenceFactory persistenceFactory = new OwlapiPersistenceFactory();
         em = persistenceFactory.getEntityManager("PolymorphicSelectQueryTests", false, Collections.emptyMap());
         QueryTestEnvironment.generateTestData(em);
         em.clear();
         em.getEntityManagerFactory().getCache().evictAll();
     }
 
-    @AfterClass
-    public static void tearDownAfterClass() {
+    @AfterAll
+    static void tearDownAfterClass() {
         em.close();
         em.getEntityManagerFactory().close();
     }
@@ -57,14 +55,14 @@ protected EntityManager getEntityManager() {
         return em;
     }
 
-    @Ignore
+    @Disabled
     @Test
     public void selectLoadsInstanceOfMostConcreteSubclassOfAbstractEntity() {
         // Another possible bug in OWL2Query - This query returns no results and there is a warning:
         // cz.cvut.kbss.owl2query.engine.QueryImpl checkType WARNING: 'rdfs:label' is not an object of type 'DATA_PROPERTY'.
     }
 
-    @Ignore
+    @Disabled
     @Test
     public void selectLoadsInstanceOfMostConcreteSubclassOfConcreteEntity() {
         // Same as above

diff --git a/...integration-tests-owlapi/src/test/java/cz/cvut/kbss/jopa/test/query/owlapi/QueryTest.java b/...integration-tests-owlapi/src/test/java/cz/cvut/kbss/jopa/test/query/owlapi/QueryTest.java
@@ -1,27 +1,25 @@
 /**
  * Copyright (C) 2019 Czech Technical University in Prague
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any
- * later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details. You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * <p>
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details. You should have received a copy of the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  */
 package cz.cvut.kbss.jopa.test.query.owlapi;
 
 import cz.cvut.kbss.jopa.model.EntityManager;
 import cz.cvut.kbss.jopa.test.environment.OwlapiPersistenceFactory;
 import cz.cvut.kbss.jopa.test.query.QueryTestEnvironment;
 import cz.cvut.kbss.jopa.test.query.runner.QueryRunner;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,21 +31,21 @@ public class QueryTest extends QueryRunner {
 
     private static EntityManager em;
 
-    public QueryTest() {
+    QueryTest() {
         super(LOG);
     }
 
-    @BeforeClass
-    public static void setUpBeforeClass() {
+    @BeforeAll
+    static void setUpBeforeClass() {
         final OwlapiPersistenceFactory persistenceFactory = new OwlapiPersistenceFactory();
         em = persistenceFactory.getEntityManager("SPARQLQueryTests", false, Collections.emptyMap());
         QueryTestEnvironment.generateTestData(em);
         em.clear();
         em.getEntityManagerFactory().getCache().evictAll();
     }
 
-    @AfterClass
-    public static void tearDownAfterClass() {
+    @AfterAll
+    static void tearDownAfterClass() {
         em.close();
         em.getEntityManagerFactory().close();
     }
@@ -57,31 +55,31 @@ protected EntityManager getEntityManager() {
         return em;
     }
 
-    @Ignore
+    @Disabled
     @Override
     public void selectWithOptionalReturnsNullInUnfilledColumns() {
         // OWL2Query does not support OPTIONAL pattern
     }
 
-    @Ignore
+    @Disabled
     @Override
     public void queryWithEntityMappingLoadsReferencedEntityAndInheritedAttributes() {
         // OWL2Query does not return any results for the test query
     }
 
-    @Ignore
+    @Disabled
     @Test
     public void executeUpdateRunsUpdateOnRepository() {
         // No updates in OWL2Query
     }
 
-    @Ignore
+    @Disabled
     @Test
     public void executeUpdateRunsDeleteOnRepository() {
         // No updates in OWL2Query
     }
 
-    @Ignore
+    @Disabled
     @Test
     public void executeUpdateRunsInsertOnRepository() {
         // No updates in OWL2Query