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 2014/04/04 11:30:42 UTC
[45/50] [abbrv] git commit: MARMOTTA-438: refactored data load
MARMOTTA-438: refactored data load
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/a2b95c53
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/a2b95c53
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/a2b95c53
Branch: refs/heads/develop
Commit: a2b95c537cb51a7716785907eb2067143c957042
Parents: 9150ef7
Author: Sergio Fernández <wi...@apache.org>
Authored: Wed Apr 2 17:30:41 2014 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Wed Apr 2 17:30:41 2014 +0200
----------------------------------------------------------------------
.../apache/marmotta/platform/ldp/testsuite/LdpManifestTest.java | 4 +++-
.../marmotta/platform/ldp/testsuite/LdpTestCasesRunner.java | 4 +++-
.../marmotta/platform/ldp/testsuite/LdpTestCasesUtils.java | 5 +++--
3 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a2b95c53/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/testsuite/LdpManifestTest.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/testsuite/LdpManifestTest.java b/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/testsuite/LdpManifestTest.java
index 9d7afbd..2c9a4e6 100644
--- a/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/testsuite/LdpManifestTest.java
+++ b/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/testsuite/LdpManifestTest.java
@@ -24,6 +24,7 @@ import org.openrdf.repository.Repository;
import org.openrdf.repository.RepositoryConnection;
import org.openrdf.repository.RepositoryException;
import org.openrdf.repository.RepositoryResult;
+import org.openrdf.rio.RDFFormat;
import org.openrdf.rio.RDFParseException;
import java.io.IOException;
@@ -39,7 +40,8 @@ public class LdpManifestTest {
@Before
public final void before() throws RepositoryException, RDFParseException, IOException {
- repo = LdpTestCasesUtils.loadData();
+ String path = LdpTestCases.FILES_PATH + LdpTestCases.MANIFEST_CACHE + ".ttl";
+ repo = LdpTestCasesUtils.loadData(path, RDFFormat.TURTLE);
Assume.assumeNotNull(repo);
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a2b95c53/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/testsuite/LdpTestCasesRunner.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/testsuite/LdpTestCasesRunner.java b/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/testsuite/LdpTestCasesRunner.java
index c54cacb..16f985b 100644
--- a/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/testsuite/LdpTestCasesRunner.java
+++ b/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/testsuite/LdpTestCasesRunner.java
@@ -24,6 +24,7 @@ import org.openrdf.query.*;
import org.openrdf.repository.Repository;
import org.openrdf.repository.RepositoryConnection;
import org.openrdf.repository.RepositoryException;
+import org.openrdf.rio.RDFFormat;
import org.openrdf.rio.RDFParseException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,8 +50,9 @@ public class LdpTestCasesRunner extends Suite {
private static List<Runner> buildTestCasesFromManifest() {
List<Runner> runners = new ArrayList<>();
+ String path = LdpTestCases.FILES_PATH + LdpTestCases.MANIFEST_CACHE + ".ttl";
try {
- Repository repo = LdpTestCasesUtils.loadData();
+ Repository repo = LdpTestCasesUtils.loadData(path, RDFFormat.TURTLE);
RepositoryConnection conn = repo.getConnection();
try {
conn.begin();
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a2b95c53/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/testsuite/LdpTestCasesUtils.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/testsuite/LdpTestCasesUtils.java b/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/testsuite/LdpTestCasesUtils.java
index 66eead6..97b7064 100644
--- a/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/testsuite/LdpTestCasesUtils.java
+++ b/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/testsuite/LdpTestCasesUtils.java
@@ -42,13 +42,14 @@ public class LdpTestCasesUtils {
/**
* Load test cases' data
*
+ * @param path path to the manifest file
+ * @param format serialization format used in the manifest file
* @return In-Memory repository with the data
* @throws org.openrdf.rio.RDFParseException
* @throws org.openrdf.repository.RepositoryException
* @throws java.io.IOException
*/
- public static Repository loadData() throws RDFParseException, RepositoryException, IOException {
- String path = LdpTestCases.FILES_PATH + LdpTestCases.MANIFEST_CACHE + ".ttl";
+ public static Repository loadData(String path, RDFFormat format) throws RDFParseException, RepositoryException, IOException {
Repository repo = new SailRepository(new MemoryStore());
repo.initialize();
RepositoryConnection conn = repo.getConnection();