ASSIGNED - bug 382326: Update build target for Eclipse Juno Releases

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

3 files changed, 39 insertions, 31 deletions

diff --git a/org.eclipse.rmf.rif11.model.test/META-INF/MANIFEST.MF b/org.eclipse.rmf.rif11.model.test/META-INF/MANIFEST.MF
index e7de9e5f..0654e934 100644
--- a/org.eclipse.rmf.rif11.model.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.rif11.model.test/META-INF/MANIFEST.MF
@@ -3,15 +3,16 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.rmf.rif11.model.test

 Bundle-Version: 0.4.0.qualifier

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.rmf.rif11.model;bundle-version="0.1.0",

- org.eclipse.rmf.rif11.xsd.model;bundle-version="0.1.0",

- org.eclipse.rmf.rif11.resource;bundle-version="0.1.0",

+Require-Bundle: org.eclipse.core.resources,

+ org.eclipse.core.runtime,

+ org.eclipse.rmf.rif11.model,

+ org.eclipse.rmf.rif11.xsd.model,

+ org.eclipse.rmf.rif11.resource,

  org.junit,

- org.eclipse.emf.ecore;bundle-version="2.6.1",

- org.eclipse.emf.ecore.xmi;bundle-version="2.5.0",

- org.eclipse.emf.compare;bundle-version="1.1.2",

- org.eclipse.emf.compare.diff;bundle-version="1.1.2",

- org.eclipse.emf.compare.match;bundle-version="1.1.2"

+ org.eclipse.emf.ecore,

+ org.eclipse.emf.ecore.xmi,

+ org.eclipse.emf.compare,

+ org.eclipse.emf.compare.diff,

+ org.eclipse.emf.compare.match

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 Bundle-Vendor: %providerName

diff --git a/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/Rif11ResourceTestBase.java b/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/Rif11ResourceTestBase.java
index 0f1b0589..b43a4a70 100644
--- a/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/Rif11ResourceTestBase.java
+++ b/org.eclipse.rmf.rif11.model.test/src/org/eclipse/rmf/rif11/model/test/Rif11ResourceTestBase.java
@@ -20,13 +20,15 @@ import java.util.HashMap;
 import java.util.Map;

 

 import org.eclipse.emf.common.util.URI;

+import org.eclipse.emf.compare.diff.metamodel.AttributeChange;

 import org.eclipse.emf.compare.diff.metamodel.DiffElement;

 import org.eclipse.emf.compare.diff.metamodel.DiffModel;

-import org.eclipse.emf.compare.diff.metamodel.ReferenceOrderChange;

+import org.eclipse.emf.compare.diff.metamodel.ReferenceChange;

 import org.eclipse.emf.compare.diff.service.DiffService;

 import org.eclipse.emf.compare.match.MatchOptions;

 import org.eclipse.emf.compare.match.metamodel.MatchModel;

 import org.eclipse.emf.compare.match.service.MatchService;

+import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.ecore.resource.ResourceSet;

 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

@@ -37,7 +39,6 @@ import org.junit.Before;
 import org.eclipse.rmf.rif11.resource.Rif11ResourceFactoryImpl;

 import org.eclipse.rmf.rif11.xsd.DocumentRoot;

 import org.eclipse.rmf.rif11.xsd.RifPackage;

