Repository: asterixdb Updated Branches: refs/heads/master 7626d16aa -> dd1289c72
[NO ISSUE] enable installer dir to be overridden in LicensingIT Change-Id: I8ba5637b05418438501e5574c59a34cb538d1443 Reviewed-on: https://asterix-gerrit.ics.uci.edu/2214 Reviewed-by: Murtadha Hubail <[email protected]> Contrib: Michael Blow <[email protected]> Integration-Tests: Michael Blow <[email protected]> Tested-by: Michael Blow <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/dd1289c7 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/dd1289c7 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/dd1289c7 Branch: refs/heads/master Commit: dd1289c725c1b9a68b83edd0eaee9b0ec84ce38b Parents: 7626d16 Author: Michael Blow <[email protected]> Authored: Sun Dec 10 15:08:07 2017 -0500 Committer: Michael Blow <[email protected]> Committed: Sun Dec 10 14:06:14 2017 -0800 ---------------------------------------------------------------------- .../org/apache/asterix/server/test/LicensingIT.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/dd1289c7/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/LicensingIT.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/LicensingIT.java b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/LicensingIT.java index 3ea5b23..a0e9385 100644 --- a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/LicensingIT.java +++ b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/LicensingIT.java @@ -36,19 +36,21 @@ import org.junit.runners.MethodSorters; @FixMethodOrder(MethodSorters.JVM) public class LicensingIT { - // The "target" subdirectory of asterix-server. All outputs go here. - private static final String TARGET_DIR = FileUtil.joinPath("target"); - protected String installerDir; @Before public void setup() { final String pattern = getInstallerDirPattern(); - final String[] list = new File(TARGET_DIR).list((dir, name) -> name.matches(pattern)); + final String targetDir = getTargetDir(); + final String[] list = new File(targetDir).list((dir, name) -> name.matches(pattern)); Assert.assertNotNull("installerDir", list); Assert.assertFalse("Ambiguous install dir (" + pattern + "): " + Arrays.toString(list), list.length > 1); Assert.assertEquals("Can't find install dir (" + pattern + ")", 1, list.length); - installerDir = FileUtil.joinPath(TARGET_DIR, list[0]); + installerDir = FileUtil.joinPath(targetDir, list[0]); + } + + protected String getTargetDir() { + return FileUtil.joinPath("target"); } protected String getInstallerDirPattern() {
