[unrelated] trim debug
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/GenerateModel.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/GenerateModel.java
index 9dc07ce..b55a76f 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/GenerateModel.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/GenerateModel.java
@@ -44,8 +44,6 @@
import org.eclipse.ocl.pivot.util.DerivedConstants;
import org.eclipse.ocl.pivot.utilities.OCL;
import org.eclipse.ocl.pivot.utilities.XMIUtil;
-import org.eclipse.ocl.xtext.base.services.BaseLinkingService;
-//import org.eclipse.uml2.codegen.ecore.genmodel.GenModelPackage;
/**
* Performs a Generate Model on the designated <tt>genmodel</tt> genModel.
@@ -59,7 +57,7 @@
public GenerateModel() {
super();
- BaseLinkingService.DEBUG_RETRY.setState(true);
+// BaseLinkingService.DEBUG_RETRY.setState(true);
}
@Override
diff --git a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UML25GenModelSetup.java b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UML25GenModelSetup.java
index 0452886..1c605ba 100644
--- a/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UML25GenModelSetup.java
+++ b/examples/org.eclipse.ocl.examples.build/src/org/eclipse/ocl/examples/build/utilities/UML25GenModelSetup.java
@@ -12,7 +12,6 @@
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.ocl.pivot.internal.resource.ASResourceFactoryRegistry;
-import org.eclipse.ocl.xtext.base.services.BaseLinkingService;
import org.eclipse.ocl.xtext.essentialocl.EssentialOCLStandaloneSetup;
/**
@@ -21,7 +20,7 @@
public class UML25GenModelSetup extends UMLGenModelSetup
{
public UML25GenModelSetup() {
- BaseLinkingService.DEBUG_RETRY.setState(true);
+// BaseLinkingService.DEBUG_RETRY.setState(true);
}
@Override
diff --git a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/PivotMetamodelManager.java b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/PivotMetamodelManager.java
index bb6384b..a4ad826 100644
--- a/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/PivotMetamodelManager.java
+++ b/plugins/org.eclipse.ocl.pivot/src/org/eclipse/ocl/pivot/internal/manager/PivotMetamodelManager.java
@@ -2054,7 +2054,7 @@
* Load the Standard Library for a given uri. If the uri corresponds to a registered library, that library
* is installed, otherwise the already loaded asLibraries are examined and the first library with a matching
* URI is used. Return the resource of the library, and merges all types of all libraries into the overall
- * stnadard library.
+ * standard library.
*/
public @Nullable Resource loadDefaultLibrary(@Nullable String uri) {
if (uri == null) {
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateClassifierOperationsTest4.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateClassifierOperationsTest4.java
index 62d6120..483edf2 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateClassifierOperationsTest4.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateClassifierOperationsTest4.java
@@ -30,7 +30,6 @@
import org.eclipse.ocl.pivot.utilities.MetamodelManager;
import org.eclipse.ocl.pivot.utilities.OCL;
import org.eclipse.ocl.pivot.utilities.PivotUtil;
-import org.eclipse.ocl.xtext.base.services.BaseLinkingService;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -98,7 +97,7 @@
@Override
@Before public void setUp() throws Exception {
- BaseLinkingService.DEBUG_RETRY.setState(true);
+// BaseLinkingService.DEBUG_RETRY.setState(true);
super.setUp();
}
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateOclAnyOperationsTest4.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateOclAnyOperationsTest4.java
index 1eb7bf4..4c9f9eb 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateOclAnyOperationsTest4.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/EvaluateOclAnyOperationsTest4.java
@@ -37,7 +37,6 @@
import org.eclipse.ocl.pivot.utilities.PivotConstants;
import org.eclipse.ocl.pivot.utilities.PivotUtil;
import org.eclipse.ocl.pivot.utilities.ValueUtil;
-import org.eclipse.ocl.xtext.base.services.BaseLinkingService;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -284,7 +283,7 @@
}
@Test public void testNotEqual() {
- BaseLinkingService.DEBUG_RETRY.setState(true);
+// BaseLinkingService.DEBUG_RETRY.setState(true);
MyOCL ocl = createOCL();
ocl.assertQueryFalse(null, "Boolean <> Boolean");
ocl.assertQueryTrue(null, "Boolean <> Integer");
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/UMLValidateTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/UMLValidateTest.java
index 73d19db..f739c7b 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/UMLValidateTest.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/UMLValidateTest.java
@@ -50,7 +50,6 @@
import org.eclipse.ocl.pivot.utilities.ParserException;
import org.eclipse.ocl.pivot.utilities.PivotConstants;
import org.eclipse.ocl.pivot.utilities.StringUtil;
-import org.eclipse.ocl.xtext.base.services.BaseLinkingService;
import org.eclipse.ocl.xtext.completeocl.utilities.CompleteOCLLoader;
import org.eclipse.ocl.xtext.oclinecore.validation.OCLinEcoreEObjectValidator;
import org.eclipse.uml2.uml.Enumeration;
@@ -575,7 +574,7 @@
}
public void test_umlValidation_Bug458394() throws IOException {
- BaseLinkingService.DEBUG_RETRY.setState(true);
+// BaseLinkingService.DEBUG_RETRY.setState(true);
resetRegistries();
// CommonOptions.DEFAULT_DELEGATION_MODE.setDefaultValue(PivotConstants.OCL_DELEGATE_URI_PIVOT);
// if (EcorePlugin.IS_ECLIPSE_RUNNING) {
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/EditTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/EditTests.java
index 79fee81..308e37a 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/EditTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/EditTests.java
@@ -55,7 +55,6 @@
import org.eclipse.ocl.pivot.utilities.StringUtil;
import org.eclipse.ocl.pivot.utilities.XMIUtil;
import org.eclipse.ocl.pivot.values.CollectionTypeParameters;
-import org.eclipse.ocl.xtext.base.services.BaseLinkingService;
import org.eclipse.ocl.xtext.base.utilities.BaseCSResource;
import org.eclipse.ocl.xtext.essentialocl.utilities.EssentialOCLCSResource;
import org.eclipse.ocl.xtext.oclinecorecs.OCLinEcoreCSPackage;
@@ -319,7 +318,7 @@
}
public void testEdit_Paste_473249() throws Exception {
- BaseLinkingService.DEBUG_RETRY.setState(true);
+// BaseLinkingService.DEBUG_RETRY.setState(true);
UMLStandaloneSetup.init();
OCL ocl = OCL.newInstance(getProjectMap());
// OCLDelegateDomain.initialize(null);
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/ImportTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/ImportTests.java
index e68e754..cf851c3 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/ImportTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/ImportTests.java
@@ -32,7 +32,6 @@
import org.eclipse.ocl.pivot.utilities.ValueUtil;
import org.eclipse.ocl.pivot.values.Bag;
import org.eclipse.ocl.pivot.values.Value;
-import org.eclipse.ocl.xtext.base.services.BaseLinkingService;
/**
* Tests that load a model and verify that there are no unresolved proxies as a result.
@@ -188,7 +187,7 @@
}
public void testImport_CompleteOCL_custom_OCLstdlib_eval() throws Exception {
- BaseLinkingService.DEBUG_RETRY.setState(true);
+// BaseLinkingService.DEBUG_RETRY.setState(true);
TestOCL ocl = createOCL();
String customLibrary =
"library lib : lib = 'http://custom.oclstdlib' {\n" +
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/LoadTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/LoadTests.java
index b982db6..5f513e3 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/LoadTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/LoadTests.java
@@ -731,13 +731,13 @@
}
public void testLoad_Names_ecore() throws IOException, InterruptedException {
- OCL ocl = createOCL();
+ OCL ocl = createOCLWithProjectMap();
doLoad(ocl, getTestModelURI("models/ecore/Names.ecore"));
ocl.dispose();
}
public void testLoad_Names_oclinecore() throws IOException, InterruptedException {
- OCL ocl = createOCL();
+ OCL ocl = createOCLWithProjectMap();
doLoad_Concrete(ocl, getTestModelURI("models/oclinecore/Names.oclinecore"));
ocl.dispose();
}
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/PivotTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/PivotTests.java
index 1ca294c..2286666 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/PivotTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/PivotTests.java
@@ -34,7 +34,6 @@
import org.eclipse.ocl.xtext.base.as2cs.AS2CS;
import org.eclipse.ocl.xtext.base.cs2as.BaseCS2AS;
import org.eclipse.ocl.xtext.base.cs2as.CS2AS;
-import org.eclipse.ocl.xtext.base.services.BaseLinkingService;
import org.eclipse.ocl.xtext.base.utilities.BaseCSResource;
import org.eclipse.ocl.xtext.oclinecore.as2cs.OCLinEcoreAS2CS;
import org.eclipse.ocl.xtext.oclstdlib.cs2as.OCLstdlibCS2AS;
@@ -355,7 +354,7 @@
public void testPivot_oclstdlib_oclstdlib() throws IOException, InterruptedException {
OCL ocl = OCL.newInstance(getProjectMap());
- BaseLinkingService.DEBUG_RETRY.setState(true);
+// BaseLinkingService.DEBUG_RETRY.setState(true);
getTestFileURI("oclstdlib.oclas", ocl, getTestModelURI("models/oclstdlib/oclstdlib.oclas"));
URI testFileURI = getTestFileURI("oclstdlib.oclstdlib", ocl, getTestModelURI("models/oclstdlib/oclstdlib.oclstdlib"));
doPivotTestOCLstdlib(ocl, testFileURI);
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/RoundTripTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/RoundTripTests.java
index 46dfcf6..fed9b4f 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/RoundTripTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/RoundTripTests.java
@@ -54,7 +54,6 @@
import org.eclipse.ocl.pivot.utilities.XMIUtil;
import org.eclipse.ocl.xtext.base.cs2as.CS2AS;
import org.eclipse.ocl.xtext.base.cs2as.CS2AS.MessageBinder;
-import org.eclipse.ocl.xtext.base.services.BaseLinkingService;
import org.eclipse.ocl.xtext.base.utilities.BaseCSResource;
import org.eclipse.ocl.xtext.completeocl.as2cs.CompleteOCLSplitter;
import org.eclipse.ocl.xtext.oclinecorecs.OCLinEcoreCSPackage;
@@ -856,7 +855,7 @@
}
public void testTuplesRoundTrip_509533a() throws IOException, InterruptedException {
- BaseLinkingService.DEBUG_RETRY.setState(true);
+// BaseLinkingService.DEBUG_RETRY.setState(true);
String testFileContents =
"package bug509533 : bug509533 = 'http://www.example.org/bug509533'\n" +
"{\n" +
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestUtil.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestUtil.java
index 24453c2..0e160ab 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestUtil.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/xtext/tests/TestUtil.java
@@ -83,8 +83,8 @@
public static void assertSameModel(@NonNull Resource expectedResource, @NonNull Resource actualResource) throws IOException, InterruptedException {
List<Normalizer> expectedNormalizations = normalize(expectedResource);
List<Normalizer> actualNormalizations = normalize(actualResource);
- String expected = EmfFormatter.listToStr(expectedResource.getContents());
- String actual = EmfFormatter.listToStr(actualResource.getContents());
+ String expected = EmfFormatter.listToStr(expectedResource.getContents()).replaceAll(" : ", ": "); // Workround BUG 552035
+ String actual = EmfFormatter.listToStr(actualResource.getContents()).replaceAll(" : ", ": ");
TestCase.assertEquals(expected, actual);
for (Normalizer normalizer : expectedNormalizations) {
normalizer.denormalize();
