Bug 487380: Setup Neon buildmaven

https://bugs.eclipse.org/bugs/show_bug.cgi?id=487380

Update the build for selection of stable or
bleeding-edge dependencies according to a new
NIGHTLY_DEPS Hudson configuration variable.

Update the build for the latest stable RCPTT
Runner Maven Plug-in for Eclipse Neon .

Updates for final API changes in Papyrus Neon M6
in the refactoring of UI-dependent APIs and the
replacement of integer visual IDs in the generated
diagrams with meaningful shared IDs.

Add the Papyrus C++ Library bundle to the codegen test bundle's
dependencies because it is required in the target platform to
resolve references from test models to the AnsiCLibrary.uml.

(master branch - java 8_64 required) 

Change-Id: Ic73c458c4822813516d8e8eed552e3656bbfc5e4
Co-authored-by: Remi Schnekenburger <remi.schnekenburger@cea.fr>
Signed-off-by: Remi Schnekenburger <remi.schnekenburger@cea.fr>
Signed-off-by: Christian W. Damus <give.a.damus@gmail.com>
Signed-off-by: Céline Janssens <Celine.Janssens@all4tec.net>

6 files changed, 63 insertions, 6 deletions

diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/AbstractEMFResourceTest.java b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/AbstractEMFResourceTest.java
new file mode 100644
index 000000000..14be0f9fd
--- /dev/null
+++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/AbstractEMFResourceTest.java
@@ -0,0 +1,60 @@
+/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   CEA LIST - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrusrt.umlrt.tooling.ui.tests.configuration;
+
+import java.util.List;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.util.Diagnostician;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.junit.Assert;
+
+/**
+ * Abstract test class for all EMF-based configuration models (property view, palettes, etc.)
+ * 
+ * @deprecated
+ * @use AbstractEMFResourceTest from o.e.p.junit.utils instead (available in Neon M7)
+ */
+public abstract class AbstractEMFResourceTest extends AbstractPapyrusTest {
+
+	/**
+	 * URI of the EMF resource to test
+	 * 
+	 * @return
+	 */
+	public abstract String getFileUri();
+
+	/**
+	 * do the validation checks on the EMF resource
+	 */
+	protected void doValidateResource() {
+		URI createPlatformPluginURI = URI.createPlatformPluginURI(getFileUri(), true);
+		Resource resource = new ResourceSetImpl().getResource(createPlatformPluginURI, true);
+		Diagnostic diagnostic = Diagnostician.INSTANCE.validate(resource.getContents().get(0));
+		Assert.assertEquals("The constraint model is not valid: " + printDiagnostic(diagnostic), Diagnostic.OK, diagnostic.getSeverity());
+	}
+
+	// FIXME : Something should exist in API to do that
+	protected String printDiagnostic(Diagnostic diagnostic) {
+		String message = diagnostic.getMessage();
+		List<Diagnostic> children = diagnostic.getChildren();
+		for (Diagnostic diagnostic2 : children) {
+			message += "\n" + diagnostic2.getMessage();
+		}
+		return message;
+	}
+}
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/ConstraintEnvironmentTest.java b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/ConstraintEnvironmentTest.java
index 476df2dbd..fd3951e93 100644
--- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/ConstraintEnvironmentTest.java
+++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/ConstraintEnvironmentTest.java
@@ -13,7 +13,6 @@
 
 package org.eclipse.papyrusrt.umlrt.tooling.ui.tests.configuration;
 
-import org.eclipse.papyrus.junit.utils.tests.AbstractEMFResourceTest;
 import org.eclipse.papyrusrt.umlrt.tooling.ui.Activator;
 import org.junit.Test;
 
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/NewChildMenuTest.java b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/NewChildMenuTest.java
index 6e34550aa..2dd92d875 100644
--- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/NewChildMenuTest.java
+++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/NewChildMenuTest.java
@@ -22,10 +22,9 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.papyrus.infra.elementtypesconfigurations.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.infra.newchild.elementcreationmenumodel.CreationMenu;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.junit.utils.tests.AbstractEMFResourceTest;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrusrt.umlrt.tooling.modelexplorer.Activator;
 import org.eclipse.swt.widgets.Display;
 import org.junit.Assert;
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/PropertiesTest.java b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/PropertiesTest.java
index da0bb0e17..a0bf01956 100644
--- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/PropertiesTest.java
+++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/configuration/PropertiesTest.java
@@ -14,7 +14,6 @@
 package org.eclipse.papyrusrt.umlrt.tooling.ui.tests.configuration;
 
 import org.eclipse.papyrus.junit.framework.classification.FailingTest;
-import org.eclipse.papyrus.junit.utils.tests.AbstractEMFResourceTest;
 import org.eclipse.papyrusrt.umlrt.tooling.properties.Activator;
 import org.junit.Test;
 
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ChangeListenerUtilsTest.java b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ChangeListenerUtilsTest.java
index e7fc75191..58db2637e 100644
--- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ChangeListenerUtilsTest.java
+++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ChangeListenerUtilsTest.java
@@ -17,8 +17,8 @@ import static org.junit.Assert.fail;
 
 import java.lang.reflect.Method;
 
+import org.eclipse.papyrus.infra.properties.ui.modelelement.DataSource;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.papyrus.views.properties.modelelement.DataSource;
 import org.junit.Test;
 
 public class ChangeListenerUtilsTest extends AbstractPapyrusTest {
diff --git a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ModelElementTest.java b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ModelElementTest.java
index 65242e07d..4fe03534e 100644
--- a/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ModelElementTest.java
+++ b/tests/junit/umlrt/tooling/org.eclipse.papyrusrt.umlrt.tooling.ui.tests/src/org/eclipse/papyrusrt/umlrt/tooling/ui/tests/modelelement/ModelElementTest.java
@@ -15,10 +15,10 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
+import org.eclipse.papyrus.infra.properties.ui.modelelement.EMFModelElement;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
 import org.eclipse.papyrus.junit.utils.rules.ModelSetFixture;
 import org.eclipse.papyrus.junit.utils.rules.PluginResource;
-import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement;
 import org.eclipse.papyrusrt.umlrt.core.utils.IRealTimeConstants;
 import org.eclipse.papyrusrt.umlrt.core.utils.RTPortKindEnum;
 import org.eclipse.papyrusrt.umlrt.core.utils.RTPortUtils;