clerezza-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r1532357 - /clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/
Date Tue, 15 Oct 2013 14:23:34 GMT
Author: reto
Date: Tue Oct 15 14:23:33 2013
New Revision: 1532357

URL: http://svn.apache.org/r1532357
Log:
CLEREZZA-792: shortened test delays

Modified:
    clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTest.java
    clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTestSingleTdb.java
    clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetMGraphTest.java
    clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
    clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbMGraphTest.java

Modified: clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTest.java
URL: http://svn.apache.org/viewvc/clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTest.java?rev=1532357&r1=1532356&r2=1532357&view=diff
==============================================================================
--- clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTest.java
(original)
+++ clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTest.java
Tue Oct 15 14:23:33 2013
@@ -54,7 +54,7 @@ public class MultiThreadedTest {
     /**
      * how many seconds to let them run
      */
-    private static final int DELAY = 120;
+    private static final int DELAY = 15;
     
     
     private MGraph mGraph;

Modified: clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTestSingleTdb.java
URL: http://svn.apache.org/viewvc/clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTestSingleTdb.java?rev=1532357&r1=1532356&r2=1532357&view=diff
==============================================================================
--- clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTestSingleTdb.java
(original)
+++ clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/MultiThreadedTestSingleTdb.java
Tue Oct 15 14:23:33 2013
@@ -55,11 +55,11 @@ public class MultiThreadedTestSingleTdb 
     /** 
      * how many threads to start
      */
-    private static final int THREAD_COUNT = 200;
+    private static final int THREAD_COUNT = 100;
     /**
      * how many seconds to let them run
      */
-    private static final int DELAY = 120;
+    private static final int DELAY = 15;
     
     
     private MGraph mGraph;

Modified: clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetMGraphTest.java
URL: http://svn.apache.org/viewvc/clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetMGraphTest.java?rev=1532357&r1=1532356&r2=1532357&view=diff
==============================================================================
--- clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetMGraphTest.java
(original)
+++ clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetMGraphTest.java
Tue Oct 15 14:23:33 2013
@@ -39,7 +39,11 @@ public class SingleTdbDatasetMGraphTest 
             provider.deleteTripleCollection(new UriRef(MGRAPHNAME_PREFIX+i));
         }
         provider.deactivate(null);
-        TdbTcProvider.delete(tempFile);
+        try {
+            TdbTcProvider.delete(tempFile);
+        } catch (IOException e) {
+            System.err.println("Couldn't remove "+tempFile);
+        }
     }
 
     @Override

Modified: clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
URL: http://svn.apache.org/viewvc/clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java?rev=1532357&r1=1532356&r2=1532357&view=diff
==============================================================================
--- clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
(original)
+++ clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/SingleTdbDatasetTcProviderTest.java
Tue Oct 15 14:23:33 2013
@@ -49,8 +49,12 @@ public class SingleTdbDatasetTcProviderT
         //tests want us to deactivate/activate the TcProvider on multiple calls
         //to getInstance within the same test
         if(provider !=null){
-            provider.close();
-            provider = null;
+            try {
+                provider.deactivate(null);
+                provider = null;
+            } catch (Exception e) {
+                System.err.println("Error cleaning up: "+e.getMessage());
+            }
         }
         try {
             provider = new SingleTdbDatasetTcProvider(config);
@@ -64,9 +68,13 @@ public class SingleTdbDatasetTcProviderT
     public void cleanData() throws IOException{
         //We need to remove all remaining data after a test
         if(provider != null){
-            provider.deactivate(null);
-            TdbTcProvider.delete(tempFile);
-            provider = null;
+            try {
+                provider.deactivate(null);
+                TdbTcProvider.delete(tempFile);
+                provider = null;
+            } catch (Exception e) {
+                System.err.println("Error cleaning up: "+e.getMessage());
+            }
         }
     }
     

Modified: clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbMGraphTest.java
URL: http://svn.apache.org/viewvc/clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbMGraphTest.java?rev=1532357&r1=1532356&r2=1532357&view=diff
==============================================================================
--- clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbMGraphTest.java
(original)
+++ clerezza/trunk/rdf.jena.tdb.storage/src/test/java/org/apache/clerezza/rdf/jena/tdb/storage/TdbMGraphTest.java
Tue Oct 15 14:23:33 2013
@@ -55,7 +55,11 @@ public class TdbMGraphTest extends MGrap
 
     @AfterClass
     public static void cleanUpDirectory() throws IOException {
-        TdbTcProvider.delete(tempFile);
+        try {
+            TdbTcProvider.delete(tempFile);
+        } catch (IOException e) {
+            System.err.println("failed to delete temp directory: "+tempFile);
+        }
     }
 
     @After



Mime
View raw message