From 9bdb72bf0f4eab71f82f10b6a170dcb28b4c7498 Mon Sep 17 00:00:00 2001
From: bicouy0 <github@bicou.com>
Date: Fri, 11 Dec 2015 14:52:55 +0100
Subject: [PATCH] disable classname prefixing

* OrientGraphFactory.setLabelAsClassName() to disable the default prefixing of classnames with V_ or E_
* OrientGraph.labelToClassName() and OrientGraph.classNameToLabel() helpers
* OrientGraph.getEdgeIndexedKeys() and OrientGraph.getVertexIndexedKeys() verify the super class
* OrientGraph.createClass() throws if creating the same class with a different base class
* test suites modified
---
 .../gremlin/orientdb/OrientElement.java       |   2 +-
 .../gremlin/orientdb/OrientGraph.java         |  55 +++-
 .../gremlin/orientdb/OrientGraphFactory.java  |  13 +
 .../gremlin/orientdb/OrientVertex.java        |   3 +-
 .../step/sideEffect/OrientGraphStep.java      |   2 +-
 .../gremlin/orientdb/OrientGraphTest.java     |  21 ++
 tests-scala/src/test/scala/OrientSpec.scala   | 255 ++---------------
 .../src/test/scala/OrientSpecBehaviours.scala | 256 ++++++++++++++++++
 8 files changed, 361 insertions(+), 246 deletions(-)
 create mode 100644 tests-scala/src/test/scala/OrientSpecBehaviours.scala

