Michael Blow has submitted this change and it was merged. Change subject: [NO ISSUE] enable installer dir to be overridden in LicensingIT ......................................................................
[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]> --- M asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/LicensingIT.java 1 file changed, 7 insertions(+), 5 deletions(-) Approvals: Michael Blow: Verified; No violations found; Verified Murtadha Hubail: Looks good to me, approved 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 @@ @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() { -- To view, visit https://asterix-gerrit.ics.uci.edu/2214 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8ba5637b05418438501e5574c59a34cb538d1443 Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Murtadha Hubail <[email protected]>
