You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2013/05/07 10:33:07 UTC
[4/6] git commit: Also tests should always close connections properly!
Also tests should always close connections properly!
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/b0e0c991
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/b0e0c991
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/b0e0c991
Branch: refs/heads/develop
Commit: b0e0c99195bef61518b3c6dd4e2551ffc2f74878
Parents: e532b8a
Author: Jakob Frank <ja...@apache.org>
Authored: Tue May 7 10:28:18 2013 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue May 7 10:28:18 2013 +0200
----------------------------------------------------------------------
.../builder/FacadingPredicateBuilderTest.java | 3 +-
.../collections/CollectionFacadingTest.java | 21 +++++++++-----
.../sesame/facading/locale/LocaleFacadingTest.java | 4 ++-
3 files changed, 18 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/b0e0c991/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/builder/FacadingPredicateBuilderTest.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/builder/FacadingPredicateBuilderTest.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/builder/FacadingPredicateBuilderTest.java
index c9515cb..e48c6c8 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/builder/FacadingPredicateBuilderTest.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/builder/FacadingPredicateBuilderTest.java
@@ -49,6 +49,7 @@ public class FacadingPredicateBuilderTest extends AbstractFacadingTest {
super.setup();
connection = repositoryRDF.getConnection();
+ connection.begin();
facading = FacadingFactory.createFacading(connection);
}
@@ -90,7 +91,7 @@ public class FacadingPredicateBuilderTest extends AbstractFacadingTest {
@After
public void tearDown() throws RepositoryException {
if (connection != null) {
- connection.rollback();
+ connection.commit();
connection.close();
}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/b0e0c991/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/collections/CollectionFacadingTest.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/collections/CollectionFacadingTest.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/collections/CollectionFacadingTest.java
index ef143dd..b3e3101 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/collections/CollectionFacadingTest.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/collections/CollectionFacadingTest.java
@@ -39,20 +39,22 @@ public class CollectionFacadingTest extends AbstractFacadingTest {
@Test
public void testCollectionFacading() throws RepositoryException {
- final RepositoryConnection connection = repositoryRDF.getConnection();
final Random rnd = new Random();
final Date a, b, c, d, e, now;
- now = new Date();
+ now = new Date(60000*(System.currentTimeMillis()/60000L));
+
// Start 10Yrs back;
- final int tenYrsInSecs = 10 * 365 * 24 * 60 * 60;
- a = new Date(now.getTime() - tenYrsInSecs * 1000L);
- b = new Date(a.getTime() + rnd.nextInt(tenYrsInSecs) * 1000L);
- c = new Date(a.getTime() + rnd.nextInt(tenYrsInSecs) * 1000L);
- d = new Date(a.getTime() + rnd.nextInt(tenYrsInSecs) * 1000L);
- e = new Date(a.getTime() + rnd.nextInt(tenYrsInSecs) * 1000L);
+ final int tenYrsInMin = 10 * 365 * 24 * 60;
+ a = new Date(now.getTime() - tenYrsInMin * 60000L);
+ b = new Date(a.getTime() + rnd.nextInt(tenYrsInMin) * 60000L);
+ c = new Date(a.getTime() + rnd.nextInt(tenYrsInMin) * 60000L);
+ d = new Date(a.getTime() + rnd.nextInt(tenYrsInMin) * 60000L);
+ e = new Date(a.getTime() + rnd.nextInt(tenYrsInMin) * 60000L);
+ final RepositoryConnection connection = repositoryRDF.getConnection();
try {
+ connection.begin();
final Facading facading = FacadingFactory.createFacading(connection);
URI uri = connection.getValueFactory().createURI("http://www.example.com/rdf/test/collections");
@@ -70,6 +72,8 @@ public class CollectionFacadingTest extends AbstractFacadingTest {
facade.deleteDates();
Assert.assertEquals(facade.getDates().size(), 0);
+
+ connection.commit();
} finally {
connection.close();
}
@@ -83,6 +87,7 @@ public class CollectionFacadingTest extends AbstractFacadingTest {
try {
final Facading facading = FacadingFactory.createFacading(connection);
+ connection.begin();
URI uri = connection.getValueFactory().createURI("http://www.example.com/rdf/test/document");
CollectionFacade facade = facading.createFacade(uri, CollectionFacade.class);
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/b0e0c991/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/locale/LocaleFacadingTest.java
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/locale/LocaleFacadingTest.java b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/locale/LocaleFacadingTest.java
index 5932471..34030f8 100644
--- a/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/locale/LocaleFacadingTest.java
+++ b/commons/sesame-tools-facading/src/test/java/org/apache/marmotta/commons/sesame/facading/locale/LocaleFacadingTest.java
@@ -39,7 +39,7 @@ public class LocaleFacadingTest extends AbstractFacadingTest {
@Test
public void testWithLocale() throws RepositoryException {
- final Locale de = Locale.GERMAN, en = Locale.ENGLISH, fr = Locale.FRENCH, none = new Locale("none");
+ final Locale de = Locale.GERMAN, en = Locale.ENGLISH, fr = Locale.FRENCH, none = new Locale("xx", "none");
final String lbl = "Label",
lbl_de = lbl + ": " + de.toString(),
@@ -49,6 +49,7 @@ public class LocaleFacadingTest extends AbstractFacadingTest {
final RepositoryConnection connection = repositoryRDF.getConnection();
try {
+ connection.begin();
final Facading facading = FacadingFactory.createFacading(connection);
final URI uri = connection.getValueFactory().createURI("http://www.example.com/rdf/test/locale");
@@ -101,6 +102,7 @@ public class LocaleFacadingTest extends AbstractFacadingTest {
assertNull(f.getLabel(fr));
assertNull(f.getLabel(none));
+ connection.commit();
} finally {
connection.close();
}