-import org.eclipse.rmf.rif11.xsd.impl.DocumentRootImpl;

 import org.eclipse.rmf.rif11.xsd.util.RifResourceFactoryImpl;

 

 public class Rif11ResourceTestBase {

@@ -88,20 +89,22 @@ public class Rif11ResourceTestBase {
 	public void compareModels(String filename1, String filename2) {

 

 		Resource rifXSDResourceInput = rifXSDResourceSet.getResource(

-				URI.createFileURI(new File(filename1).getAbsolutePath()), true);

+				URI.createURI(filename1, true),true);

+				//URI.createFileURI(new File(filename1).getAbsolutePath()), true);

 

 		Resource rifXSDResourceOutput = rifXSDResourceSet.getResource(

-				URI.createFileURI(new File(filename2).getAbsolutePath()), true);

+				URI.createURI(filename2, true),true);

+				//URI.createFileURI(new File(filename2).getAbsolutePath()), true);

 

 		try {

-

+			EObject outputRoot = rifXSDResourceOutput.getContents().get(0);			

+			EObject inputRoot = rifXSDResourceInput.getContents().get(0);

+			

 			MatchModel match = MatchService.doMatch(

-					(DocumentRootImpl) rifXSDResourceOutput.getContents()

-							.get(0), rifXSDResourceInput.getContents().get(0),

+					outputRoot, inputRoot,

 					(Map<String, Object>) new HashMap<String, Object>().put(

 							MatchOptions.OPTION_IGNORE_XMI_ID, Boolean.TRUE));

 			DiffModel diff = DiffService.doDiff(match, false);

-

 			ArrayList<DiffElement> differences = null;

 

 			if (!diff.getDifferences().isEmpty()) {

@@ -112,14 +115,15 @@ public class Rif11ResourceTestBase {
 			Assert.assertTrue((differences != null ? differences.size() : "")

 					+ " Difference(s) found between loaded and saved models",

 					differences == null || differences.isEmpty());

-		} catch (InterruptedException e) {

+		} catch (Exception e) {

+			e.printStackTrace(System.out);

 			fail(e.getMessage());

-		}

+		} 

 	}

 

 	protected void printAllDifferences(DiffModel diff) {

 		for (DiffElement diffElement : diff.getDifferences()){

-			System.out.println(diffElement);

+			System.out.println(diffElement.getClass().getName() + ": " + diffElement);

 		}

 	}

 	

@@ -129,8 +133,10 @@ public class Rif11ResourceTestBase {
 

 		for (DiffElement diffElement : diff.getDifferences()) {

 

-			if (!(diffElement instanceof ReferenceOrderChange && ((ReferenceOrderChange) diffElement)

-					.getLeftElement() instanceof DocumentRoot)) {

+			if (! ((diffElement instanceof AttributeChange) && 

+					((AttributeChange) diffElement).getLeftElement().eContainer() instanceof DocumentRoot) &&

+				! ((diffElement instanceof ReferenceChange) && 

+					((ReferenceChange) diffElement).getLeftElement() instanceof DocumentRoot)	) {

 				differences.add(diffElement);

 			}

 		}

diff --git a/org.eclipse.rmf.rif12.model.test/META-INF/MANIFEST.MF b/org.eclipse.rmf.rif12.model.test/META-INF/MANIFEST.MF
index 44e1c9aa..6eae9632 100644
--- a/org.eclipse.rmf.rif12.model.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.rif12.model.test/META-INF/MANIFEST.MF
@@ -3,15 +3,16 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.rmf.rif12.model.test

 Bundle-Version: 0.4.0.qualifier

-Require-Bundle: org.eclipse.core.runtime,

+Require-Bundle: org.eclipse.core.resources,

+ org.eclipse.core.runtime,

  org.junit,

- org.eclipse.emf.ecore;bundle-version="2.6.1",

- org.eclipse.emf.ecore.xmi;bundle-version="2.5.0",

- org.eclipse.emf.compare;bundle-version="1.1.2",

- org.eclipse.emf.compare.diff;bundle-version="1.1.2",

- org.eclipse.emf.compare.match;bundle-version="1.1.2",

- org.eclipse.rmf.rif12.model;bundle-version="0.1.0",

- org.eclipse.rmf.rif12.resource;bundle-version="0.1.0",

- org.eclipse.rmf.rif12.xsd.model;bundle-version="0.1.0"

+ org.eclipse.emf.ecore,

+ org.eclipse.emf.ecore.xmi,

+ org.eclipse.emf.compare,

+ org.eclipse.emf.compare.diff,

+ org.eclipse.emf.compare.match,

+ org.eclipse.rmf.rif12.model,

+ org.eclipse.rmf.rif12.resource,

+ org.eclipse.rmf.rif12.xsd.model

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 Bundle-Vendor: %providerName