Permalink
Browse files

Merge branch 'master' of github.com:SepiaGroup/Neo4jRestNet

Conflicts:
	Neo4jRestNet/Core/Node.cs
	Neo4jRestNet/Core/Relationship.cs
	Neo4jRestNet/Core/StoreFactory.cs
	Neo4jRestNet/CypherPlugin/Cypher.cs
	Neo4jRestNet/GremlinPlugin/Gremlin.cs
	Neo4jRestNet/Neo4jRestNet.csproj
	Neo4jRestNet/Rest/Neo4jRestApi.cs
  • Loading branch information...
SepiaGroup committed Jan 18, 2012
2 parents 63bccc6 + 58b3a9a commit 8352e5be66acf75b30767526c4fb57e72c903662
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<connectionStrings>
- <add name="neo4j" connectionString="http://localhost:7474/db/data/" />
- <add name="neo4jGremlinExtension" connectionString="/ext/GremlinPlugin/graphdb/execute_script/" />
- <add name="neo4jCypherExtension" connectionString="/ext/CypherPlugin/graphdb/execute_query/" />
+ <add name="neo4j" connectionString="http://localhost:7474/db/data/" providerName="Neo4j" />
+ <add name="neo4jGremlinExtension" connectionString="/ext/GremlinPlugin/graphdb/execute_script/" providerName="Neo4j"/>
+ <add name="neo4jCypherExtension" connectionString="/ext/CypherPlugin/graphdb/execute_query/" providerName="Neo4j"/>
</connectionStrings>
<appSettings>
@@ -5,6 +5,7 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Neo4jRestNet.Core;
using System.Security.Cryptography;
+using Neo4jRestNet.Core.Implementation;
using Neo4jRestNet.GremlinPlugin;
namespace Neo4jRestNet.Test
@@ -16,6 +17,14 @@ namespace Neo4jRestNet.Test
public class EncryptedIDTest
{
+ [TestMethod]
+ public void GetNode()
+ {
+ var node = Node.GetNode(0);
+
+ Assert.AreEqual(node.Id, 0);
+ }
+
[TestMethod]
public void NewGEIDFromLong()
{
@@ -639,7 +639,7 @@ public IEnumerable<INode> ParseJson(string jsonNodes)
case JTokenType.Object:
nodes.Add(InitializeFromNodeJson(jo["root"].ToString(Formatting.None)));
break;
-
+
case JTokenType.Array:
nodes.AddRange(from JObject jsonNode in jo["root"] select InitializeFromNodeJson(jsonNode));
break;
@@ -74,7 +74,7 @@ public interface INode : IGraphObject
HttpStatusCode RemoveNodeFromIndex(long nodeId, Enum indexName, string key, object value);
HttpStatusCode RemoveNodeFromIndex(long nodeId, string indexName, Enum key, object value);
HttpStatusCode RemoveNodeFromIndex(long nodeId, Enum indexName, Enum key, object value);
-
+
IEnumerable<INode> ParseJson(string jsonNodes);
}
}
Oops, something went wrong.

0 comments on commit 8352e5b

Please sign in to comment.