brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [08/21] git commit: Zip entries use UNIX style (relative) paths by standard.
Date Thu, 26 Jun 2014 11:42:14 GMT
Zip entries use UNIX style (relative) paths by standard.

Why the leading dot though?


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e324c246
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e324c246
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e324c246

Branch: refs/heads/master
Commit: e324c24639c28c3470cc6d0962452ad74ba40195
Parents: 0bc6680
Author: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Authored: Fri Jun 6 17:56:34 2014 +0300
Committer: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Committed: Wed Jun 25 18:28:52 2014 +0300

----------------------------------------------------------------------
 core/src/test/java/brooklyn/util/file/ArchiveBuilderTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e324c246/core/src/test/java/brooklyn/util/file/ArchiveBuilderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/util/file/ArchiveBuilderTest.java b/core/src/test/java/brooklyn/util/file/ArchiveBuilderTest.java
index 012ff11..cf260b2 100644
--- a/core/src/test/java/brooklyn/util/file/ArchiveBuilderTest.java
+++ b/core/src/test/java/brooklyn/util/file/ArchiveBuilderTest.java
@@ -98,7 +98,7 @@ public class ArchiveBuilderTest {
         assertTrue(Iterables.isEmpty(directories));
         assertEquals(Iterables.size(files), 3);
         for (ZipEntry file : files) {
-            assertTrue(file.getName().startsWith(Os.mergePaths(".", "data")));
+            assertTrue(file.getName().startsWith(Os.mergePathsUnix(".", "data")));
         }
         input.close();
     }
@@ -126,7 +126,7 @@ public class ArchiveBuilderTest {
         assertTrue(Iterables.isEmpty(directories));
         assertEquals(Iterables.size(files), 3);
         for (ZipEntry file : files) {
-            assertTrue(file.getName().startsWith(Os.mergePaths(".", baseDir)));
+            assertTrue(file.getName().startsWith(Os.mergePathsUnix(".", baseDir)));
         }
         input.close();
     }


Mime
View raw message