[Kernel-commits] r6501 - branches/2.17/site-spi/src/test/java/no/sesat/search/site/config

[ssmiweve]

Author: ssmiweve
Date: 2008-04-19 20:57:01 +0200 (Sat, 19 Apr 2008)
New Revision: 6501

Modified:
   
branches/2.17/site-spi/src/test/java/no/sesat/search/site/config/FileResourceLoader.java
Log:
SEARCH-4614 - sesat tests broken on windows machines


Modified: 
branches/2.17/site-spi/src/test/java/no/sesat/search/site/config/FileResourceLoader.java
===================================================================
--- 
branches/2.17/site-spi/src/test/java/no/sesat/search/site/config/FileResourceLoader.java
    2008-04-19 18:06:49 UTC (rev 6500)
+++ 
branches/2.17/site-spi/src/test/java/no/sesat/search/site/config/FileResourceLoader.java
    2008-04-19 18:57:01 UTC (rev 6501)
@@ -133,6 +133,7 @@
         return projectName.replace('/', File.separatorChar);
     }
 
+    // Not a doubt in my mind someone could write this a shit load better. 
i'll buy a beer to them.
     @Override
     protected final URL getResource(final Site site) {
 
@@ -153,17 +154,23 @@
             String basedir = System.getProperty("basedir") + 
File.separatorChar;
             LOG.debug("project " + project);
             while(true){
-                final String basedirNormalised = new 
File(basedir).toURI().normalize().toString();
+                final String basedirNormalised = new 
File(basedir).toURI().normalize().toString()
+                        .replaceFirst("file:", "").replace('/', 
File.separatorChar);
+                
                 LOG.debug("basedirNormalised " + basedirNormalised);
-                assert !"/war".equals(basedirNormalised) : "At root of 
filesystem!";
-                if(basedirNormalised.endsWith(project) || 
basedirNormalised.endsWith(project + "war/")){
+                
+                assert ! (File.separatorChar + 
"war").equals(basedirNormalised) : "At root of filesystem!";
+                
+                if(basedirNormalised.endsWith(project) 
+                        || basedirNormalised.endsWith(project + "war" + 
File.separatorChar)){
+                    
                     LOG.debug("looking in " + basedir + suffix);
                     final File f = new File(basedir + suffix + getResource());
                     if(f.exists()){
                         return f.toURI().normalize().toURL();
                     }
                 }
-                if("generic.sesam/".equals(project)){
+                if(("generic.sesam" + File.separatorChar).equals(project)){
                     ++genericSesamLoop;
                     basedir = System.getProperty("basedir") + 
File.separatorChar;
                     for(int i = 0; i < genericSesamLoop; ++i){

_______________________________________________
Kernel-commits mailing list
Kernel-commits@sesat.no
http://sesat.no/mailman/listinfo/kernel-commits