You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/07/12 16:39:52 UTC
[02/12] jena git commit: Clear configuration directory on server
reset.
Clear configuration directory on server reset.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/8aa643fb
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/8aa643fb
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/8aa643fb
Branch: refs/heads/master
Commit: 8aa643fb8af609bb590363237411f55357fb7879
Parents: ff73287
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jul 3 14:08:44 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jul 3 14:08:44 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/fuseki/ServerTest.java | 2 +
.../java/org/apache/jena/fuseki/TestAdmin.java | 61 ++++++++++----------
2 files changed, 32 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/8aa643fb/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/ServerTest.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/ServerTest.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/ServerTest.java
index 0aa7cbf..5e916ac 100644
--- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/ServerTest.java
+++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/ServerTest.java
@@ -146,6 +146,8 @@ public class ServerTest {
Collection<String> keys = Iter.toList(DataAccessPointRegistry.get().keys().iterator()) ;
for (String k : keys)
DataAccessPointRegistry.get().remove(k) ;
+ // Clear configuration directory.
+ FileOps.clearAll(FusekiServer.dirConfiguration.toFile()) ;
}
public static void resetServer() {
http://git-wip-us.apache.org/repos/asf/jena/blob/8aa643fb/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestAdmin.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestAdmin.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestAdmin.java
index d5e6ddb..29f74c3 100644
--- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestAdmin.java
+++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/TestAdmin.java
@@ -53,9 +53,9 @@ import org.apache.jena.riot.WebContent ;
import org.apache.jena.riot.web.HttpOp ;
import org.apache.jena.riot.web.HttpResponseHandler ;
import org.apache.jena.web.HttpSC ;
+import org.junit.After ;
import org.junit.AfterClass ;
import org.junit.Before ;
-import org.junit.BeforeClass ;
import org.junit.Test ;
/** Tests of the admin functionality */
@@ -64,21 +64,19 @@ public class TestAdmin extends BaseTest {
// Name of the dataset in the assembler file.
static String dsTest = "test-ds2" ;
- @BeforeClass
- public static void beforeClass() {
+ @Before public void beforeTest() {
ServerTest.allocServer() ;
ServerTest.resetServer() ;
}
-
- @AfterClass
- public static void afterClass() {
+
+ @After public void afterTest() {
ServerTest.freeServer() ;
}
-
- @Before public void beforeTest() {
- ServerTest.resetServer() ;
+
+ @AfterClass public static void afterClass() {
+ ServerTest.teardownServer() ;
}
-
+
// --- Ping
@Test public void ping_1() {
@@ -139,27 +137,6 @@ public class TestAdmin extends BaseTest {
checkJsonDatasetsOne(v.getAsObject()) ;
}
- private static JsonValue getDatasetDescription(String dsName) {
- try ( TypedInputStream in = execHttpGet(urlRoot+"$/"+opDatasets+"/"+dsName) ) {
- assertEqualsIgnoreCase(WebContent.contentTypeJSON, in.getContentType()) ;
- JsonValue v = JSON.parse(in) ;
- return v ;
- }
- }
-
- // -- Add
-
- private static void addTestDataset() {
- File f = new File("testing/config-ds-1.ttl") ;
- org.apache.http.entity.ContentType ct = org.apache.http.entity.ContentType.parse(WebContent.contentTypeTurtle+"; charset="+WebContent.charsetUTF8) ;
- HttpEntity e = new FileEntity(f, ct) ;
- execHttpPost(ServerTest.urlRoot+"$/"+opDatasets, e) ;
- }
-
- private static void deleteDataset(String name) {
- execHttpDelete(ServerTest.urlRoot+"$/"+opDatasets+"/"+name) ;
- }
-
// Specific dataset
@Test public void add_delete_dataset_1() {
checkNotThere(dsTest) ;
@@ -349,6 +326,28 @@ public class TestAdmin extends BaseTest {
}
+ private static JsonValue getDatasetDescription(String dsName) {
+ try ( TypedInputStream in = execHttpGet(urlRoot+"$/"+opDatasets+"/"+dsName) ) {
+ assertEqualsIgnoreCase(WebContent.contentTypeJSON, in.getContentType()) ;
+ JsonValue v = JSON.parse(in) ;
+ return v ;
+ }
+}
+
+// -- Add
+
+private static void addTestDataset() {
+ File f = new File("testing/config-ds-1.ttl") ;
+ org.apache.http.entity.ContentType ct = org.apache.http.entity.ContentType.parse(WebContent.contentTypeTurtle+"; charset="+WebContent.charsetUTF8) ;
+ HttpEntity e = new FileEntity(f, ct) ;
+ execHttpPost(ServerTest.urlRoot+"$/"+opDatasets, e) ;
+}
+
+private static void deleteDataset(String name) {
+ execHttpDelete(ServerTest.urlRoot+"$/"+opDatasets+"/"+name) ;
+}
+
+
static class JsonResponseHandler implements HttpResponseHandler {
private JsonValue result = null ;