Repository: marmotta Updated Branches: refs/heads/develop e1f88ee41 -> 00d37de4c
MARMOTTA-438: clanning Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/00d37de4 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/00d37de4 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/00d37de4 Branch: refs/heads/develop Commit: 00d37de4c66c1fc014363c40088fd7de418c2241 Parents: e1f88ee Author: Sergio Fernández <[email protected]> Authored: Mon Apr 7 09:48:53 2014 +0200 Committer: Sergio Fernández <[email protected]> Committed: Mon Apr 7 09:48:53 2014 +0200 ---------------------------------------------------------------------- .../marmotta/platform/ldp/testsuite/LdpManifestTest.java | 2 +- .../marmotta/platform/ldp/testsuite/LdpTestCases.java | 9 +-------- .../marmotta/platform/ldp/testsuite/LdpTestCasesRunner.java | 3 +-- .../marmotta/platform/ldp/testsuite/LdpTestCasesUtils.java | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/00d37de4/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 2c9a4e6..b9102a4 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 @@ -40,7 +40,7 @@ public class LdpManifestTest { @Before public final void before() throws RepositoryException, RDFParseException, IOException { - String path = LdpTestCases.FILES_PATH + LdpTestCases.MANIFEST_CACHE + ".ttl"; + String path = LdpTestCases.ROOT_PATH + LdpTestCases.MANIFEST_CACHE + ".ttl"; repo = LdpTestCasesUtils.loadData(path, RDFFormat.TURTLE); Assume.assumeNotNull(repo); } http://git-wip-us.apache.org/repos/asf/marmotta/blob/00d37de4/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/testsuite/LdpTestCases.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/testsuite/LdpTestCases.java b/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/testsuite/LdpTestCases.java index 6b6b939..ddffa8f 100644 --- a/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/testsuite/LdpTestCases.java +++ b/platform/marmotta-ldp/src/test/java/org/apache/marmotta/platform/ldp/testsuite/LdpTestCases.java @@ -18,7 +18,6 @@ package org.apache.marmotta.platform.ldp.testsuite; import com.jayway.restassured.RestAssured; -import org.apache.commons.io.IOUtils; import org.apache.marmotta.platform.core.exception.io.MarmottaImportException; import org.apache.marmotta.platform.core.test.base.JettyMarmotta; import org.apache.marmotta.platform.ldp.webservices.LdpWebService; @@ -41,7 +40,7 @@ import java.net.URISyntaxException; @RunWith(LdpTestCasesRunner.class) public class LdpTestCases { - public final static String FILES_PATH = "/testsuite/"; + public final static String ROOT_PATH = "/testsuite/"; public final static String BASE = "http://www.w3.org/TR/ldp-test-cases/";; @@ -53,8 +52,6 @@ public class LdpTestCases { private static String baseUrl; - private static String testResourceTTL; - @BeforeClass public static void setup() throws MarmottaImportException, URISyntaxException, IOException { marmotta = new JettyMarmotta("/marmotta", LdpWebService.class); @@ -62,9 +59,6 @@ public class LdpTestCases { RestAssured.port = marmotta.getPort(); RestAssured.basePath = marmotta.getContext(); baseUrl = UriBuilder.fromUri("http://localhost";).port(marmotta.getPort()).path(marmotta.getContext()).build().toString(); - - //initialization - testResourceTTL = IOUtils.toString(LdpTestCases.class.getResourceAsStream("/test.ttl"), "utf8"); } @Before @@ -81,7 +75,6 @@ public class LdpTestCases { public static void shutdown() { //marmotta.shutdown(); marmotta = null; - testResourceTTL = null; } } http://git-wip-us.apache.org/repos/asf/marmotta/blob/00d37de4/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 16f985b..31fee36 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 @@ -31,7 +31,6 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; import java.util.List; /** @@ -50,7 +49,7 @@ public class LdpTestCasesRunner extends Suite { private static List<Runner> buildTestCasesFromManifest() { List<Runner> runners = new ArrayList<>(); - String path = LdpTestCases.FILES_PATH + LdpTestCases.MANIFEST_CACHE + ".ttl"; + String path = LdpTestCases.ROOT_PATH + LdpTestCases.MANIFEST_CACHE + ".ttl"; try { Repository repo = LdpTestCasesUtils.loadData(path, RDFFormat.TURTLE); RepositoryConnection conn = repo.getConnection(); http://git-wip-us.apache.org/repos/asf/marmotta/blob/00d37de4/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 97b7064..9270da7 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 @@ -83,7 +83,7 @@ public class LdpTestCasesUtils { * @see <a href="https://dvcs.w3.org/hg/ldpwg/raw-file/default/Test%20Cases/LDP%20Test%20Cases.html#h3_namespaces-used";>Sec. 4.1 Namespaces used</a> */ public static Map<String,String> getNormativeNamespaces() throws IOException { - String path = LdpTestCases.FILES_PATH + "namespaces.properties"; + String path = LdpTestCases.ROOT_PATH + "namespaces.properties"; Map<String,String> prefixes = new HashMap<>(); Properties properties = new Properties(); properties.load(LdpTestCasesUtils.class.getResourceAsStream(path));
