feature[ats_0B926]: Upgrade to Eclipse 4.3

Remove EMF compare use
Update tests for junit 4.11.0
Update launch configs
Update google guava version ranges
Fix server demo data deployment

Change-Id: I388aafb3caaaf0791a01978a4ee49acb07decebe

3 files changed, 21 insertions, 20 deletions

diff --git a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OseeDatabase.java b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OseeDatabase.java
index 667e884630b..b8de8cef3c7 100644
--- a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OseeDatabase.java
+++ b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OseeDatabase.java
@@ -12,14 +12,14 @@ package org.eclipse.osee.orcs.db.mock;
 
 import org.eclipse.osee.orcs.db.mock.internal.TestDatabase;
 import org.junit.Assert;
-import org.junit.rules.MethodRule;
-import org.junit.runners.model.FrameworkMethod;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 
 /**
  * @author Roberto E. Escobar
  */
-public class OseeDatabase implements MethodRule {
+public class OseeDatabase implements TestRule {
 
    private final String connectionId;
 
@@ -28,12 +28,12 @@ public class OseeDatabase implements MethodRule {
    }
 
    @Override
-   public Statement apply(final Statement base, final FrameworkMethod method, final Object target) {
+   public Statement apply(final Statement base, final Description description) {
       return new Statement() {
          @Override
          public void evaluate() throws Throwable {
             Assert.assertNotNull("Connection Id cannot be null", connectionId);
-            TestDatabase db = new TestDatabase(connectionId, method, target);
+            TestDatabase db = new TestDatabase(connectionId, description.getTestClass().getSimpleName(), description.getMethodName());
             try {
                db.initialize();
                base.evaluate();
@@ -41,7 +41,6 @@ public class OseeDatabase implements MethodRule {
                db.cleanup();
             }
          }
-
       };
    }
 }
diff --git a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OsgiRule.java b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OsgiRule.java
index 9dabc96f42b..2a8fbfe5745 100644
--- a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OsgiRule.java
+++ b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OsgiRule.java
@@ -16,10 +16,13 @@ import java.util.Map;
 import org.eclipse.osee.framework.jdk.core.util.annotation.AnnotationProcessor;
 import org.eclipse.osee.framework.jdk.core.util.annotation.FieldAnnotationHandler;
 import org.eclipse.osee.orcs.db.mock.internal.OsgiServiceFieldAnnotationHandler;
-import org.junit.rules.TestWatchman;
-import org.junit.runners.model.FrameworkMethod;
+import org.junit.rules.TestWatcher;
+import org.junit.runner.Description;
 
-public class OsgiRule extends TestWatchman {
+/**
+ * @author Roberto E. Escobar
+ */
+public class OsgiRule extends TestWatcher {
 
    private static final AnnotationProcessor processor = createProcessor();
    private final Object[] objects;
@@ -29,7 +32,8 @@ public class OsgiRule extends TestWatchman {
    }
 
    @Override
-   public void starting(FrameworkMethod method) {
+   protected void starting(Description description) {
+      super.starting(description);
       try {
          processor.initAnnotations(objects);
       } catch (Exception ex) {
diff --git a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java
index 8b48c7fa2f8..59027fceafa 100644
--- a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java
+++ b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java
@@ -24,7 +24,6 @@ import org.eclipse.osee.framework.jdk.core.util.network.PortUtil;
 import org.eclipse.osee.hsqldb.HyperSqlDbServer;
 import org.eclipse.osee.orcs.db.mock.OseeDatabase;
 import org.junit.Assert;
-import org.junit.runners.model.FrameworkMethod;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
@@ -35,23 +34,22 @@ import org.osgi.framework.ServiceRegistration;
  */
 public class TestDatabase {
 
-   private final FrameworkMethod method;
-   private final Object target;
+   private final String className;
+   private final String methodName;
 
    private ServiceRegistration<?> registration;
    private File tempFolder;
    private final String connectionId;
 
-   public TestDatabase(String connectionId, FrameworkMethod method, Object target) {
+   public TestDatabase(String connectionId, String className, String methodName) {
       this.connectionId = connectionId;
-      this.method = method;
-      this.target = target;
+      this.className = className;
+      this.methodName = methodName;
    }
 
-   private File createTempFolder(FrameworkMethod method, Object target) {
+   private File createTempFolder() {
       String tempDir = System.getProperty("user.home");
-      String folderName =
-         String.format("%s_%s_%s", target.getClass().getSimpleName(), method.getName(), Lib.getDateTimeString());
+      String folderName = String.format("%s_%s_%s", className, methodName, Lib.getDateTimeString());
       File tempFolder = new File(tempDir, folderName);
       tempFolder.mkdir();
       return tempFolder;
@@ -65,7 +63,7 @@ public class TestDatabase {
          bundle.start();
       }
 
-      tempFolder = createTempFolder(method, target);
+      tempFolder = createTempFolder();
       Assert.assertNotNull("TempFolder cannot be null", tempFolder);
 
       addResource(tempFolder, bundle, "data/hsql.zip");