Merge branch 'master' of github.com:neo4j/community

nrkkalyan · Dec 1, 2011 · b6dc2dd · b6dc2dd
2 parents 04b899c + 970d26f
commit b6dc2dd
Show file tree

Hide file tree

Showing 33 changed files with 65 additions and 112 deletions.
diff --git a/server/src/docs/dev/rest/graph_algos.txt → server/src/docs/dev/rest-api/graph_algos.txt b/server/src/docs/dev/rest/graph_algos.txt → server/src/docs/dev/rest-api/graph_algos.txt
diff --git a/server/src/docs/dev/rest/index.txt → server/src/docs/dev/rest-api/index.txt b/server/src/docs/dev/rest/index.txt → server/src/docs/dev/rest-api/index.txt
diff --git a/server/src/docs/dev/rest/introduction.txt → ...er/src/docs/dev/rest-api/introduction.txt b/server/src/docs/dev/rest/introduction.txt → ...er/src/docs/dev/rest-api/introduction.txt
diff --git a/server/src/docs/dev/rest/traversals.txt → server/src/docs/dev/rest-api/traversals.txt b/server/src/docs/dev/rest/traversals.txt → server/src/docs/dev/rest-api/traversals.txt
diff --git a/...c/functionaltest/java/org/neo4j/server/NeoServerDefaultPortAndHostnameFunctionalTest.java b/...c/functionaltest/java/org/neo4j/server/NeoServerDefaultPortAndHostnameFunctionalTest.java
@@ -24,10 +24,10 @@
 
 import org.junit.Test;
 import org.neo4j.server.helpers.FunctionalTestHelper;
+import org.neo4j.server.rest.AbstractRestFunctionalTestBase;
 import org.neo4j.server.rest.JaxRsResponse;
-import org.neo4j.test.server.SharedServerTestBase;
 
