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/30 15:26:15 UTC

[2/2] jena git commit: Test for create-delete-create-delete

Test for create-delete-create-delete 

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4d1a7110
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4d1a7110
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4d1a7110

Branch: refs/heads/master
Commit: 4d1a7110fad30979438ffc3bfe04ee814fea3092
Parents: eafedda
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Jul 30 14:26:01 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Jul 30 14:26:01 2015 +0100

----------------------------------------------------------------------
 .../apache/jena/fuseki/mgt/ActionDatasets.java  |  2 +-
 .../java/org/apache/jena/fuseki/TestAdmin.java  | 24 +++++++-------------
 2 files changed, 9 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/4d1a7110/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
index dac1c7a..7a972d9 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
@@ -322,7 +322,7 @@ public class ActionDatasets extends ActionContainerItem {
             // Make it invisible to the outside.
             DataAccessPointRegistry.get().remove(name) ;
             // Delete configuration file.
-            // Shoudl be only one, undo damage if multiple.
+            // Should be only one, undo damage if multiple.
             existingConfigurationFile(name).stream().forEach(FileOps::deleteSilent);
             
             // Find graph associated with this dataset name.

http://git-wip-us.apache.org/repos/asf/jena/blob/4d1a7110/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 8b836b7..e233120 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
@@ -32,15 +32,10 @@ import static org.apache.jena.riot.web.HttpOp.execHttpPost ;
 import java.io.File ;
 import java.io.IOException ;
 import java.io.InputStream ;
-import java.util.ArrayList ;
-import java.util.List ;
 
 import org.apache.http.HttpEntity ;
 import org.apache.http.HttpResponse ;
-import org.apache.http.NameValuePair ;
-import org.apache.http.client.entity.UrlEncodedFormEntity ;
 import org.apache.http.entity.FileEntity ;
-import org.apache.http.message.BasicNameValuePair ;
 import org.apache.jena.atlas.json.JSON ;
 import org.apache.jena.atlas.json.JsonArray ;
 import org.apache.jena.atlas.json.JsonObject ;
@@ -177,17 +172,14 @@ public class TestAdmin extends BaseTest {
     }
     
     @Test public void add_delete_dataset_3() throws Exception {
-        String name = "MEMTEST" ;
-        //String args = "dbType=mem&dbName="+name ;
-        
-        List<NameValuePair> args = new ArrayList<NameValuePair>() ;
-        args.add(new BasicNameValuePair("dbType", "mem")) ;
-        args.add(new BasicNameValuePair("dbName", name)) ;
-        
-        HttpEntity e = new UrlEncodedFormEntity(args) ;
-        execHttpPost(ServerTest.urlRoot+"$/"+opDatasets, e) ;
-        checkExists(name) ;
-        deleteDataset(name) ;
+        checkNotThere(dsTest) ;
+        addTestDataset() ;
+        checkExists(dsTest) ;
+        deleteDataset(dsTest) ;
+        checkNotThere(dsTest) ;
+        addTestDataset() ;
+        checkExists(dsTest) ;
+        deleteDataset(dsTest) ;
     }
     
     @Test public void delete_dataset_1() {