[295060] Transformation executor must accept a generic transformation URI
diff --git a/tests/org.eclipse.m2m.tests.qvt.oml/src/org/eclipse/m2m/tests/qvt/oml/callapi/InvocationTest.java b/tests/org.eclipse.m2m.tests.qvt.oml/src/org/eclipse/m2m/tests/qvt/oml/callapi/InvocationTest.java
index ae45056..68865e2 100644
--- a/tests/org.eclipse.m2m.tests.qvt.oml/src/org/eclipse/m2m/tests/qvt/oml/callapi/InvocationTest.java
+++ b/tests/org.eclipse.m2m.tests.qvt.oml/src/org/eclipse/m2m/tests/qvt/oml/callapi/InvocationTest.java
@@ -11,6 +11,7 @@
*******************************************************************************/
package org.eclipse.m2m.tests.qvt.oml.callapi;
+import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.ArrayList;
@@ -18,6 +19,8 @@
import junit.framework.TestCase;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.emf.common.util.Diagnostic;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
@@ -33,6 +36,8 @@
import org.eclipse.m2m.qvt.oml.util.EvaluationMonitor;
import org.eclipse.m2m.qvt.oml.util.Log;
import org.eclipse.m2m.qvt.oml.util.StringBufferLog;
+import org.eclipse.m2m.tests.qvt.oml.util.TestUtil;
+import org.osgi.framework.Bundle;
/**
* @author dvorak
@@ -264,5 +269,18 @@
}
fail("Must have thrown exception"); //$NON-NLS-1$
+ }
+
+ public void testInvokeOnGenericURIs() throws Exception {
+ Bundle testBundle = Platform.getBundle(TestUtil.BUNDLE);
+ File bundleFile = FileLocator.getBundleFile(testBundle);
+ assertNotNull(bundleFile);
+
+ URI fileURI = URI.createURI(new File(bundleFile, "deployed/callapi/Ecore2Ecore.qvto").toURI().toString(), true);
+ fExecutor = new TransformationExecutor(fileURI);
+
+ final ExecutionDiagnostic diagnostic = fExecutor.execute(fContext, fInput, fOutput);
+ assertEquals(Diagnostic.OK, diagnostic.getSeverity());
+ assertEquals(0, diagnostic.getCode());
}
}
diff --git a/tests/org.eclipse.m2m.tests.qvt.oml/src/org/eclipse/m2m/tests/qvt/oml/compile/URIUnitResolverTest.java b/tests/org.eclipse.m2m.tests.qvt.oml/src/org/eclipse/m2m/tests/qvt/oml/compile/URIUnitResolverTest.java
new file mode 100644
index 0000000..b9088ec
--- /dev/null
+++ b/tests/org.eclipse.m2m.tests.qvt.oml/src/org/eclipse/m2m/tests/qvt/oml/compile/URIUnitResolverTest.java
@@ -0,0 +1,148 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Eclipse Modeling Project 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:
+ * Radek Dvorak - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.m2m.tests.qvt.oml.compile;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.util.Collections;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.m2m.internal.qvt.oml.compiler.URIUnitResolver;
+import org.eclipse.m2m.internal.qvt.oml.compiler.UnitContents;
+import org.eclipse.m2m.internal.qvt.oml.compiler.UnitProxy;
+import org.osgi.framework.Bundle;
+
+/**
+ * @author dvorak
+ */
+public class URIUnitResolverTest extends TestCase {
+
+ private static final String fTestPluginID = "org.eclipse.m2m.tests.qvt.oml"; //$NON-NLS-1$
+
+ private static final URI TEST_UNIT_PLUGIN_URI = URI.createPlatformPluginURI(
+ "/" + fTestPluginID +"/deployed/org/eclipse/Foo.qvto", true);
+
+
+ public URIUnitResolverTest(String name) {
+ super(name);
+ }
+
+ public void testBaseAndNamespace() throws Exception {
+ URI baseURI = URI.createPlatformPluginURI(fTestPluginID, true);
+
+ URIUnitResolver resolver = new URIUnitResolver(Collections.singletonList(baseURI));
+ UnitProxy unit = resolver.resolveUnit("deployed.org.eclipse.Foo");
+ assertNotNull(unit);
+ assertContents(unit);
+
+ assertEquals("deployed.org.eclipse", unit.getNamespace());
+ assertEquals("Foo", unit.getName());
+ assertEquals(TEST_UNIT_PLUGIN_URI, //$NON-NLS-1$
+ unit.getURI());
+ }
+
+ public void testNamespace() throws Exception {
+ URI baseURI = URI.createPlatformPluginURI(fTestPluginID + "/deployed", true);
+
+ URIUnitResolver resolver = new URIUnitResolver(Collections.singletonList(baseURI));
+
+ UnitProxy unit = resolver.resolveUnit("org.eclipse.Foo");
+ assertEquals("org.eclipse", unit.getNamespace());
+ assertEquals("Foo", unit.getName());
+ assertEquals(TEST_UNIT_PLUGIN_URI, //$NON-NLS-1$
+ unit.getURI());
+ assertContents(unit);
+ }
+
+ public void testDefaultNamespace() throws Exception {
+ URI baseURI = URI.createPlatformPluginURI(fTestPluginID + "/deployed/org/eclipse", true);
+
+ URIUnitResolver resolver = new URIUnitResolver(Collections.singletonList(baseURI));
+
+ UnitProxy unit = resolver.resolveUnit("Foo");
+ assertNull(unit.getNamespace());
+ assertEquals("Foo", unit.getName());
+ assertEquals(TEST_UNIT_PLUGIN_URI, //$NON-NLS-1$
+ unit.getURI());
+ assertContents(unit);
+ }
+
+ public void testTrailPathSepBaseAndNamespace() throws Exception {
+ URI baseURI = URI.createURI(URI.createPlatformPluginURI(fTestPluginID, true).toString() + "/");
+
+ URIUnitResolver resolver = new URIUnitResolver(Collections.singletonList(baseURI));
+ UnitProxy unit = resolver.resolveUnit("deployed.org.eclipse.Foo");
+ assertNotNull(unit);
+
+ assertEquals("deployed.org.eclipse", unit.getNamespace());
+ assertEquals("Foo", unit.getName());
+ assertEquals(TEST_UNIT_PLUGIN_URI, //$NON-NLS-1$
+ unit.getURI());
+
+ }
+
+ public void testUnresolvedByURI() throws Exception {
+ URI baseURI = URI.createURI(URI.createPlatformPluginURI(fTestPluginID, true).toString());
+ URIUnitResolver resolver = new URIUnitResolver(Collections.singletonList(baseURI));
+
+ String notExisting = "I'm Not there";
+ assertNull(resolver.resolveUnit(notExisting));
+ assertNull(URIUnitResolver.getUnit(URI.createURI(notExisting)));
+ }
+
+ public void testFileURI() throws Exception {
+ Bundle testBundle = Platform.getBundle(fTestPluginID);
+ File bundleFile = FileLocator.getBundleFile(testBundle);
+ assertNotNull(bundleFile);
+
+ URI baseURI = URI.createURI(bundleFile.toURI().toString());
+ assertEquals("file", baseURI.scheme());
+
+ URIUnitResolver resolver = new URIUnitResolver(Collections.singletonList(baseURI));
+ UnitProxy unit = resolver.resolveUnit("deployed.org.eclipse.Foo");
+
+ assertNotNull(unit);
+ assertContents(unit);
+
+ assertEquals("deployed.org.eclipse", unit.getNamespace());
+ assertEquals("Foo", unit.getName());
+
+ // test direct unit proxy constructor for a URI
+ if(baseURI.hasTrailingPathSeparator()) {
+ baseURI = baseURI.trimSegments(1);
+ }
+ assertEquals(baseURI.appendSegments(new String[] { "deployed", "org", "eclipse", "Foo.qvto"}),
+ unit.getURI());
+
+ UnitProxy unitByURI = URIUnitResolver.getUnit(unit.getURI());
+ assertNotNull(unitByURI);
+ assertContents(unitByURI);
+ assertEquals(unitByURI.getURI(), unit.getURI());
+
+ // expect default namespace as we had no knowledge about
+ assertNull(unitByURI.getNamespace());
+ assertEquals(unitByURI.getName(), unitByURI.getQualifiedName());
+ }
+
+ private static void assertContents(UnitProxy unit) throws Exception {
+ UnitContents contents = unit.getContents();
+ assertTrue(contents instanceof UnitContents.CSTContents);
+ UnitContents.CSTContents cst = (UnitContents.CSTContents) contents;
+ BufferedReader reader = new BufferedReader(cst.getContents());
+ while(reader.readLine() != null) {
+ // do nothing but read all contents
+ }
+ }
+}