diff --git a/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientElement.java b/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientElement.java
index 89ca83aa..76f9dbba 100644
--- a/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientElement.java
+++ b/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientElement.java
@@ -44,7 +44,7 @@ public ORID id() {
     public String label() {
         String internalClassName = getRawDocument().getClassName();
         // User labels on edges/vertices are prepended with E_ or V_ . The user should not see that.
-        return internalClassName.length() == 1 ? INTERNAL_CLASSES_TO_TINKERPOP_CLASSES.get(internalClassName) : internalClassName.substring(2);
+        return internalClassName.length() == 1 ? INTERNAL_CLASSES_TO_TINKERPOP_CLASSES.get(internalClassName) : graph.classNameToLabel(internalClassName);
     }
 
     public Graph graph() {
diff --git a/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraph.java b/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraph.java
index b6b012c1..91a57b75 100644
--- a/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraph.java
+++ b/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraph.java
@@ -66,6 +66,7 @@ public final class OrientGraph implements Graph {
     public static String CONFIG_OPEN = "orient-open";
     public static String CONFIG_TRANSACTIONAL = "orient-transactional";
     public static String CONFIG_POOL_SIZE = "orient-max-poolsize";
+    public static String CONFIG_LABEL_AS_CLASSNAME = "orient-label-as-classname";
 
     protected final ODatabaseDocumentTx database;
     protected final Features features;
@@ -127,9 +128,7 @@ public Vertex addVertex(Object... keyValues) {
         if (ElementHelper.getIdValue(keyValues).isPresent()) throw Vertex.Exceptions.userSuppliedIdsNotSupported();
 
         String label = ElementHelper.getLabelValue(keyValues).orElse(OImmutableClass.VERTEX_CLASS_NAME);
-        String className = label.equals(OImmutableClass.VERTEX_CLASS_NAME) ?
-            OImmutableClass.VERTEX_CLASS_NAME :
-            OImmutableClass.VERTEX_CLASS_NAME + "_" + label;
+        String className = labelToClassName(label, OImmutableClass.VERTEX_CLASS_NAME);
         OrientVertex vertex = new OrientVertex(this, className);
         vertex.property(keyValues);
 
@@ -166,6 +165,26 @@ public Iterator<Vertex> vertices(Object... vertexIds) {
             vertexIds);
     }
 
+    /**
+     * Convert a label to orientdb class name
+     */
+    public String labelToClassName(String label, String prefix) {
+    	if (configuration.getBoolean(CONFIG_LABEL_AS_CLASSNAME, false)) {
+        	return label;
+    	}
+		return label.equals(prefix) ? prefix : prefix + "_" + label;
+    }
+    
+    /**
+     * Convert a orientdb class name to label
+     */
+    public String classNameToLabel(String className) {
+    	if (configuration.getBoolean(CONFIG_LABEL_AS_CLASSNAME, false)) {
+        	return className;
+    	}
+    	return className.substring(2);
+    }    
+
     protected Object convertValue(final OIndex<?> idx, Object iValue) {
         if (iValue != null) {
             final OType[] types = idx.getKeyTypes();
@@ -209,6 +228,10 @@ public Stream<OrientVertex> getIndexedVertices(OIndex<Object> index, Optional<Ob
     private OIndexManager getIndexManager() {
         return database.getMetadata().getIndexManager();
     }
+    
+    private OSchema getSchema() {
+    	return database.getMetadata().getSchema();
+    }
 
 
     public Set<String> getIndexedKeys(String className) {
@@ -241,11 +264,21 @@ public Set<String> getIndexedKeys(final Class<? extends Element> elementClass) {
     }
 
     public Set<String> getVertexIndexedKeys(final String label) {
-        return getIndexedKeys(OImmutableClass.VERTEX_CLASS_NAME + "_" + label);
+        String className = labelToClassName(label, OImmutableClass.VERTEX_CLASS_NAME);
+    	OClass cls = getSchema().getClass(className);
+    	if (cls != null && cls.isSubClassOf(OImmutableClass.VERTEX_CLASS_NAME)) {
+    		return getIndexedKeys(className);
+    	}
+		return new HashSet<String>();
     }
 
     public Set<String> getEdgeIndexedKeys(final String label) {
-        return getIndexedKeys(OImmutableClass.EDGE_CLASS_NAME + "_" + label);
+        String className = labelToClassName(label, OImmutableClass.EDGE_CLASS_NAME);
+    	OClass cls = getSchema().getClass(className);
+    	if (cls != null && cls.isSubClassOf(OImmutableClass.EDGE_CLASS_NAME)) {
+    		return getIndexedKeys(className);
+    	}
+    	return new HashSet<String>();
     }
 
     @Override
@@ -438,7 +471,8 @@ public void createClass(final String className, final String superClassName) {
     public void createClass(final String className, final OClass superClass) {
         makeActive();
         OSchemaProxy schema = database.getMetadata().getSchema();
-        if (schema.getClass(className) == null) {
+        OClass cls = schema.getClass(className);
+        if (cls == null) {
             try
             {
               schema.createClass(className, superClass);
@@ -449,6 +483,11 @@ public void createClass(final String className, final OClass superClass) {
             }
             OLogManager.instance().info(this, "created class '" + className + "' as subclass of '" + superClass + "'");
         }
+        else {
+        	if (!cls.isSubClassOf(superClass)) {
+                throw new IllegalArgumentException("unable to create class '" + className + "' as subclass of '" + superClass + "'. different super class.");        		
+        	}
+        }
     }
 
     public ODatabaseDocumentTx getRawDatabase() {
@@ -500,14 +539,14 @@ protected void prepareIndexConfiguration(Configuration config) {
 
 
     public <E extends Element> void createVertexIndex(final String key, final String label, final Configuration configuration) {
-        String className = OrientVertexType.CLASS_NAME + "_" + label;
+        String className = labelToClassName(label, OrientVertexType.CLASS_NAME);
         createVertexClass(className);
         createIndex(key, className, configuration);
     }
 
 
     public <E extends Element> void createEdgeIndex(final String key, final String label, final Configuration configuration) {
-        String className = OrientEdgeType.CLASS_NAME + "_" + label;
+        String className = labelToClassName(label, OrientEdgeType.CLASS_NAME);
         createEdgeClass(className);
         createIndex(key, className, configuration);
     }
diff --git a/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraphFactory.java b/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraphFactory.java
index a77bf111..1c21b2d5 100644
--- a/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraphFactory.java
+++ b/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraphFactory.java
@@ -17,6 +17,7 @@ public final class OrientGraphFactory {
     protected final String password;
     protected Configuration configuration;
     protected volatile OPartitionedDatabasePool pool;
+    protected boolean labelAsClassName;
 
     public OrientGraphFactory(String url) {
         this(url, ADMIN, ADMIN);
@@ -26,6 +27,7 @@ public OrientGraphFactory(String url, String user, String password) {
         this.url = url;
         this.user = user;
         this.password = password;
+        this.labelAsClassName = false;
     }
 
     public OrientGraphFactory(Configuration config) {
@@ -104,6 +106,7 @@ protected Configuration getConfiguration(boolean create, boolean open, boolean t
                 setProperty(OrientGraph.CONFIG_CREATE, create);
                 setProperty(OrientGraph.CONFIG_OPEN, open);
                 setProperty(OrientGraph.CONFIG_TRANSACTIONAL, transactional);
+                setProperty(OrientGraph.CONFIG_LABEL_AS_CLASSNAME, labelAsClassName);
             }};
     }
 
@@ -121,6 +124,16 @@ protected ODatabaseDocumentTx getDatabase(boolean create, boolean open) {
         return db;
     }
 
+    /**
+     * Enable or disable the prefixing of class names with V_<label> for vertices or E_<label> for edges.
+     * 
+     * @param is	if true classname equals label, if false classname is prefixed with V_ or E_ (default)
+     */
+    public OrientGraphFactory setLabelAsClassName(boolean is) {
+        this.labelAsClassName = is;
+        return this;
+    }
+
     /**
      * Setting up the factory to use database pool instead of creation a new instance of database connection each time.
      */
diff --git a/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientVertex.java b/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientVertex.java
index 1522940a..c70c4e0d 100644
--- a/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientVertex.java
+++ b/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/OrientVertex.java
@@ -183,8 +183,7 @@ public Edge addEdge(String label, Vertex inVertex, Object... keyValues) {
             throw new IllegalStateException("label cannot be null");
 
         // CREATE THE EDGE DOCUMENT TO STORE FIELDS TOO
-        String className = label.equals(OImmutableClass.EDGE_CLASS_NAME) ?
-            OImmutableClass.EDGE_CLASS_NAME : OImmutableClass.EDGE_CLASS_NAME + "_" + label;
+        String className = graph.labelToClassName(label, OImmutableClass.EDGE_CLASS_NAME);
         edge = new OrientEdge(graph, className, outDocument, inDocument, label);
         edge.property(keyValues);
 
diff --git a/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/traversal/step/sideEffect/OrientGraphStep.java b/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/traversal/step/sideEffect/OrientGraphStep.java
index d2ea6f61..f590e5eb 100644
--- a/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/traversal/step/sideEffect/OrientGraphStep.java
+++ b/driver/src/main/java/org/apache/tinkerpop/gremlin/orientdb/traversal/step/sideEffect/OrientGraphStep.java
@@ -118,7 +118,7 @@ public Optional<OrientIndexQuery> findIndex() {
             String key = indexedKeyAndValue.get().getValue0();
             Object value = indexedKeyAndValue.get().getValue1();
 
-            String className = OImmutableClass.VERTEX_CLASS_NAME + '_' + elementLabel.get();
+            String className = graph.labelToClassName(elementLabel.get(), OImmutableClass.VERTEX_CLASS_NAME);
             Set<OIndex<?>> classIndexes = indexManager.getClassIndexes(className);
             Iterator<OIndex<?>> keyIndexes = classIndexes.stream().filter(idx -> idx.getDefinition().getFields().contains(key)).iterator();
 
diff --git a/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraphTest.java b/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraphTest.java
index 81f9a7f3..569d2878 100644
--- a/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraphTest.java
+++ b/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraphTest.java
@@ -21,6 +21,7 @@
 import org.apache.tinkerpop.gremlin.structure.Transaction;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.VertexProperty;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class OrientGraphTest {
@@ -148,6 +149,26 @@ public void testPooledTransactionalGraph() throws Exception {
         graph.close();
     }
 
+    @Test
+    public void testUnprefixedLabelGraph() throws Exception {
+        Graph graph = graphFactory().setLabelAsClassName(true).getNoTx();
+        assertEquals(true, graph.configuration().getBoolean(OrientGraph.CONFIG_LABEL_AS_CLASSNAME));
+        
+        performBasicTests(graph);
+
+        Vertex vertex = graph.addVertex("VERTEX_LABEL");
+        assertEquals("VERTEX_LABEL", vertex.label());
+
+        try {
+            graph.addVertex("EDGE_LABEL");
+            Assert.fail("must throw unable to create different super class");
+        } catch (IllegalArgumentException e) {
+            // ok
+        }
+        
+        graph.close();
+    }
+
     protected void performBasicTests(Graph graph) {
         Vertex vertex = graph.addVertex();
         assertNotNull(vertex);
diff --git a/tests-scala/src/test/scala/OrientSpec.scala b/tests-scala/src/test/scala/OrientSpec.scala
index 68f81daf..27bad62a 100644
--- a/tests-scala/src/test/scala/OrientSpec.scala
+++ b/tests-scala/src/test/scala/OrientSpec.scala
@@ -1,96 +1,14 @@
-import java.util.{ ArrayList ⇒ JArrayList }
-
-import com.orientechnologies.orient.core.sql.query.OResultSet
 import gremlin.scala._
 import org.apache.tinkerpop.gremlin.orientdb._
-import org.scalatest.{ BeforeAndAfterEach, BeforeAndAfterAll, ShouldMatchers, WordSpec }
-
-import scala.collection.JavaConversions._
 
-class OrientSpec extends WordSpec with ShouldMatchers with BeforeAndAfterEach {
+class OrientSpec extends OrientSpecBehaviours {
 
   val graph = new OrientGraphFactory(s"memory:test-${math.random}")
     .setupPool(5)
     .getNoTx.asScala
   //  val graph = new OrientGraphFactory("remote:localhost/graphtest", "root", "root").getNoTx().asScala
-  val testLabel = "testLabel"
-  val testProperty = Key[String]("testProperty")
-
-  override def beforeEach(): Unit = {
-    graph.E.toList.foreach(_.remove())
-    graph.V.toList.foreach(_.remove())
-  }
-
-  "vertices" should {
-    "be found if they exist" in {
-      val v1 = graph.addVertex()
-      val v2 = graph.addVertex()
-      val v3 = graph.addVertex()
-
-      graph.V(v1.id, v3.id).toList should have length 2
-      graph.V().toList should have length 3
-    }
-
-    "not be found if they don't exist" in {
-      val list = graph.V("#3:999").toList
-      list should have length 0
-    }
-
-    "set property after creation" in {
-      val v = graph + (testLabel, testProperty -> "testValue1")
-
-      // v.property(testProperty).value shouldBe "testValue1"
-      graph.V(v.id).value(testProperty).head shouldBe "testValue1"
-    }
-
-    "set property during creation" in {
-      val property1 = "key1" → "value1"
-      val property2 = "key2" → "value2"
-      val v = graph.addVertex(Map(property1, property2))
-      graph.V(v.id).values[String]("key1", "key2").toList shouldBe List("value1", "value2")
-    }
-
-    "delete property" in {
-      val v = graph.addVertex()
-      val key = "testProperty"
-      v.setProperty(testProperty, "testValue1")
-      v.property(testProperty).value shouldBe "testValue1"
-      v.removeProperty(testProperty)
-      intercept[IllegalStateException] {
-        v.property(testProperty).value
-      }
-    }
-
-    "use labels" in {
-      val v1 = graph.addVertex("label1")
-      val v2 = graph.addVertex("label2")
-      val v3 = graph.addVertex()
-
-      val labels = graph.V.label.toSet
-      // labels should have size 2
-      labels should contain("label1")
-      labels should contain("label2")
-    }
-
-    "delete" in {
-      val v1 = graph.addVertex()
-      val v2 = graph.addVertex()
-      graph.V().toList.size shouldBe 2
-      graph.V().toList.foreach(_.remove())
-      graph.V().toList.size shouldBe 0
-    }
-  }
 
   "edges" should {
-    "be found if they exist" in {
-      val v1 = graph.addVertex()
-      val v2 = graph.addVertex()
-      val e1 = v1.addEdge("label1", v2)
-      val e2 = v2.addEdge("label2", v1)
-
-      graph.E(e2.id).toList should have length 1
-      graph.E().toList should have length 2
-    }
 
     "be found if they have the same label as vertices" in {
       val label = "label"
@@ -102,162 +20,31 @@ class OrientSpec extends WordSpec with ShouldMatchers with BeforeAndAfterEach {
       graph.E(e2.id).toList should have length 1
       graph.E().toList should have length 2
     }
-
-    "not be found if they don't exist" in {
-      val list = graph.E("#3:999").toList
-      list should have length 0
-    }
-
-    "set property after creation" in {
-      val v1 = graph.addVertex()
-      val v2 = graph.addVertex()
-      val e = v1.addEdge("label1", v2)
-
-      e.setProperty(testProperty, "testValue1")
-
-      e.property(testProperty).value shouldBe "testValue1"
-      graph.E(e.id).value(testProperty).head shouldBe "testValue1"
-    }
-
-    "set property during creation" in {
-      val v1 = graph.addVertex()
-      val v2 = graph.addVertex()
-
-      val e = v1 --- ("label1", testProperty -> "testValueEdge") --> v2
-      graph.E(e.id).value(testProperty).head shouldBe "testValueEdge"
-    }
-
-    "delete" in {
-      val v1 = graph.addVertex()
-      val v2 = graph.addVertex()
-      val e1 = v1.addEdge("label1", v2)
-      val e2 = v2.addEdge("label2", v1)
-
-      graph.E(e1.id).toList should have length 1
-      graph.E(e1.id).head().remove()
-      graph.E(e1.id).toList should have length 0
-
-      v1.outE("label1").toList() should have length 0
-    }
-
-    "do not delete entry if there are multiple edges" in {
-      val v1 = graph.addVertex()
-      val v2 = graph.addVertex()
-      val e1 = v1.addEdge("label1", v2)
-      val e2 = v1.addEdge("label1", v1)
-
-      graph.E(e1.id).toList should have length 1
-      graph.E(e1.id).head().remove()
-      graph.E(e1.id).toList should have length 0
-
-      v1.outE("label1").toList() should have length 1
-    }
-
-    "be removed if vertex is deleted" in {
-      val v1 = graph.addVertex()
-      val v2 = graph.addVertex()
-      val e1 = v1.addEdge("label1", v2)
-      val e2 = v2.addEdge("label2", v1)
-
-      v2.inE("label1").toList() should have length 1
-      v2.outE("label2").toList() should have length 1
-
-      v1.remove();
-      v2.inE("label1").toList() should have length 0
-      v2.outE("label2").toList() should have length 0
-    }
   }
+}
 
-  "traversals" should {
-    "follow outE" in new TinkerpopFixture {
-      def traversal = graph.V(marko.id).outE
-      traversal.label.toSet shouldBe Set("knows", "created")
-      traversal.label.toList should have size 3
-    }
-
-    "follow outE for a label" in new TinkerpopFixture {
-      def traversal = graph.V(marko.id).outE("knows")
-      traversal.label.toSet shouldBe Set("knows")
-      traversal.label.toList should have size 2
-    }
-
-    "follow inV" in new TinkerpopFixture {
-      def traversal = graph.V(marko.id).outE.inV
-      traversal.value[String]("name").toSet shouldBe Set("vadas", "josh", "lop")
-    }
-
-    "follow out" in new TinkerpopFixture {
-      def traversal = graph.V(marko.id).out
-      traversal.value[String]("name").toSet shouldBe Set("vadas", "josh", "lop")
-    }
-
-    "follow out for a label" in new TinkerpopFixture {
-      def traversal = graph.V(marko.id).out("knows")
-      traversal.value[String]("name").toSet shouldBe Set("vadas", "josh")
-    }
-
-    "follow in" in new TinkerpopFixture {
-      def traversal = graph.V(josh.id).in
-      traversal.value[String]("name").toSet shouldBe Set("marko")
-    }
-
-    "follow inE" in new TinkerpopFixture {
-      def traversal = graph.V(josh.id).inE
-      traversal.label.toSet shouldBe Set("knows")
-    }
-
-    "value" in new TinkerpopFixture {
-      def traversal = graph.V(marko.id).out.value[Int]("age") //.filter(_.value[Int]
-      traversal.toSet shouldBe Set(27, 32)
-    }
-
-    "properties" in new TinkerpopFixture {
-      def traversal = graph.V(marko.id).out.properties("age")
-      traversal.toSet.map(_.value) shouldBe Set(27, 32)
-    }
+class OrientSpecUnprefixed extends OrientSpecBehaviours {
+  
+  val graph = new OrientGraphFactory(s"memory:test-${math.random}")
+    .setupPool(5)
+    .setLabelAsClassName(true)
+    .getNoTx.asScala
 
-    "filter" in new TinkerpopFixture {
-      def traversal = graph.V(marko.id).out.filter(_.property[Int]("age").orElse(0) > 30)
-      traversal.value[String]("name").toSet shouldBe Set("josh")
-    }
-  }
+  override val vertexLabel1 = "vlabel1"
+  override val vertexLabel2 = "vlabel2"
+  override val edgeLabel1 = "elabel1"
+  override val edgeLabel2 = "elabel2"
 
-  "execute arbitrary OrientSQL" in {
-    (1 to 20) foreach { _ ⇒
-      graph.addVertex()
-    }
+  "edges" should {
 
-    val results: Seq[_] = graph.asJava.executeSql("select from V limit 10") match {
-      case lst: JArrayList[_] ⇒ lst.toSeq
-      case r: OResultSet[_]   ⇒ r.iterator().toSeq
-      case other              ⇒ println(other.getClass()); println(other); ???
+    "fail if they have the same label as vertices" in {
+      val label = "label"
+      val v1 = graph.addVertex(label)
+      val v2 = graph.addVertex(label)
+      intercept[IllegalArgumentException] {
+        v1.addEdge(label, v2)
+      }
     }
-    results should have length 10
-  }
-
-  trait TinkerpopFixture {
-    val Person = "person"
-    val Software = "software"
-    val Knows = "knows"
-    val Created = "created"
-
-    val Name = Key[String]("name")
-    val Lang = Key[String]("lang")
-    val Age = Key[Int]("age")
-    val Weight = Key[Double]("weight")
-
-    val marko = graph + (Person, Name -> "marko", Age -> 29)
-    val vadas = graph + (Person, Name -> "vadas", Age -> 27)
-    val lop = graph + (Software, Name -> "lop", Lang -> "java")
-    val josh = graph + (Person, Name -> "josh", Age -> 32)
-    val ripple = graph + (Software, Name -> "ripple", Lang -> "java")
-    val peter = graph + (Person, Name -> "peter", Age -> 35)
-
-    marko --- (Knows, Weight -> 0.5d) --> vadas
-    marko --- (Knows, Weight -> 1.0d) --> josh
-    marko --- (Created, Weight -> 0.4d) --> lop
-    josh --- (Created, Weight -> 1.0d) --> ripple
-    josh --- (Created, Weight -> 0.4d) --> lop
-    peter --- (Created, Weight -> 0.2d) --> lop
   }
 }
+
diff --git a/tests-scala/src/test/scala/OrientSpecBehaviours.scala b/tests-scala/src/test/scala/OrientSpecBehaviours.scala
new file mode 100644
index 00000000..47e4bd5b
--- /dev/null
+++ b/tests-scala/src/test/scala/OrientSpecBehaviours.scala
@@ -0,0 +1,256 @@
+import java.util.{ ArrayList ⇒ JArrayList }
+
+import gremlin.scala._
+import com.orientechnologies.orient.core.sql.query.OResultSet
+import org.apache.tinkerpop.gremlin.orientdb._
+import org.scalatest.{ BeforeAndAfterEach, BeforeAndAfterAll, ShouldMatchers, WordSpec }
+
+import scala.collection.JavaConversions._
+
+abstract class OrientSpecBehaviours extends WordSpec with ShouldMatchers with BeforeAndAfterEach {
+
+  val graph: ScalaGraph[OrientGraph]
+
+  val testLabel = "testLabel"
+  val testProperty = Key[String]("testProperty")
+  
+  val vertexLabel1 = "label1"
+  val vertexLabel2 = "label2"
+  val edgeLabel1 = "label1"
+  val edgeLabel2 = "label2"
+    
+  override def beforeEach(): Unit = {
+    graph.E.toList.foreach(_.remove())
+    graph.V.toList.foreach(_.remove())
+  }
+
+  "vertices" should {
+    "be found if they exist" in {
+      val v1 = graph.addVertex()
+      val v2 = graph.addVertex()
+      val v3 = graph.addVertex()
+
+      graph.V(v1.id, v3.id).toList should have length 2
+      graph.V().toList should have length 3
+    }
+
+    "not be found if they don't exist" in {
+      val list = graph.V("#3:999").toList
+      list should have length 0
+    }
+
+    "set property after creation" in {
+      val v = graph + (testLabel, testProperty -> "testValue1")
+
+      // v.property(testProperty).value shouldBe "testValue1"
+      graph.V(v.id).value(testProperty).head shouldBe "testValue1"
+    }
+
+    "set property during creation" in {
+      val property1 = "key1" → "value1"
+      val property2 = "key2" → "value2"
+      val v = graph.addVertex(Map(property1, property2))
+      graph.V(v.id).values[String]("key1", "key2").toList shouldBe List("value1", "value2")
+    }
+
+    "delete property" in {
+      val v = graph.addVertex()
+      val key = "testProperty"
+      v.setProperty(testProperty, "testValue1")
+      v.property(testProperty).value shouldBe "testValue1"
+      v.removeProperty(testProperty)
+      intercept[IllegalStateException] {
+        v.property(testProperty).value
+      }
+    }
+
+    "use labels" in {
+      val v1 = graph.addVertex(vertexLabel1)
+      val v2 = graph.addVertex(vertexLabel2)
+      val v3 = graph.addVertex()
+
+      val labels = graph.V.label.toSet
+      // labels should have size 2
+      labels should contain(vertexLabel1)
+      labels should contain(vertexLabel2)
+    }
+
+    "delete" in {
+      val v1 = graph.addVertex()
+      val v2 = graph.addVertex()
+      graph.V().toList.size shouldBe 2
+      graph.V().toList.foreach(_.remove())
+      graph.V().toList.size shouldBe 0
+    }
+  }
+
+  "edges" should {
+    "be found if they exist" in {
+      val v1 = graph.addVertex()
+      val v2 = graph.addVertex()
+      val e1 = v1.addEdge(edgeLabel1, v2)
+      val e2 = v2.addEdge(edgeLabel2, v1)
+
+      graph.E(e2.id).toList should have length 1
+      graph.E().toList should have length 2
+    }
+
+    "not be found if they don't exist" in {
+      val list = graph.E("#3:999").toList
+      list should have length 0
+    }
+
+    "set property after creation" in {
+      val v1 = graph.addVertex()
+      val v2 = graph.addVertex()
+      val e = v1.addEdge(edgeLabel1, v2)
+
+      e.setProperty(testProperty, "testValue1")
+
+      e.property(testProperty).value shouldBe "testValue1"
+      graph.E(e.id).value(testProperty).head shouldBe "testValue1"
+    }
+
+    "set property during creation" in {
+      val v1 = graph.addVertex()
+      val v2 = graph.addVertex()
+
+      val e = v1 --- (edgeLabel1, testProperty -> "testValueEdge") --> v2
+      graph.E(e.id).value(testProperty).head shouldBe "testValueEdge"
+    }
+
+    "delete" in {
+      val v1 = graph.addVertex()
+      val v2 = graph.addVertex()
+      val e1 = v1.addEdge(edgeLabel1, v2)
+      val e2 = v2.addEdge(edgeLabel2, v1)
+
+      graph.E(e1.id).toList should have length 1
+      graph.E(e1.id).head().remove()
+      graph.E(e1.id).toList should have length 0
+
+      v1.outE(edgeLabel1).toList() should have length 0
+    }
+
+    "do not delete entry if there are multiple edges" in {
+      val v1 = graph.addVertex()
+      val v2 = graph.addVertex()
+      val e1 = v1.addEdge(edgeLabel1, v2)
+      val e2 = v1.addEdge(edgeLabel1, v1)
+
+      graph.E(e1.id).toList should have length 1
+      graph.E(e1.id).head().remove()
+      graph.E(e1.id).toList should have length 0
+
+      v1.outE(edgeLabel1).toList() should have length 1
+    }
+
+    "be removed if vertex is deleted" in {
+      val v1 = graph.addVertex()
+      val v2 = graph.addVertex()
+      val e1 = v1.addEdge(edgeLabel1, v2)
+      val e2 = v2.addEdge(edgeLabel2, v1)
+
+      v2.inE(edgeLabel1).toList() should have length 1
+      v2.outE(edgeLabel2).toList() should have length 1
+
+      v1.remove();
+      v2.inE(edgeLabel1).toList() should have length 0
+      v2.outE(edgeLabel2).toList() should have length 0
+    }
+  }
+
+  "traversals" should {
+    "follow outE" in new TinkerpopFixture {
+      def traversal = graph.V(marko.id).outE
+      traversal.label.toSet shouldBe Set("knows", "created")
+      traversal.label.toList should have size 3
+    }
+
+    "follow outE for a label" in new TinkerpopFixture {
+      def traversal = graph.V(marko.id).outE("knows")
+      traversal.label.toSet shouldBe Set("knows")
+      traversal.label.toList should have size 2
+    }
+
+    "follow inV" in new TinkerpopFixture {
+      def traversal = graph.V(marko.id).outE.inV
+      traversal.value[String]("name").toSet shouldBe Set("vadas", "josh", "lop")
+    }
+
+    "follow out" in new TinkerpopFixture {
+      def traversal = graph.V(marko.id).out
+      traversal.value[String]("name").toSet shouldBe Set("vadas", "josh", "lop")
+    }
+
+    "follow out for a label" in new TinkerpopFixture {
+      def traversal = graph.V(marko.id).out("knows")
+      traversal.value[String]("name").toSet shouldBe Set("vadas", "josh")
+    }
+
+    "follow in" in new TinkerpopFixture {
+      def traversal = graph.V(josh.id).in
+      traversal.value[String]("name").toSet shouldBe Set("marko")
+    }
+
+    "follow inE" in new TinkerpopFixture {
+      def traversal = graph.V(josh.id).inE
+      traversal.label.toSet shouldBe Set("knows")
+    }
+
+    "value" in new TinkerpopFixture {
+      def traversal = graph.V(marko.id).out.value[Int]("age") //.filter(_.value[Int]
+      traversal.toSet shouldBe Set(27, 32)
+    }
+
+    "properties" in new TinkerpopFixture {
+      def traversal = graph.V(marko.id).out.properties("age")
+      traversal.toSet.map(_.value) shouldBe Set(27, 32)
+    }
+
+    "filter" in new TinkerpopFixture {
+      def traversal = graph.V(marko.id).out.filter(_.property[Int]("age").orElse(0) > 30)
+      traversal.value[String]("name").toSet shouldBe Set("josh")
+    }
+  }
+
+  "execute arbitrary OrientSQL" in {
+    (1 to 20) foreach { _ ⇒
+      graph.addVertex()
+    }
+
+    val results: Seq[_] = graph.asJava.executeSql("select from V limit 10") match {
+      case lst: JArrayList[_] ⇒ lst.toSeq
+      case r: OResultSet[_]   ⇒ r.iterator().toSeq
+      case other              ⇒ println(other.getClass()); println(other); ???
+    }
+    results should have length 10
+  }
+
+  trait TinkerpopFixture {
+    val Person = "person"
+    val Software = "software"
+    val Knows = "knows"
+    val Created = "created"
+
+    val Name = Key[String]("name")
+    val Lang = Key[String]("lang")
+    val Age = Key[Int]("age")
+    val Weight = Key[Double]("weight")
+
+    val marko = graph + (Person, Name -> "marko", Age -> 29)
+    val vadas = graph + (Person, Name -> "vadas", Age -> 27)
+    val lop = graph + (Software, Name -> "lop", Lang -> "java")
+    val josh = graph + (Person, Name -> "josh", Age -> 32)
+    val ripple = graph + (Software, Name -> "ripple", Lang -> "java")
+    val peter = graph + (Person, Name -> "peter", Age -> 35)
+
+    marko --- (Knows, Weight -> 0.5d) --> vadas
+    marko --- (Knows, Weight -> 1.0d) --> josh
+    marko --- (Created, Weight -> 0.4d) --> lop
+    josh --- (Created, Weight -> 1.0d) --> ripple
+    josh --- (Created, Weight -> 0.4d) --> lop
+    peter --- (Created, Weight -> 0.2d) --> lop
+  }
+}
+