You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@activemq.apache.org by ch...@apache.org on 2010/10/18 22:26:21 UTC

svn commit: r1023995 - in /activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util: FileSupportTest.scala FunSuiteSupport.scala

Author: chirino
Date: Mon Oct 18 20:26:20 2010
New Revision: 1023995

URL: http://svn.apache.org/viewvc?rev=1023995&view=rev
Log:
Fixes failing test

Modified:
    activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/FileSupportTest.scala
    activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/FunSuiteSupport.scala

Modified: activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/FileSupportTest.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/FileSupportTest.scala?rev=1023995&r1=1023994&r2=1023995&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/FileSupportTest.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/FileSupportTest.scala Mon Oct 18 20:26:20 2010
@@ -51,8 +51,14 @@ class FileSupportTest extends FunSuiteSu
 
     targetDir.deepList().foreach(file => listing.append(file.toString))
 
-    listing should contain("./target/targetDir/subDir")
-    listing should contain("./target/targetDir/subDir/someFile")
+
+
+
+    
+    var expected = (new File(baseDir)/"target"/"targetDir"/"subDir").normalize.toString
+    listing should contain( expected )
+    expected = (new File(baseDir)/"target"/"targetDir"/"subDir"/"someFile").normalize.toString
+    listing should contain(expected)
 
   }
 

Modified: activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/FunSuiteSupport.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/FunSuiteSupport.scala?rev=1023995&r1=1023994&r2=1023995&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/FunSuiteSupport.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-util/src/test/scala/org/apache/activemq/apollo/util/FunSuiteSupport.scala Mon Oct 18 20:26:20 2010
@@ -36,7 +36,7 @@ abstract class FunSuiteSupport extends F
    * Returns the base directory of the current project
    */
   def baseDir = {
-    new File(_basedir)
+    new File(_basedir).getCanonicalFile
   }
 
   /**