sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 16:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #38 from eclipse/cd/testWorkflows

Browse source 
Fix UriBasedReaderTest
This commit is contained in:
Christian Dietrich 2016-07-13 08:49:26 +02:00 committed by GitHub
commit 78154f2391
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
org.eclipse.xtext.tests/src/org/eclipse/xtext/mwe/UriBasedReaderTest.java
View file

@ -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;
@ -26,7 +28,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,13 +70,11 @@ 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();
reader.addRegister(new ImportUriTestLanguageStandaloneSetup());
reader.addUri("file:/" + pathTo("importUriSubfolder/Start.importuritestlanguage"));
reader.addUri(pathTo2("importUriSubfolder/Start.importuritestlanguage"));
SlotEntry slotEntry = new SlotEntry();
slotEntry.setType("Type");
@ -198,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;
}
}