You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2013/09/30 18:45:26 UTC
[49/50] [abbrv] git commit: with the new ID generators the assumption
that the first created object always has ID 1 no longer holds,
so updated the tests
with the new ID generators the assumption that the first created object always has ID 1 no longer holds, so updated the tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/be31f8a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/be31f8a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/be31f8a7
Branch: refs/heads/master
Commit: be31f8a736c8ae7b42ff194992b503b7ae0159a4
Parents: 4b8b868
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Mon Sep 30 18:26:01 2013 +0200
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Mon Sep 30 18:26:01 2013 +0200
----------------------------------------------------------------------
.../test/VersioningPersistenceTest.java | 24 ++++++------------
.../test/VersioningRepositoryTest.java | 26 ++++++++------------
2 files changed, 17 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/be31f8a7/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java
index 49277a2..6697704 100644
--- a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java
+++ b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningPersistenceTest.java
@@ -17,13 +17,7 @@
*/
package org.apache.marmotta.kiwi.versioning.test;
-import static org.hamcrest.Matchers.hasItems;
import info.aduna.iteration.Iterations;
-
-import java.sql.SQLException;
-import java.util.Date;
-import java.util.List;
-
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.marmotta.kiwi.config.KiWiConfiguration;
import org.apache.marmotta.kiwi.model.rdf.KiWiStringLiteral;
@@ -38,15 +32,17 @@ import org.apache.marmotta.kiwi.versioning.persistence.KiWiVersioningPersistence
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.sql.SQLException;
+import java.util.Date;
+import java.util.List;
+
+import static org.hamcrest.Matchers.hasItems;
+
/**
* This test checks if the database persistence for the versioning functionality works properly.
*
@@ -136,13 +132,11 @@ public class VersioningPersistenceTest {
List<Version> list1 = Iterations.asList(connection.listVersions());
Assert.assertEquals("there should be exactly one version",1,list1.size());
Assert.assertEquals("contents of version differ", version1, list1.get(0));
- Assert.assertEquals("version id is not 1", 1L, (long)list1.get(0).getId());
// check if listVersions with subject1 now gives exactly one version
List<Version> listr1 = Iterations.asList(connection.listVersions(subject1));
Assert.assertEquals("there should be exactly one version", 1, listr1.size());
Assert.assertEquals("contents of version differ", version1, listr1.get(0));
- Assert.assertEquals("version id is not 1", 1L, (long)listr1.get(0).getId());
Version version2 = new Version();
@@ -162,7 +156,6 @@ public class VersioningPersistenceTest {
List<Version> listr2 = Iterations.asList(connection.listVersions(subject1));
Assert.assertEquals("there should be exactly one version", 2, listr2.size());
Assert.assertEquals("contents of version differ", version1, listr2.get(0));
- Assert.assertEquals("version id is not 1", 1L, (long)listr2.get(0).getId());
connection.commit();
} finally {
@@ -239,7 +232,6 @@ public class VersioningPersistenceTest {
List<Version> list1 = Iterations.asList(connection.listVersions(date1,date2));
Assert.assertEquals("there should be exactly one version from "+date1+" to "+date2,1,list1.size());
Assert.assertEquals("contents of version differ", version1, list1.get(0));
- Assert.assertEquals("version id is not 1", 1L, (long)list1.get(0).getId());
// check if getLatestVersion at date2 works
Version latest2 = connection.getLatestVersion(subject,date2);
@@ -250,13 +242,12 @@ public class VersioningPersistenceTest {
List<Version> listr1 = Iterations.asList(connection.listVersions(subject,date1,date2));
Assert.assertEquals("there should be exactly one version", 1, listr1.size());
Assert.assertEquals("contents of version differ", version1, listr1.get(0));
- Assert.assertEquals("version id is not 1", 1L, (long)listr1.get(0).getId());
List<Version> list2 = Iterations.asList(connection.listVersions(date2,date3));
Assert.assertEquals("there should be exactly one version from "+date2+" to "+date3,1,list2.size());
Assert.assertEquals("contents of version differ", version2, list2.get(0));
- Assert.assertEquals("version id is not 2", 2L, (long)list2.get(0).getId());
+ Assert.assertTrue("order of versions is not correct", version1.getId() < (long) list2.get(0).getId());
List<Version> list3 = Iterations.asList(connection.listVersions(date3,new Date()));
Assert.assertEquals("there should be no version from "+date3+" to now",0,list3.size());
@@ -313,7 +304,6 @@ public class VersioningPersistenceTest {
List<Version> list1 = Iterations.asList(connection.listVersions());
Assert.assertEquals("there should be exactly one version",1,list1.size());
Assert.assertEquals("contents of version differ", version1, list1.get(0));
- Assert.assertEquals("version id is not 1", 1L, (long)list1.get(0).getId());
Version version2 = new Version();
version2.setCommitTime(new Date());
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/be31f8a7/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningRepositoryTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningRepositoryTest.java b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningRepositoryTest.java
index 76f8375..a1830f7 100644
--- a/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningRepositoryTest.java
+++ b/libraries/kiwi/kiwi-versioning/src/test/java/org/apache/marmotta/kiwi/versioning/test/VersioningRepositoryTest.java
@@ -17,15 +17,7 @@
*/
package org.apache.marmotta.kiwi.versioning.test;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assume.assumeThat;
import info.aduna.iteration.Iterations;
-
-import java.io.InputStream;
-import java.sql.SQLException;
-import java.util.Date;
-import java.util.List;
-
import org.apache.marmotta.kiwi.config.KiWiConfiguration;
import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect;
import org.apache.marmotta.kiwi.sail.KiWiStore;
@@ -36,10 +28,7 @@ import org.apache.marmotta.kiwi.versioning.sail.KiWiVersioningSail;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
import org.junit.runner.RunWith;
import org.openrdf.model.URI;
import org.openrdf.repository.Repository;
@@ -51,6 +40,14 @@ import org.openrdf.rio.RDFFormat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.InputStream;
+import java.sql.SQLException;
+import java.util.Date;
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assume.assumeThat;
+
/**
* This test checks if the versioning functionality itself works, i.e. the system properly creates versions on
* transaction commits.
@@ -152,16 +149,14 @@ public class VersioningRepositoryTest {
// list all versions
List<Version> versions = asList(vsail.listVersions());
Assert.assertEquals("expected 3 versions!", 3, versions.size());
- Assert.assertEquals(1, (long)versions.get(0).getId());
- Assert.assertEquals(2, (long)versions.get(1).getId());
- Assert.assertEquals(3, (long)versions.get(2).getId());
+ Assert.assertTrue("version order is not correct", versions.get(0).getId() < versions.get(1).getId());
+ Assert.assertTrue("version order is not correct", versions.get(1).getId() < versions.get(2).getId());
Assert.assertEquals(3, (long)versions.get(0).getAddedTriples().size());
Assert.assertEquals(3, (long)versions.get(1).getAddedTriples().size());
Assert.assertEquals(1, (long)versions.get(2).getAddedTriples().size());
List<Version> versions1 = asList(vsail.listVersions(date1,date2));
Assert.assertEquals("expected 1 version!", 1, versions1.size());
- Assert.assertEquals(1, (long)versions1.get(0).getId());
Assert.assertEquals(3, (long)versions1.get(0).getAddedTriples().size());
}
@@ -224,7 +219,6 @@ public class VersioningRepositoryTest {
// list all versions
List<Version> versions = asList(vsail.listVersions());
Assert.assertEquals("expected 3 versions!", 3, versions.size());
- Assert.assertEquals(1, (long)versions.get(0).getId());
URI subject = repository.getValueFactory().createURI("http://marmotta.incubator.apache.org/testing/ns1/R1");
URI predicate = repository.getValueFactory().createURI("http://marmotta.incubator.apache.org/testing/ns1/P2");