[BACKLOG-19688] - repository paths are always unix

roman-p · Oct 30, 2017 · cdd7335 · cdd7335
1 parent 5e91917
commit cdd7335
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/engine/src/main/java/org/pentaho/di/trans/ael/adapters/TransMetaConverter.java b/engine/src/main/java/org/pentaho/di/trans/ael/adapters/TransMetaConverter.java
@@ -26,6 +26,7 @@
 
 import com.google.common.base.Throwables;
 
+import java.io.File;
 import java.io.Serializable;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -91,7 +92,8 @@ public static Transformation convert( TransMeta transMeta ) {
             Repository repository = copyTransMeta.getRepository();
             if ( repository != null ) {
               Path path = Paths.get( entry.getResource() );
-              RepositoryDirectoryInterface directory = repository.findDirectory( path.getParent().toString() );
+              RepositoryDirectoryInterface directory =
+                repository.findDirectory( path.getParent().toString().replace( File.separator, "/" ) );
               return convert(
                 repository.loadTransformation( path.getFileName().toString(), directory, null, true, null ) );
             }

diff --git a/engine/src/test/java/org/pentaho/di/trans/ael/adapters/TransMetaConverterTest.java b/engine/src/test/java/org/pentaho/di/trans/ael/adapters/TransMetaConverterTest.java
@@ -24,6 +24,7 @@
 
 package org.pentaho.di.trans.ael.adapters;
 
+import java.io.File;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -360,7 +361,7 @@ public void testIncludesSubTransformationsFromRepository() throws Exception {
     Repository repository = mock( Repository.class );
     TransMeta transMeta = new TransMeta();
     RepositoryDirectoryInterface repositoryDirectory = new RepositoryDirectory();
-    String directory = getClass().getResource( "" ).toString();
+    String directory = getClass().getResource( "" ).toString().replace( File.separator, "/" );
     when( repository.findDirectory( directory.substring( 0, directory.length() - 1 ) ) ).thenReturn( repositoryDirectory );
     when( repository.loadTransformation( "trans-meta-converter-sub.ktr", repositoryDirectory, null, true, null ) ).thenReturn( transMeta );
     parentTransMeta.setRepository( repository );