macfixes: can cope when /tmp is a link to somewhere

diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/AjdeCoreTestCase.java b/ajde.core/testsrc/org/aspectj/ajde/core/AjdeCoreTestCase.java
index 08ee203ffe3556f850377b866d447ed68aaa10a2..26e3cb82dc2137f30b172caa2666c46c863e3f55 100644 (file)
--- a/ajde.core/testsrc/org/aspectj/ajde/core/AjdeCoreTestCase.java
+++ b/ajde.core/testsrc/org/aspectj/ajde/core/AjdeCoreTestCase.java
@@ -55,12 +55,12 @@ public class AjdeCoreTestCase extends TestCase {
         * Fill in the working directory with the project files and
         * creates a compiler instance for this project
         */
-       public void initialiseProject(String projectName) {
+       public void initialiseProject(String projectName) throws IOException {
                File projectSrc=new File(testdataSrcDir + File.separatorChar + projectName);
                File destination=new File(getWorkingDir(),projectName);
                if (!destination.exists()) {destination.mkdir();}
                copy(projectSrc,destination);
-               projectDir = destination.getAbsolutePath();
+               projectDir = destination.getCanonicalPath();//getAbsolutePath();
                
                compiler = new AjCompiler(
                                projectDir,

diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/tests/AjConfigTests.java b/ajde.core/testsrc/org/aspectj/ajde/core/tests/AjConfigTests.java
index 53dd64577fec68193db51d480701c39edc8d9f2f..c38c4e20e56231a6867cc7ea6da6f05a7a58c0fd 100644 (file)
--- a/ajde.core/testsrc/org/aspectj/ajde/core/tests/AjConfigTests.java
+++ b/ajde.core/testsrc/org/aspectj/ajde/core/tests/AjConfigTests.java
@@ -11,6 +11,7 @@
 package org.aspectj.ajde.core.tests;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -204,13 +205,13 @@ public class AjConfigTests extends AjdeCoreTestCase {
                assertTrue( "XserializableAspects", buildConfig.isXserializableAspects() );                                                                                     
        }
        
-       public void testProjectSourceFiles() {
+       public void testProjectSourceFiles() throws IOException {
                String f = getAbsoluteProjectDir() + File.separator + "C.java";
                List files = new ArrayList();
                files.add(f);
                compilerConfig.setProjectSourceFiles(files);
                AjBuildConfig buildConfig = genAjBuildConfig();
-               String found = ((File)buildConfig.getFiles().get(0)).getAbsolutePath();
+               String found = ((File)buildConfig.getFiles().get(0)).getCanonicalPath();//AbsolutePath();
                assertEquals("expected source file " + f + ", but found " +
                                found, f, found);
        }