update to Neo4j and latest framework continued

.travis.yml

@@ -2,7 +2,6 @@ language: java
 
 jdk:
   - oraclejdk8
-  - oraclejdk7
 
 sudo: true
 

pom.xml

@@ -18,12 +18,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>timetree</artifactId>
-    <version>3.0.0.37.25-SNAPSHOT</version>
+    <version>3.0.0.38.25-SNAPSHOT</version>
 
     <parent>
         <groupId>com.graphaware.neo4j</groupId>
         <artifactId>module-parent</artifactId>
-        <version>3.0.0.37</version>
+        <version>3.0.0.38</version>
     </parent>
 
     <name>GraphAware TimeTree Module</name>
@@ -101,7 +101,7 @@
             <groupId>com.graphaware.neo4j</groupId>
             <artifactId>resttest</artifactId>
             <scope>test</scope>
-            <version>3.0.0.37.13</version>
+            <version>3.0.0.38.13</version>
         </dependency>
 
         <dependency>

src/test/java/com/graphaware/module/timetree/CustomRootTimeTreeTest.java

@@ -21,6 +21,7 @@
 import com.graphaware.module.timetree.domain.TimeTreeLabels;
 import com.graphaware.test.data.DatabasePopulator;
 import com.graphaware.test.data.SingleTransactionPopulator;
+import com.graphaware.test.integration.EmbeddedDatabaseIntegrationTest;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.junit.Test;
@@ -37,7 +38,7 @@
 /**
  * Unit test for {@link com.graphaware.module.timetree.SingleTimeTree}.
  */
-public class CustomRootTimeTreeTest extends ServerIntegrationTest {
+public class CustomRootTimeTreeTest extends EmbeddedDatabaseIntegrationTest {
 
     private static final DateTimeZone UTC = DateTimeZone.forTimeZone(TimeZone.getTimeZone("UTC"));
 
@@ -46,7 +47,7 @@ protected DatabasePopulator databasePopulator() {
         return new SingleTransactionPopulator() {
             @Override
             protected void doPopulate(GraphDatabaseService database) {
-                database.createNode(DynamicLabel.label("CustomRoot"));
+                database.createNode(Label.label("CustomRoot"));
             }
         };
     }

src/test/java/com/graphaware/module/timetree/SingleTimeTreeTest.java

@@ -19,6 +19,7 @@
 import com.graphaware.common.util.PropertyContainerUtils;
 import com.graphaware.module.timetree.domain.TimeInstant;
 import com.graphaware.module.timetree.domain.TimeTreeLabels;
+import com.graphaware.test.integration.EmbeddedDatabaseIntegrationTest;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.junit.Before;
@@ -31,15 +32,14 @@
 
 import static com.graphaware.module.timetree.SingleTimeTree.VALUE_PROPERTY;
 import static com.graphaware.module.timetree.domain.Resolution.*;
-import com.graphaware.test.integration.ServerIntegrationTest;
 import static com.graphaware.test.unit.GraphUnit.assertSameGraph;
 import static org.junit.Assert.*;
 import static org.neo4j.graphdb.DynamicRelationshipType.withName;
 
 /**
  * Unit test for {@link SingleTimeTree}.
  */
-public class SingleTimeTreeTest extends ServerIntegrationTest {
+public class SingleTimeTreeTest extends EmbeddedDatabaseIntegrationTest {
 
     private TimeTree timeTree; //class under test
 

src/test/java/com/graphaware/module/timetree/TimeTreeBackedEventsTest.java

@@ -19,6 +19,7 @@
 import com.graphaware.module.timetree.domain.Event;
 import com.graphaware.module.timetree.domain.Resolution;
 import com.graphaware.module.timetree.domain.TimeInstant;
+import com.graphaware.test.integration.EmbeddedDatabaseIntegrationTest;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.junit.Before;
@@ -32,18 +33,17 @@
 
 import static com.graphaware.module.timetree.domain.Resolution.MONTH;
 import static com.graphaware.module.timetree.domain.Resolution.YEAR;
-import com.graphaware.test.integration.ServerIntegrationTest;
 import static com.graphaware.test.unit.GraphUnit.assertSameGraph;
 import static org.junit.Assert.*;
 import static org.neo4j.graphdb.Direction.BOTH;
 import static org.neo4j.graphdb.Direction.OUTGOING;
-import static org.neo4j.graphdb.DynamicRelationshipType.withName;
+import static org.neo4j.graphdb.RelationshipType.*;
 import static org.neo4j.helpers.collection.Iterables.count;
 
 /**
  * Unit test for {@link com.graphaware.module.timetree.TimeTreeBackedEvents}.
  */
-public class TimeTreeBackedEventsTest extends ServerIntegrationTest {
+public class TimeTreeBackedEventsTest extends EmbeddedDatabaseIntegrationTest {
 
     private static final RelationshipType AT_TIME = withName("AT_TIME");
     private static final RelationshipType AT_OTHER_TIME = withName("AT_OTHER_TIME");

src/test/java/com/graphaware/module/timetree/module/TimeTreeModuleMultiRootProgrammaticTest.java

@@ -37,16 +37,18 @@
 import static com.graphaware.module.timetree.domain.Resolution.MONTH;
 import com.graphaware.test.integration.EmbeddedDatabaseIntegrationTest;
 import static com.graphaware.test.unit.GraphUnit.assertSameGraph;
+import static org.neo4j.graphdb.Label.*;
+
 import java.io.File;
 
 /**
  * Test for {@link TimeTreeModule} set up programatically.
  */
 public class TimeTreeModuleMultiRootProgrammaticTest extends EmbeddedDatabaseIntegrationTest {
 
-    private static final Label Email = DynamicLabel.label("Email");
-    private static final Label Event = DynamicLabel.label("Event");
-    private static final Label CustomRoot = DynamicLabel.label("CustomRoot");
+    private static final Label Email = label("Email");
+    private static final Label Event = label("Event");
+    private static final Label CustomRoot = label("CustomRoot");
     private static final long TIMESTAMP;
 
     static {

src/test/java/com/graphaware/module/timetree/module/TimeTreeModuleSingleRootProgrammaticTest.java

@@ -39,15 +39,17 @@
 import static com.graphaware.module.timetree.domain.Resolution.MONTH;
 import com.graphaware.test.integration.EmbeddedDatabaseIntegrationTest;
 import static com.graphaware.test.unit.GraphUnit.assertSameGraph;
+import static org.neo4j.graphdb.Label.*;
+
 import java.io.File;
 
 /**
  * Test for {@link com.graphaware.module.timetree.module.TimeTreeModule} set up programatically.
  */
 public class TimeTreeModuleSingleRootProgrammaticTest extends EmbeddedDatabaseIntegrationTest {
 
-    private static final Label Email = DynamicLabel.label("Email");
-    private static final Label Event = DynamicLabel.label("Event");
+    private static final Label Email = label("Email");
+    private static final Label Event = label("Event");
     private static final long TIMESTAMP;
 
     static {