You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/08/21 12:49:20 UTC

[2/2] git commit: fixed another issue with concurrency tests with surefire maven plugin

fixed another issue with concurrency tests with surefire maven plugin


Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/6f01b749
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/6f01b749
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/6f01b749

Branch: refs/heads/develop
Commit: 6f01b749a9f40d8c038f1da6ac8e955d866c9d43
Parents: b79a85d
Author: Sergio Fernández <wi...@apache.org>
Authored: Wed Aug 21 12:49:06 2013 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Wed Aug 21 12:49:06 2013 +0200

----------------------------------------------------------------------
 .../org/apache/marmotta/kiwi/test/MySQLConcurrencyTest.java  | 8 ++++----
 .../apache/marmotta/kiwi/test/PostgreSQLConcurrencyTest.java | 8 ++++----
 parent/pom.xml                                               | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6f01b749/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/MySQLConcurrencyTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/MySQLConcurrencyTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/MySQLConcurrencyTest.java
index d653418..d38123a 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/MySQLConcurrencyTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/MySQLConcurrencyTest.java
@@ -97,11 +97,11 @@ public class MySQLConcurrencyTest extends ConcurrencyTestBase {
 
     @AfterClass
     public static void dropDatabase() throws RepositoryException, SQLException, SailException {
-        assertTrue(store.checkConsistency());
     	if (store != null && store.isInitialized()) {
-	        store.closeValueFactory(); // release all connections before dropping the database
-	        store.getPersistence().dropDatabase();
-	        repository.shutDown();
+            assertTrue(store.checkConsistency());
+            store.closeValueFactory(); // release all connections before dropping the database 
+            store.getPersistence().dropDatabase();
+            repository.shutDown();
     	}
     }
 }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6f01b749/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PostgreSQLConcurrencyTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PostgreSQLConcurrencyTest.java b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PostgreSQLConcurrencyTest.java
index f07c4a8..9e1b8c9 100644
--- a/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PostgreSQLConcurrencyTest.java
+++ b/libraries/kiwi/kiwi-triplestore/src/test/java/org/apache/marmotta/kiwi/test/PostgreSQLConcurrencyTest.java
@@ -82,11 +82,11 @@ public class PostgreSQLConcurrencyTest extends ConcurrencyTestBase {
 
     @AfterClass
     public static void dropDatabase() throws RepositoryException, SQLException, SailException {
-        assertTrue(store.checkConsistency());
     	if (store != null && store.isInitialized()) {
-	        store.closeValueFactory(); // release all connections before dropping the database
-	        store.getPersistence().dropDatabase();
-	        repository.shutDown();
+            assertTrue(store.checkConsistency());
+            store.closeValueFactory(); // release all connections before dropping the database
+            store.getPersistence().dropDatabase();
+            repository.shutDown();
     	}
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/6f01b749/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b7b2615..1933181 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -135,7 +135,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.12.4</version>
+                    <version>2.16</version>
                     <configuration>
                         <useSystemClassLoader>false</useSystemClassLoader>
                         <forkMode>always</forkMode>