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

[tests] fixing tests failing on windows because of file separator

Browse source
This commit is contained in:
Jan Koehnlein 2012-03-01 14:47:59 +01:00
parent 7c5d2cd831
commit 31690a5d29
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/AbstractXtextTests.java
View file

@ -329,8 +329,9 @@ public abstract class AbstractXtextTests extends Assert implements ResourceLoadH
if (url == null) {
fail("Could not read resource: '" + filePath + "'. Is your file system case sensitive?");
} else {
if(!new File(url.getPath()).getCanonicalPath().endsWith(filePath))
throw new RuntimeException(filePath + ":\n" +
String canonicalPath = new File(new File(url.getPath()).getCanonicalPath()).toURI().getPath();
if(!canonicalPath.endsWith(filePath))
throw new RuntimeException(filePath + " -> " + canonicalPath + ":\n" +
"The file does not exist exactly as it was named.\n" +
"The test is likely to cause trouble on the build server.\n" +
"Is your filesystem case insensitive? Please verify the spelling.");

2
plugins/org.eclipse.xtext/src/org/eclipse/xtext/generator/JavaIoFileSystemAccess.java
View file

@ -72,7 +72,7 @@ public class JavaIoFileSystemAccess extends AbstractFileSystemAccess {
if (outlet == null)
throw new IllegalArgumentException("A slot with name '" + outputConfigName + "' has not been configured.");
String pathName = toSystemFileName(outlet + "/" + fileName);
File file = new File(pathName);
File file = new File(pathName).getAbsoluteFile();
return file;
}

4
tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/generator/JavaIoFileSystemAccessTest.java
View file

@ -61,7 +61,9 @@ public class JavaIoFileSystemAccessTest extends Assert {
JavaIoFileSystemAccess fileSystemAccess = new JavaIoFileSystemAccess();
fileSystemAccess.setOutputPath("testOutput", "/testDir");
URI uri = fileSystemAccess.getURI("testFile", "testOutput");
assertEquals("file:/testDir/testFile", uri.toString());
String expectedUri = new File(new File(File.separator + "testDir"), "testFile")
.toURI().toString();
assertEquals(expectedUri, uri.toString());
}
@Test

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

@ -7,6 +7,7 @@
*******************************************************************************/
package org.eclipse.xtext.mwe;
import java.io.File;
import java.util.List;
import org.eclipse.emf.ecore.EPackage;
@ -64,7 +65,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("file:/" + pathTo("importUriSubfolder/Start.importuritestlanguage"));
SlotEntry slotEntry = new SlotEntry();
slotEntry.setType("Type");
@ -188,7 +189,7 @@ public class UriBasedReaderTest extends AbstractXtextTests {
}
public String pathTo(String string) throws Exception {
return new ReaderTest().pathTo(string);
return new ReaderTest().pathTo(string).replace(File.separator, "/");
}
}