-public class NeoServerDefaultPortAndHostnameFunctionalTest extends SharedServerTestBase
+public class NeoServerDefaultPortAndHostnameFunctionalTest extends AbstractRestFunctionalTestBase
 {
     @Test
     public void shouldDefaultToSensiblePortIfNoneSpecifiedInConfig() throws Exception {

diff --git a/server/src/functionaltest/java/org/neo4j/server/NeoServerFunctionalTest.java b/server/src/functionaltest/java/org/neo4j/server/NeoServerFunctionalTest.java
@@ -30,11 +30,11 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.neo4j.server.helpers.FunctionalTestHelper;
+import org.neo4j.server.rest.AbstractRestFunctionalTestBase;
 import org.neo4j.server.rest.JaxRsResponse;
 import org.neo4j.server.rest.RestRequest;
-import org.neo4j.test.server.SharedServerTestBase;
 
-public class NeoServerFunctionalTest extends SharedServerTestBase
+public class NeoServerFunctionalTest extends AbstractRestFunctionalTestBase
 {
     private FunctionalTestHelper functionalTestHelper;
 

diff --git a/server/src/functionaltest/java/org/neo4j/server/rest/AbstractRestFunctionalTestBase.java b/server/src/functionaltest/java/org/neo4j/server/rest/AbstractRestFunctionalTestBase.java
@@ -52,6 +52,11 @@ public class AbstractRestFunctionalTestBase extends SharedServerTestBase impleme
     public @Rule
     TestData<RESTDocsGenerator> gen = TestData.producedThrough( RESTDocsGenerator.PRODUCER );
 
+    @Before
+    public void setUp()
+    {
+        gen().setSection( "dev/rest-api" );
+    }
     protected String doCypherRestCall( String endpoint, String script, Status status, Pair<String, String>... params ) {
         data.get();
         String parameterString = createParameterString( params );

diff --git a/server/src/functionaltest/java/org/neo4j/server/rest/AutoIndexFunctionalTest.java b/server/src/functionaltest/java/org/neo4j/server/rest/AutoIndexFunctionalTest.java
@@ -86,7 +86,6 @@ public void Relationship_AutoIndex_is_not_removable() throws DatabaseBlockedExce
     @Graph( nodes = { @NODE( name = "I", setNameProperty = true ) }, autoIndexNodes = true )
     public void AutoIndex_is_not_removable() throws DatabaseBlockedException, JsonParseException
     {
-        // data.get();
         gen.get()
                 .expectedStatus( 405 )
                 .delete( nodeAutoIndexUri() )

diff --git a/...g/neo4j/server/rest/AutoIndexWithNonDefaultConfigurationThroughRESTAPIFunctionalTest.java b/...g/neo4j/server/rest/AutoIndexWithNonDefaultConfigurationThroughRESTAPIFunctionalTest.java
@@ -45,8 +45,13 @@ public class AutoIndexWithNonDefaultConfigurationThroughRESTAPIFunctionalTest ex
     public @Rule
     TestData<RESTDocsGenerator> gen = TestData.producedThrough( RESTDocsGenerator.PRODUCER );
 
+    @Before
+    public void setUp()
+    {
+        gen.get().setSection( "dev/rest-api" );
+    }
     @BeforeClass
-    public static void setupServer() throws IOException
+    public static void allocateServer() throws IOException
     {
         server = ServerBuilder.server()
                 .withAutoIndexingEnabledForNodes( "foo", "bar" )

diff --git a/server/src/functionaltest/java/org/neo4j/server/rest/CompactJsonFunctionalTest.java b/server/src/functionaltest/java/org/neo4j/server/rest/CompactJsonFunctionalTest.java
@@ -37,9 +37,8 @@
 import org.neo4j.server.rest.domain.JsonHelper;
 import org.neo4j.server.rest.domain.JsonParseException;
 import org.neo4j.server.rest.repr.formats.CompactJsonFormat;
-import org.neo4j.test.server.SharedServerTestBase;
 
-public class CompactJsonFunctionalTest extends SharedServerTestBase
+public class CompactJsonFunctionalTest extends AbstractRestFunctionalTestBase
 {
     private long thomasAnderson;
     private long trinity;

diff --git a/.../src/functionaltest/java/org/neo4j/server/rest/DatabaseMetadataServiceFunctionalTest.java b/.../src/functionaltest/java/org/neo4j/server/rest/DatabaseMetadataServiceFunctionalTest.java
@@ -23,19 +23,13 @@
 
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 import org.neo4j.kernel.impl.annotations.Documented;
 import org.neo4j.server.helpers.FunctionalTestHelper;
 import org.neo4j.server.rest.domain.GraphDbHelper;
-import org.neo4j.test.TestData;
-import org.neo4j.test.server.SharedServerTestBase;
 
-public class DatabaseMetadataServiceFunctionalTest extends SharedServerTestBase
+public class DatabaseMetadataServiceFunctionalTest extends AbstractRestFunctionalTestBase
 {
-    public @Rule
-    TestData<RESTDocsGenerator> gen = TestData.producedThrough( RESTDocsGenerator.PRODUCER );
-
     private static FunctionalTestHelper functionalTestHelper;
     private static GraphDbHelper helper;
 

diff --git a/server/src/functionaltest/java/org/neo4j/server/rest/DiscoveryServiceFunctionalTest.java b/server/src/functionaltest/java/org/neo4j/server/rest/DiscoveryServiceFunctionalTest.java
@@ -30,11 +30,10 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.neo4j.server.rest.domain.JsonHelper;
-import org.neo4j.test.server.SharedServerTestBase;
 
 import com.sun.jersey.api.client.Client;
 
-public class DiscoveryServiceFunctionalTest extends SharedServerTestBase
+public class DiscoveryServiceFunctionalTest extends AbstractRestFunctionalTestBase
 {
     @Before
     public void cleanTheDatabase()

diff --git a/server/src/functionaltest/java/org/neo4j/server/rest/GetIndexRootFunctionalTest.java b/server/src/functionaltest/java/org/neo4j/server/rest/GetIndexRootFunctionalTest.java
@@ -27,9 +27,8 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.neo4j.server.helpers.FunctionalTestHelper;
-import org.neo4j.test.server.SharedServerTestBase;
 
-public class GetIndexRootFunctionalTest extends SharedServerTestBase
+public class GetIndexRootFunctionalTest extends AbstractRestFunctionalTestBase
 {
     private static FunctionalTestHelper functionalTestHelper;
 

diff --git a/server/src/functionaltest/java/org/neo4j/server/rest/GetNodePropertiesFunctionalTest.java b/server/src/functionaltest/java/org/neo4j/server/rest/GetNodePropertiesFunctionalTest.java
@@ -29,16 +29,13 @@
 
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 import org.neo4j.kernel.impl.annotations.Documented;
 import org.neo4j.server.helpers.FunctionalTestHelper;
 import org.neo4j.server.rest.domain.JsonHelper;
 import org.neo4j.server.rest.domain.JsonParseException;
-import org.neo4j.test.TestData;
-import org.neo4j.test.server.SharedServerTestBase;
 
-public class GetNodePropertiesFunctionalTest extends SharedServerTestBase
+public class GetNodePropertiesFunctionalTest extends AbstractRestFunctionalTestBase
 {
     private static FunctionalTestHelper functionalTestHelper;
     private RestRequest req;
@@ -56,8 +53,6 @@ public void cleanTheDatabase()
         req = RestRequest.req();
     }
 
-    public @Rule
-    TestData<RESTDocsGenerator> gen = TestData.producedThrough( RESTDocsGenerator.PRODUCER );
 
     /**
      * Get properties for node (empty result).

diff --git a/server/src/functionaltest/java/org/neo4j/server/rest/GetOnRootFunctionalTest.java b/server/src/functionaltest/java/org/neo4j/server/rest/GetOnRootFunctionalTest.java
@@ -20,8 +20,8 @@
 package org.neo4j.server.rest;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Map;
 
@@ -32,7 +32,7 @@
 import org.neo4j.kernel.impl.annotations.Documented;
 import org.neo4j.server.rest.domain.JsonHelper;
 import org.neo4j.test.GraphDescription.Graph;
-import org.neo4j.test.TestData;
+import org.neo4j.test.TestData.Title;
 
 public class GetOnRootFunctionalTest extends AbstractRestFunctionalTestBase
 {
@@ -45,7 +45,7 @@ public class GetOnRootFunctionalTest extends AbstractRestFunctionalTestBase
     @Documented
     @Test
     @Graph("I know you")
-    @TestData.Title( "Get service root" )
+    @Title( "Get service root" )
     public void assert200OkFromGet() throws Exception
     {
         AbstractGraphDatabase db = (AbstractGraphDatabase)graphdb();

diff --git a/...rc/functionaltest/java/org/neo4j/server/rest/GetRelationshipPropertiesFunctionalTest.java b/...rc/functionaltest/java/org/neo4j/server/rest/GetRelationshipPropertiesFunctionalTest.java
@@ -37,9 +37,8 @@
 import org.neo4j.server.rest.domain.GraphDbHelper;
 import org.neo4j.server.rest.domain.JsonHelper;
 import org.neo4j.server.rest.domain.JsonParseException;
-import org.neo4j.test.server.SharedServerTestBase;
 
-public class GetRelationshipPropertiesFunctionalTest extends SharedServerTestBase
+public class GetRelationshipPropertiesFunctionalTest extends AbstractRestFunctionalTestBase
 {
     private static String baseRelationshipUri;
 

diff --git a/server/src/functionaltest/java/org/neo4j/server/rest/HtmlFunctionalTest.java b/server/src/functionaltest/java/org/neo4j/server/rest/HtmlFunctionalTest.java
@@ -36,9 +36,8 @@
 import org.neo4j.server.helpers.FunctionalTestHelper;
 import org.neo4j.server.rest.domain.GraphDbHelper;
 import org.neo4j.server.rest.domain.RelationshipDirection;
-import org.neo4j.test.server.SharedServerTestBase;
 
-public class HtmlFunctionalTest extends SharedServerTestBase
+public class HtmlFunctionalTest extends AbstractRestFunctionalTestBase
 {
     private long thomasAnderson;
     private long trinity;

diff --git a/server/src/functionaltest/java/org/neo4j/server/rest/IndexNodeFunctionalTest.java b/server/src/functionaltest/java/org/neo4j/server/rest/IndexNodeFunctionalTest.java
@@ -36,7 +36,6 @@
 
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Transaction;
@@ -50,15 +49,11 @@
 import org.neo4j.server.rest.domain.JsonParseException;
 import org.neo4j.server.rest.domain.URIHelper;
 import org.neo4j.server.rest.web.PropertyValueException;
-import org.neo4j.test.TestData;
-import org.neo4j.test.server.SharedServerTestBase;
 
-public class IndexNodeFunctionalTest extends SharedServerTestBase
+public class IndexNodeFunctionalTest extends AbstractRestFunctionalTestBase
 {
     private static FunctionalTestHelper functionalTestHelper;
     private static GraphDbHelper helper;
-    public @Rule
-    TestData<RESTDocsGenerator> gen = TestData.producedThrough( RESTDocsGenerator.PRODUCER );
 
     @BeforeClass
     public static void setupServer() throws IOException

diff --git a/server/src/functionaltest/java/org/neo4j/server/rest/IndexRelationshipFunctionalTest.java b/server/src/functionaltest/java/org/neo4j/server/rest/IndexRelationshipFunctionalTest.java
@@ -37,7 +37,6 @@
 
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 import org.neo4j.helpers.collection.MapUtil;
 import org.neo4j.server.database.DatabaseBlockedException;
@@ -47,16 +46,12 @@
 import org.neo4j.server.rest.domain.JsonParseException;
 import org.neo4j.server.rest.domain.URIHelper;
 import org.neo4j.server.rest.web.PropertyValueException;
-import org.neo4j.test.TestData;
-import org.neo4j.test.server.SharedServerTestBase;
 
-public class IndexRelationshipFunctionalTest extends SharedServerTestBase
+public class IndexRelationshipFunctionalTest extends AbstractRestFunctionalTestBase
 {
     private static FunctionalTestHelper functionalTestHelper;
     private static GraphDbHelper helper;
     private static RestRequest request;
-    public @Rule
-    TestData<RESTDocsGenerator> gen = TestData.producedThrough( RESTDocsGenerator.PRODUCER );
 
     @BeforeClass
     public static void setupServer() throws IOException

diff --git a/server/src/functionaltest/java/org/neo4j/server/rest/JmxServiceTest.java b/server/src/functionaltest/java/org/neo4j/server/rest/JmxServiceTest.java
@@ -29,9 +29,8 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.neo4j.server.helpers.FunctionalTestHelper;
-import org.neo4j.test.server.SharedServerTestBase;
 
-public class JmxServiceTest extends SharedServerTestBase
+public class JmxServiceTest extends AbstractRestFunctionalTestBase
 {
     private static FunctionalTestHelper functionalTestHelper;
 

diff --git a/server/src/functionaltest/java/org/neo4j/server/rest/ManageNodeFunctionalTest.java b/server/src/functionaltest/java/org/neo4j/server/rest/ManageNodeFunctionalTest.java
@@ -36,16 +36,13 @@
 
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 import org.neo4j.kernel.impl.annotations.Documented;
 import org.neo4j.server.helpers.FunctionalTestHelper;
 import org.neo4j.server.rest.domain.GraphDbHelper;
 import org.neo4j.server.rest.domain.JsonHelper;
-import org.neo4j.test.TestData;
-import org.neo4j.test.server.SharedServerTestBase;
 
-public class ManageNodeFunctionalTest extends SharedServerTestBase
+public class ManageNodeFunctionalTest extends AbstractRestFunctionalTestBase
 {
     private static final long NON_EXISTENT_NODE_ID = 999999;
     private static String NODE_URI_PATTERN = "^.*/node/[0-9]+$";
@@ -66,8 +63,6 @@ public void cleanTheDatabase()
         cleanDatabase();
     }
 
-    public @Rule
-    TestData<RESTDocsGenerator> gen = TestData.producedThrough( RESTDocsGenerator.PRODUCER );
 
     @Test
     public void create_Node() throws Exception

diff --git a/server/src/functionaltest/java/org/neo4j/server/rest/RedirectorTests.java b/server/src/functionaltest/java/org/neo4j/server/rest/RedirectorTests.java
@@ -25,9 +25,8 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.neo4j.test.server.SharedServerTestBase;
 
-public class RedirectorTests extends SharedServerTestBase
+public class RedirectorTests extends AbstractRestFunctionalTestBase
 {
     @Before
     public void cleanTheDatabase()

diff --git a/server/src/functionaltest/java/org/neo4j/server/rest/RemoveNodePropertiesFunctionalTest.java b/server/src/functionaltest/java/org/neo4j/server/rest/RemoveNodePropertiesFunctionalTest.java
@@ -27,16 +27,13 @@
 
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 import org.neo4j.kernel.impl.annotations.Documented;
 import org.neo4j.server.database.DatabaseBlockedException;
 import org.neo4j.server.helpers.FunctionalTestHelper;
 import org.neo4j.server.rest.domain.GraphDbHelper;
-import org.neo4j.test.TestData;
-import org.neo4j.test.server.SharedServerTestBase;
 
-public class RemoveNodePropertiesFunctionalTest extends SharedServerTestBase
+public class RemoveNodePropertiesFunctionalTest extends AbstractRestFunctionalTestBase
 {
     private static FunctionalTestHelper functionalTestHelper;
     private static GraphDbHelper helper;
@@ -54,9 +51,6 @@ public void cleanTheDatabase()
         cleanDatabase();
     }
 
-    public @Rule
-    TestData<RESTDocsGenerator> gen = TestData.producedThrough( RESTDocsGenerator.PRODUCER );
-
     private String getPropertiesUri( final long nodeId )
     {
         return functionalTestHelper.nodePropertiesUri( nodeId );

diff --git a/server/src/functionaltest/java/org/neo4j/server/rest/RemoveRelationshipFunctionalTest.java b/server/src/functionaltest/java/org/neo4j/server/rest/RemoveRelationshipFunctionalTest.java
@@ -29,9 +29,8 @@
 import org.junit.Test;
 import org.neo4j.server.helpers.FunctionalTestHelper;
 import org.neo4j.server.rest.domain.GraphDbHelper;
-import org.neo4j.test.server.SharedServerTestBase;
 
-public class RemoveRelationshipFunctionalTest extends SharedServerTestBase
+public class RemoveRelationshipFunctionalTest extends AbstractRestFunctionalTestBase
 {
     private static FunctionalTestHelper functionalTestHelper;
     private static GraphDbHelper helper;

diff --git a/server/src/functionaltest/java/org/neo4j/server/rest/RetrieveNodeFunctionalTest.java b/server/src/functionaltest/java/org/neo4j/server/rest/RetrieveNodeFunctionalTest.java
@@ -39,18 +39,15 @@
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 import org.neo4j.kernel.impl.annotations.Documented;
 import org.neo4j.server.helpers.FunctionalTestHelper;
 import org.neo4j.server.rest.RESTDocsGenerator.ResponseEntity;
 import org.neo4j.server.rest.domain.GraphDbHelper;
 import org.neo4j.server.rest.domain.JsonHelper;
 import org.neo4j.server.rest.repr.formats.CompactJsonFormat;
-import org.neo4j.test.TestData;
-import org.neo4j.test.server.SharedServerTestBase;
 
-public class RetrieveNodeFunctionalTest extends SharedServerTestBase
+public class RetrieveNodeFunctionalTest extends AbstractRestFunctionalTestBase
 {
     private URI nodeUri;
     private static FunctionalTestHelper functionalTestHelper;
@@ -69,10 +66,6 @@ public void cleanTheDatabaseAndInitialiseTheNodeUri() throws Exception
                 + new GraphDbHelper( server().getDatabase() ).createNode() );
     }
 
-    public
-    @Rule
-    TestData<RESTDocsGenerator> gen = TestData.producedThrough( RESTDocsGenerator.PRODUCER );
-
     @Test
     public void shouldParameteriseUrisInNodeRepresentationWithHostHeaderValue() throws Exception
     {

diff --git a/...unctionaltest/java/org/neo4j/server/rest/RetrieveRelationshipsFromNodeFunctionalTest.java b/...unctionaltest/java/org/neo4j/server/rest/RetrieveRelationshipsFromNodeFunctionalTest.java
@@ -39,7 +39,6 @@
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 import org.neo4j.kernel.impl.annotations.Documented;
 import org.neo4j.server.database.DatabaseBlockedException;
@@ -48,10 +47,8 @@
 import org.neo4j.server.rest.domain.JsonHelper;
 import org.neo4j.server.rest.domain.JsonParseException;
 import org.neo4j.server.rest.repr.RelationshipRepresentationTest;
-import org.neo4j.test.TestData;
-import org.neo4j.test.server.SharedServerTestBase;
 
-public class RetrieveRelationshipsFromNodeFunctionalTest extends SharedServerTestBase
+public class RetrieveRelationshipsFromNodeFunctionalTest extends AbstractRestFunctionalTestBase
 {
     private long nodeWithRelationships;
     private long nodeWithoutRelationships;
@@ -85,10 +82,6 @@ private void createSimpleGraph()
         nonExistingNode = nodeWithoutRelationships * 100;
     }
 
-    public
-    @Rule
-    TestData<RESTDocsGenerator> gen = TestData.producedThrough( RESTDocsGenerator.PRODUCER );
-
     private JaxRsResponse sendRetrieveRequestToServer( long nodeId, String path )
     {
         return RestRequest.req().get( functionalTestHelper.nodeUri() + "/" + nodeId + "/relationships" + path );