enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2024-12-23 15:12:15 +03:00
Code Issues Projects Releases Wiki Activity

Canonicalize the temporary directory files (#8879)

Browse Source 
Due to some Mac OS X symlinks trickery we need to canonicalize files created by `@Rule TemporaryFolder` to compare them for equality.
This commit is contained in:
Jaroslav Tulach 2024-01-29 10:06:43 +01:00 committed by GitHub
parent 74b808b00d
commit 084245868d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engine/runner/src/test/java/org/enso/runner/UtilsTest.java
View File

@ -18,7 +18,7 @@ public class UtilsTest {
@Test @Test
public void detectParentProject() throws Exception { public void detectParentProject() throws Exception {
var dir = folder.newFolder("dir", "prj", "src", "some", "file"); var dir = folder.newFolder("dir", "prj", "src", "some", "file").getCanonicalFile();
var prj = dir.getParentFile().getParentFile().getParentFile(); var prj = dir.getParentFile().getParentFile().getParentFile();
assertEquals("prj", prj.getName()); assertEquals("prj", prj.getName());
var yaml = new File(prj, "package.yaml"); var yaml = new File(prj, "package.yaml");
@ -35,7 +35,7 @@ public class UtilsTest {
@Test @Test
public void specifyProjectDir() throws Exception { public void specifyProjectDir() throws Exception {
var dir = folder.newFolder("dir", "prj", "src", "some", "file"); var dir = folder.newFolder("dir", "prj", "src", "some", "file").getCanonicalFile();
var prj = dir.getParentFile().getParentFile().getParentFile(); var prj = dir.getParentFile().getParentFile().getParentFile();
assertEquals("prj", prj.getName()); assertEquals("prj", prj.getName());
var yaml = new File(prj, "package.yaml"); var yaml = new File(prj, "package.yaml");
@ -52,12 +52,12 @@ public class UtilsTest {
@Test @Test
public void specifyProjectAndFile() throws Exception { public void specifyProjectAndFile() throws Exception {
var dir = folder.newFolder("dir", "prj", "src", "some", "file"); var dir = folder.newFolder("dir", "prj", "src", "some", "file").getCanonicalFile();
var prj = dir.getParentFile().getParentFile().getParentFile(); var prj = dir.getParentFile().getParentFile().getParentFile();
assertEquals("prj", prj.getName()); assertEquals("prj", prj.getName());
var yaml = new File(prj, "package.yaml"); var yaml = new File(prj, "package.yaml");
Files.writeString(yaml.toPath(), "enso pkg"); Files.writeString(yaml.toPath(), "enso pkg");
var src = folder.newFile("Standalone.enso"); var src = folder.newFile("Standalone.enso").getCanonicalFile();
Files.writeString(src.toPath(), "main = 42"); Files.writeString(src.toPath(), "main = 42");
var found = Utils.findFileAndProject(src.getPath(), prj.getPath()); var found = Utils.findFileAndProject(src.getPath(), prj.getPath());
@ -69,7 +69,7 @@ public class UtilsTest {
@Test @Test
public void dontDetectParentProjectIfMissingPackageYaml() throws Exception { public void dontDetectParentProjectIfMissingPackageYaml() throws Exception {
var dir = folder.newFolder("dir", "prj", "src", "some", "file"); var dir = folder.newFolder("dir", "prj", "src", "some", "file").getCanonicalFile();
var prj = dir.getParentFile().getParentFile().getParentFile(); var prj = dir.getParentFile().getParentFile().getParentFile();
assertEquals("prj", prj.getName()); assertEquals("prj", prj.getName());
var yamlInWrongDir = new File(dir.getParent(), "package.yaml"); var yamlInWrongDir = new File(dir.getParent(), "package.yaml");
@ -86,7 +86,7 @@ public class UtilsTest {
@Test @Test
public void dontDetectParentProjectWithoutSrcDir() throws Exception { public void dontDetectParentProjectWithoutSrcDir() throws Exception {
var dir = folder.newFolder("dir", "prj", "nosrc", "some", "file"); var dir = folder.newFolder("dir", "prj", "nosrc", "some", "file").getCanonicalFile();
var prj = dir.getParentFile().getParentFile().getParentFile(); var prj = dir.getParentFile().getParentFile().getParentFile();
assertEquals("prj", prj.getName()); assertEquals("prj", prj.getName());
var yaml = new File(prj, "package.yaml"); var yaml = new File(prj, "package.yaml");