You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/12/10 18:30:24 UTC
[1/6] storm git commit: use File.separator for OS independence;
Repository: storm
Updated Branches:
refs/heads/master fa6f52588 -> a3f343a6a
use File.separator for OS independence;
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4f04d1ab
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4f04d1ab
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4f04d1ab
Branch: refs/heads/master
Commit: 4f04d1ab51cd6763c2336e28e9ce49f1b4107b9f
Parents: ceb3a0c
Author: Chuck Burgess <cb...@progressrail.com>
Authored: Mon Dec 7 15:39:57 2015 -0600
Committer: Chuck Burgess <cb...@progressrail.com>
Committed: Wed Dec 9 11:00:48 2015 -0600
----------------------------------------------------------------------
.../backtype/storm/localizer/LocalizerTest.java | 36 ++++++++++----------
1 file changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/4f04d1ab/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java b/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
index b47a3b4..1eeae23 100644
--- a/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
+++ b/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
@@ -126,15 +126,15 @@ public class LocalizerTest {
}
public String constructUserCacheDir(String base, String user) {
- return base + "/" + Localizer.USERCACHE + "/" + user;
+ return base + File.separator + Localizer.USERCACHE + File.separator + user;
}
public String constructExpectedFilesDir(String base, String user) {
- return constructUserCacheDir(base, user) + "/" + Localizer.FILECACHE + "/" + Localizer.FILESDIR;
+ return constructUserCacheDir(base, user) + File.separator + Localizer.FILECACHE + File.separator + Localizer.FILESDIR;
}
public String constructExpectedArchivesDir(String base, String user) {
- return constructUserCacheDir(base, user) + "/" + Localizer.FILECACHE + "/" + Localizer
+ return constructUserCacheDir(base, user) + File.separator + Localizer.FILECACHE + File.separator + Localizer
.ARCHIVESDIR;
}
@@ -147,7 +147,7 @@ public class LocalizerTest {
assertEquals("get local user dir doesn't return right value",
expectedDir, localizer.getLocalUserDir(user1).toString());
- String expectedFileDir = expectedDir + "/" + Localizer.FILECACHE;
+ String expectedFileDir = expectedDir + File.separator + Localizer.FILECACHE;
assertEquals("get local user file dir doesn't return right value",
expectedFileDir, localizer.getLocalUserFileCacheDir(user1).toString());
}
@@ -287,8 +287,8 @@ public class LocalizerTest {
user1Dir);
long timeAfter = System.nanoTime();
- String expectedUserDir = baseDir + "/" + Localizer.USERCACHE + "/" + user1;
- String expectedFileDir = expectedUserDir + "/" + Localizer.FILECACHE + "/" + Localizer.ARCHIVESDIR;
+ String expectedUserDir = baseDir + File.separator + Localizer.USERCACHE + File.separator + user1;
+ String expectedFileDir = expectedUserDir + File.separator + Localizer.FILECACHE + File.separator + Localizer.ARCHIVESDIR;
assertTrue("user filecache dir not created", new File(expectedFileDir).exists());
File keyFile = new File(expectedFileDir, key1 + ".0");
assertTrue("blob not created", keyFile.exists());
@@ -364,8 +364,8 @@ public class LocalizerTest {
user1Dir);
long timeAfter = System.nanoTime();
- String expectedUserDir = baseDir + "/" + Localizer.USERCACHE + "/" + user1;
- String expectedFileDir = expectedUserDir + "/" + Localizer.FILECACHE + "/" + Localizer.FILESDIR;
+ String expectedUserDir = baseDir + File.separator + Localizer.USERCACHE + File.separator + user1;
+ String expectedFileDir = expectedUserDir + File.separator + Localizer.FILECACHE + File.separator + Localizer.FILESDIR;
assertTrue("user filecache dir not created", new File(expectedFileDir).exists());
File keyFile = new File(expectedFileDir, key1);
File keyFileCurrentSymlink = new File(expectedFileDir, key1 + Utils.DEFAULT_CURRENT_BLOB_SUFFIX);
@@ -437,8 +437,8 @@ public class LocalizerTest {
LocalizedResource lrsrc2 = lrsrcs.get(1);
LocalizedResource lrsrc3 = lrsrcs.get(2);
- String expectedFileDir = baseDir + "/" + Localizer.USERCACHE + "/" + user1 +
- "/" + Localizer.FILECACHE + "/" + Localizer.FILESDIR;
+ String expectedFileDir = baseDir + File.separator + Localizer.USERCACHE + File.separator + user1 +
+ File.separator + Localizer.FILECACHE + File.separator + Localizer.FILESDIR;
assertTrue("user filecache dir not created", new File(expectedFileDir).exists());
File keyFile = new File(expectedFileDir, key1 + Utils.DEFAULT_CURRENT_BLOB_SUFFIX);
File keyFile2 = new File(expectedFileDir, key2 + Utils.DEFAULT_CURRENT_BLOB_SUFFIX);
@@ -570,13 +570,13 @@ public class LocalizerTest {
LocalizedResource lrsrc1_user3 = localizer.getBlob(new LocalResource(key1, false), user3,
topo3, user3Dir);
- String expectedUserDir1 = baseDir + "/" + Localizer.USERCACHE + "/" + user1;
- String expectedFileDirUser1 = expectedUserDir1 + "/" + Localizer.FILECACHE + "/" +
+ String expectedUserDir1 = baseDir + File.separator + Localizer.USERCACHE + File.separator + user1;
+ String expectedFileDirUser1 = expectedUserDir1 + File.separator + Localizer.FILECACHE + File.separator +
Localizer.FILESDIR;
- String expectedFileDirUser2 = baseDir + "/" + Localizer.USERCACHE + "/" + user2 +
- "/" + Localizer.FILECACHE + "/" + Localizer.FILESDIR;
- String expectedFileDirUser3 = baseDir + "/" + Localizer.USERCACHE + "/" + user3 +
- "/" + Localizer.FILECACHE + "/" + Localizer.FILESDIR;
+ String expectedFileDirUser2 = baseDir + File.separator + Localizer.USERCACHE + File.separator + user2 +
+ File.separator + Localizer.FILECACHE + File.separator + Localizer.FILESDIR;
+ String expectedFileDirUser3 = baseDir + File.separator + Localizer.USERCACHE + File.separator + user3 +
+ File.separator + Localizer.FILECACHE + File.separator + Localizer.FILESDIR;
assertTrue("user filecache dir user1 not created", new File(expectedFileDirUser1).exists());
assertTrue("user filecache dir user2 not created", new File(expectedFileDirUser2).exists());
assertTrue("user filecache dir user3 not created", new File(expectedFileDirUser3).exists());
@@ -637,8 +637,8 @@ public class LocalizerTest {
LocalizedResource lrsrc = localizer.getBlob(new LocalResource(key1, false), user1, topo1,
user1Dir);
- String expectedUserDir = baseDir + "/" + Localizer.USERCACHE + "/" + user1;
- String expectedFileDir = expectedUserDir + "/" + Localizer.FILECACHE + "/" + Localizer.FILESDIR;
+ String expectedUserDir = baseDir + File.separator + Localizer.USERCACHE + File.separator + user1;
+ String expectedFileDir = expectedUserDir + File.separator + Localizer.FILECACHE + File.separator + Localizer.FILESDIR;
assertTrue("user filecache dir not created", new File(expectedFileDir).exists());
File keyFile = new File(expectedFileDir, key1);
File keyFileCurrentSymlink = new File(expectedFileDir, key1 + Utils.DEFAULT_CURRENT_BLOB_SUFFIX);
[6/6] storm git commit: Merge branch 'fileSep' of
https://github.com/ashnazg/storm into STORM-1378
Posted by bo...@apache.org.
Merge branch 'fileSep' of https://github.com/ashnazg/storm into STORM-1378
STORM-1378: Use File.separator for OS independence in Blobstore LocalizerTest
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a3f343a6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a3f343a6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a3f343a6
Branch: refs/heads/master
Commit: a3f343a6a14638dfd4a26923b36c4ff6a2361b96
Parents: fa6f525 db226d0
Author: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Authored: Thu Dec 10 11:18:04 2015 -0600
Committer: Robert (Bobby) Evans <ev...@yahoo-inc.com>
Committed: Thu Dec 10 11:18:04 2015 -0600
----------------------------------------------------------------------
.../jvm/backtype/storm/blobstore/BlobStore.java | 4 +-
.../backtype/storm/localizer/LocalizerTest.java | 64 ++++++++++----------
2 files changed, 35 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
[3/6] storm git commit: close stream before returning;
Posted by bo...@apache.org.
close stream before returning;
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7e270c24
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7e270c24
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7e270c24
Branch: refs/heads/master
Commit: 7e270c24f13423a909c413082602f22f6c9aeccf
Parents: 0e0cc9e
Author: Chuck Burgess <cb...@progressrail.com>
Authored: Wed Dec 9 15:48:13 2015 -0600
Committer: Chuck Burgess <cb...@progressrail.com>
Committed: Wed Dec 9 15:51:17 2015 -0600
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/blobstore/BlobStore.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7e270c24/storm-core/src/jvm/backtype/storm/blobstore/BlobStore.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/blobstore/BlobStore.java b/storm-core/src/jvm/backtype/storm/blobstore/BlobStore.java
index a714b76..2eba1d9 100644
--- a/storm-core/src/jvm/backtype/storm/blobstore/BlobStore.java
+++ b/storm-core/src/jvm/backtype/storm/blobstore/BlobStore.java
@@ -298,7 +298,9 @@ public abstract class BlobStore implements Shutdownable {
public byte[] readBlob(String key, Subject who) throws IOException, KeyNotFoundException, AuthorizationException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
readBlobTo(key, out, who);
- return out.toByteArray();
+ byte[] bytes = out.toByteArray();
+ out.close();
+ return bytes;
}
/**
[4/6] storm git commit: more paths with explicit /;
Posted by bo...@apache.org.
more paths with explicit /;
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b1ce50d3
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b1ce50d3
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b1ce50d3
Branch: refs/heads/master
Commit: b1ce50d3206543c09c99ec460556991cf9f2e16e
Parents: 7e270c2
Author: Chuck Burgess <cb...@progressrail.com>
Authored: Wed Dec 9 15:48:52 2015 -0600
Committer: Chuck Burgess <cb...@progressrail.com>
Committed: Wed Dec 9 15:51:36 2015 -0600
----------------------------------------------------------------------
.../backtype/storm/localizer/LocalizerTest.java | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/b1ce50d3/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java b/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
index 3ffd2b1..a1f6741 100644
--- a/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
+++ b/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
@@ -237,35 +237,30 @@ public class LocalizerTest {
@Test
public void testArchivesTgz() throws Exception {
- testArchives("test/jvm/backtype/storm/localizer/localtestwithsymlink.tgz", true,
- 21344);
+ testArchives(joinPath("test", "jvm", "backtype", "storm", "localizer", "localtestwithsymlink.tgz"), true, 21344);
}
@Test
public void testArchivesZip() throws Exception {
- testArchives("test/jvm/backtype/storm/localizer/localtest.zip", false,
- 21348);
+ testArchives(joinPath("test", "jvm", "backtype", "storm", "localizer", "localtest.zip"), false, 21348);
}
@Test
public void testArchivesTarGz() throws Exception {
- testArchives("test/jvm/backtype/storm/localizer/localtestwithsymlink.tar.gz",
- true, 21344);
+ testArchives(joinPath("test", "jvm", "backtype", "storm", "localizer", "localtestwithsymlink.tar.gz"), true, 21344);
}
@Test
public void testArchivesTar() throws Exception {
- testArchives("test/jvm/backtype/storm/localizer/localtestwithsymlink.tar", true,
- 21344);
+ testArchives(joinPath("test", "jvm", "backtype", "storm", "localizer", "localtestwithsymlink.tar"), true, 21344);
}
@Test
public void testArchivesJar() throws Exception {
- testArchives("test/jvm/backtype/storm/localizer/localtestwithsymlink.jar", false,
- 21416);
+ testArchives(joinPath("test", "jvm", "backtype", "storm", "localizer", "localtestwithsymlink.jar"), false, 21416);
}
- // archive passed in must contain symlink named tmptestsymlink is not a zip file
+ // archive passed in must contain symlink named tmptestsymlink if not a zip file
public void testArchives(String archivePath, boolean supportSymlinks, int size) throws Exception {
Map conf = new HashMap();
// set clean time really high so doesn't kick in
[5/6] storm git commit: ignore tempdir cleanup failures;
Posted by bo...@apache.org.
ignore tempdir cleanup failures;
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/db226d04
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/db226d04
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/db226d04
Branch: refs/heads/master
Commit: db226d040d41c4c70b0ac9ad1b90515a78e757f2
Parents: b1ce50d
Author: Chuck Burgess <cb...@progressrail.com>
Authored: Wed Dec 9 15:49:24 2015 -0600
Committer: Chuck Burgess <cb...@progressrail.com>
Committed: Wed Dec 9 15:51:45 2015 -0600
----------------------------------------------------------------------
storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/db226d04/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java b/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
index a1f6741..9852532 100644
--- a/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
+++ b/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
@@ -123,7 +123,9 @@ public class LocalizerTest {
@After
public void tearDown() throws Exception {
- FileUtils.deleteDirectory(baseDir);
+ try {
+ FileUtils.deleteDirectory(baseDir);
+ } catch (IOException ignore) {}
}
protected String joinPath(String... pathList) {
[2/6] storm git commit: add joinPath() utility method;
Posted by bo...@apache.org.
add joinPath() utility method;
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/0e0cc9ec
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/0e0cc9ec
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/0e0cc9ec
Branch: refs/heads/master
Commit: 0e0cc9ec292b6697e66ff004550e81b1bfe2309e
Parents: 4f04d1a
Author: Chuck Burgess <cb...@progressrail.com>
Authored: Wed Dec 9 09:57:19 2015 -0600
Committer: Chuck Burgess <cb...@progressrail.com>
Committed: Wed Dec 9 11:00:49 2015 -0600
----------------------------------------------------------------------
.../backtype/storm/localizer/LocalizerTest.java | 43 +++++++++++---------
1 file changed, 23 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/0e0cc9ec/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
----------------------------------------------------------------------
diff --git a/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java b/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
index 1eeae23..3ffd2b1 100644
--- a/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
+++ b/storm-core/test/jvm/backtype/storm/localizer/LocalizerTest.java
@@ -31,6 +31,7 @@ import backtype.storm.generated.SettableBlobMeta;
import backtype.storm.utils.Utils;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
+import com.google.common.base.Joiner;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -125,17 +126,20 @@ public class LocalizerTest {
FileUtils.deleteDirectory(baseDir);
}
+ protected String joinPath(String... pathList) {
+ return Joiner.on(File.separator).join(pathList);
+ }
+
public String constructUserCacheDir(String base, String user) {
- return base + File.separator + Localizer.USERCACHE + File.separator + user;
+ return joinPath(base, Localizer.USERCACHE, user);
}
public String constructExpectedFilesDir(String base, String user) {
- return constructUserCacheDir(base, user) + File.separator + Localizer.FILECACHE + File.separator + Localizer.FILESDIR;
+ return joinPath(constructUserCacheDir(base, user), Localizer.FILECACHE, Localizer.FILESDIR);
}
public String constructExpectedArchivesDir(String base, String user) {
- return constructUserCacheDir(base, user) + File.separator + Localizer.FILECACHE + File.separator + Localizer
- .ARCHIVESDIR;
+ return joinPath(constructUserCacheDir(base, user), Localizer.FILECACHE, Localizer.ARCHIVESDIR);
}
@Test
@@ -147,7 +151,7 @@ public class LocalizerTest {
assertEquals("get local user dir doesn't return right value",
expectedDir, localizer.getLocalUserDir(user1).toString());
- String expectedFileDir = expectedDir + File.separator + Localizer.FILECACHE;
+ String expectedFileDir = joinPath(expectedDir, Localizer.FILECACHE);
assertEquals("get local user file dir doesn't return right value",
expectedFileDir, localizer.getLocalUserFileCacheDir(user1).toString());
}
@@ -287,8 +291,8 @@ public class LocalizerTest {
user1Dir);
long timeAfter = System.nanoTime();
- String expectedUserDir = baseDir + File.separator + Localizer.USERCACHE + File.separator + user1;
- String expectedFileDir = expectedUserDir + File.separator + Localizer.FILECACHE + File.separator + Localizer.ARCHIVESDIR;
+ String expectedUserDir = joinPath(baseDir.toString(), Localizer.USERCACHE, user1);
+ String expectedFileDir = joinPath(expectedUserDir, Localizer.FILECACHE, Localizer.ARCHIVESDIR);
assertTrue("user filecache dir not created", new File(expectedFileDir).exists());
File keyFile = new File(expectedFileDir, key1 + ".0");
assertTrue("blob not created", keyFile.exists());
@@ -364,8 +368,8 @@ public class LocalizerTest {
user1Dir);
long timeAfter = System.nanoTime();
- String expectedUserDir = baseDir + File.separator + Localizer.USERCACHE + File.separator + user1;
- String expectedFileDir = expectedUserDir + File.separator + Localizer.FILECACHE + File.separator + Localizer.FILESDIR;
+ String expectedUserDir = joinPath(baseDir.toString(), Localizer.USERCACHE, user1);
+ String expectedFileDir = joinPath(expectedUserDir, Localizer.FILECACHE, Localizer.FILESDIR);
assertTrue("user filecache dir not created", new File(expectedFileDir).exists());
File keyFile = new File(expectedFileDir, key1);
File keyFileCurrentSymlink = new File(expectedFileDir, key1 + Utils.DEFAULT_CURRENT_BLOB_SUFFIX);
@@ -437,8 +441,8 @@ public class LocalizerTest {
LocalizedResource lrsrc2 = lrsrcs.get(1);
LocalizedResource lrsrc3 = lrsrcs.get(2);
- String expectedFileDir = baseDir + File.separator + Localizer.USERCACHE + File.separator + user1 +
- File.separator + Localizer.FILECACHE + File.separator + Localizer.FILESDIR;
+ String expectedFileDir = joinPath(baseDir.toString(), Localizer.USERCACHE, user1,
+ Localizer.FILECACHE, Localizer.FILESDIR);
assertTrue("user filecache dir not created", new File(expectedFileDir).exists());
File keyFile = new File(expectedFileDir, key1 + Utils.DEFAULT_CURRENT_BLOB_SUFFIX);
File keyFile2 = new File(expectedFileDir, key2 + Utils.DEFAULT_CURRENT_BLOB_SUFFIX);
@@ -570,13 +574,12 @@ public class LocalizerTest {
LocalizedResource lrsrc1_user3 = localizer.getBlob(new LocalResource(key1, false), user3,
topo3, user3Dir);
- String expectedUserDir1 = baseDir + File.separator + Localizer.USERCACHE + File.separator + user1;
- String expectedFileDirUser1 = expectedUserDir1 + File.separator + Localizer.FILECACHE + File.separator +
- Localizer.FILESDIR;
- String expectedFileDirUser2 = baseDir + File.separator + Localizer.USERCACHE + File.separator + user2 +
- File.separator + Localizer.FILECACHE + File.separator + Localizer.FILESDIR;
- String expectedFileDirUser3 = baseDir + File.separator + Localizer.USERCACHE + File.separator + user3 +
- File.separator + Localizer.FILECACHE + File.separator + Localizer.FILESDIR;
+ String expectedUserDir1 = joinPath(baseDir.toString(), Localizer.USERCACHE, user1);
+ String expectedFileDirUser1 = joinPath(expectedUserDir1, Localizer.FILECACHE, Localizer.FILESDIR);
+ String expectedFileDirUser2 = joinPath(baseDir.toString(), Localizer.USERCACHE, user2,
+ Localizer.FILECACHE, Localizer.FILESDIR);
+ String expectedFileDirUser3 = joinPath(baseDir.toString(), Localizer.USERCACHE, user3,
+ Localizer.FILECACHE, Localizer.FILESDIR);
assertTrue("user filecache dir user1 not created", new File(expectedFileDirUser1).exists());
assertTrue("user filecache dir user2 not created", new File(expectedFileDirUser2).exists());
assertTrue("user filecache dir user3 not created", new File(expectedFileDirUser3).exists());
@@ -637,8 +640,8 @@ public class LocalizerTest {
LocalizedResource lrsrc = localizer.getBlob(new LocalResource(key1, false), user1, topo1,
user1Dir);
- String expectedUserDir = baseDir + File.separator + Localizer.USERCACHE + File.separator + user1;
- String expectedFileDir = expectedUserDir + File.separator + Localizer.FILECACHE + File.separator + Localizer.FILESDIR;
+ String expectedUserDir = joinPath(baseDir.toString(), Localizer.USERCACHE, user1);
+ String expectedFileDir = joinPath(expectedUserDir, Localizer.FILECACHE, Localizer.FILESDIR);
assertTrue("user filecache dir not created", new File(expectedFileDir).exists());
File keyFile = new File(expectedFileDir, key1);
File keyFileCurrentSymlink = new File(expectedFileDir, key1 + Utils.DEFAULT_CURRENT_BLOB_SUFFIX);