From 88894d23b8777de9b2e2b978a911340a2213fd67 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Tue, 12 Jul 2016 10:29:50 +0200 Subject: [PATCH 1/2] reactivated src/org/eclipse/xtext/mwe/UriBasedReaderTest.java Signed-off-by: Christian Dietrich --- .../src/org/eclipse/xtext/mwe/UriBasedReaderTest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.java index bb366c9dc..e77e0d9a2 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.java +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.java @@ -26,7 +26,6 @@ import org.eclipse.xtext.resource.IResourceFactory; import org.eclipse.xtext.resource.IResourceServiceProvider; import org.eclipse.xtext.tests.AbstractXtextTests; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import com.google.inject.Binder; @@ -69,8 +68,6 @@ public class UriBasedReaderTest extends AbstractXtextTests { } } - // TODO https://github.com/eclipse/xtext-core/issues/32 - @Ignore @SuppressWarnings("unchecked") @Test public void testTransitiveReferences() throws Exception { UriBasedReader reader = new UriBasedReader(); From fa84a99b5683f9bc3c5961478897636e462f0f19 Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Tue, 12 Jul 2016 19:38:36 +0200 Subject: [PATCH 2/2] fixed UriBasedReaderTest (#32) Signed-off-by: Christian Dietrich --- .../src/org/eclipse/xtext/mwe/UriBasedReaderTest.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.java index e77e0d9a2..22a95d201 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.java +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.java @@ -8,6 +8,8 @@ package org.eclipse.xtext.mwe; import java.io.File; +import java.nio.file.FileSystems; +import java.nio.file.Path; import java.util.List; import org.eclipse.emf.ecore.EPackage; @@ -72,7 +74,7 @@ public class UriBasedReaderTest extends AbstractXtextTests { @Test public void testTransitiveReferences() throws Exception { UriBasedReader reader = new UriBasedReader(); reader.addRegister(new ImportUriTestLanguageStandaloneSetup()); - reader.addUri("file:/" + pathTo("importUriSubfolder/Start.importuritestlanguage")); + reader.addUri(pathTo2("importUriSubfolder/Start.importuritestlanguage")); SlotEntry slotEntry = new SlotEntry(); slotEntry.setType("Type"); @@ -195,8 +197,11 @@ public class UriBasedReaderTest extends AbstractXtextTests { assertTrue(errorString, errorString.contains(errorURI)); } - public String pathTo(String string) throws Exception { - return new ReaderTest().pathTo(string).replace(File.separator, "/"); + public String pathTo2(String string) throws Exception { + Path path = FileSystems.getDefault().getPath("").toAbsolutePath().resolve("src/"+getClass().getName().replace('.', '/') + ".java").getParent(); + Path resolved = path.resolve(string); + String result = resolved.toUri().toString(); + return result; } }