You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/02/09 16:05:07 UTC
[1/2] incubator-brooklyn git commit: Adds ArchiveUtilsTest + fixes
ArchiveUtils
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 845afe382 -> e59aac03b
Adds ArchiveUtilsTest + fixes ArchiveUtils
- Fixes case where optionalTmpDir not supplied
- Adds various test cases
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a1c83f6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a1c83f6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a1c83f6e
Branch: refs/heads/master
Commit: a1c83f6e2837b07a5af90ab3181f2a5385b1f4aa
Parents: 98f7667
Author: Aled Sage <al...@gmail.com>
Authored: Tue Jan 27 16:27:50 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Jan 27 20:24:19 2015 +0000
----------------------------------------------------------------------
.../java/brooklyn/util/file/ArchiveUtils.java | 2 +-
.../brooklyn/util/file/ArchiveUtilsTest.java | 135 +++++++++++++++++++
2 files changed, 136 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1c83f6e/core/src/main/java/brooklyn/util/file/ArchiveUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/util/file/ArchiveUtils.java b/core/src/main/java/brooklyn/util/file/ArchiveUtils.java
index b93783c..e8233c2 100644
--- a/core/src/main/java/brooklyn/util/file/ArchiveUtils.java
+++ b/core/src/main/java/brooklyn/util/file/ArchiveUtils.java
@@ -273,7 +273,7 @@ public class ArchiveUtils {
// extract, now using task if available
MutableList<String> commands = MutableList.copyOf(installCommands(destFile))
- .appendAll(extractCommands(destFile, optionalTmpDir, destDir, false, keepArchiveAfterUnpacking));
+ .appendAll(extractCommands(destFile, tmpDir, destDir, false, keepArchiveAfterUnpacking));
if (DynamicTasks.getTaskQueuingContext()!=null) {
result = DynamicTasks.queue(SshTasks.newSshExecTaskFactory(machine, commands.toArray(new String[0])).summary("extracting archive").requiringExitCodeZero()).get();
} else {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a1c83f6e/core/src/test/java/brooklyn/util/file/ArchiveUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/util/file/ArchiveUtilsTest.java b/core/src/test/java/brooklyn/util/file/ArchiveUtilsTest.java
new file mode 100644
index 0000000..dba8410
--- /dev/null
+++ b/core/src/test/java/brooklyn/util/file/ArchiveUtilsTest.java
@@ -0,0 +1,135 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package brooklyn.util.file;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
+import java.io.File;
+import java.util.Map;
+
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import brooklyn.entity.BrooklynAppUnitTestSupport;
+import brooklyn.location.basic.SshMachineLocation;
+import brooklyn.util.ResourceUtils;
+import brooklyn.util.os.Os;
+
+import com.google.api.client.repackaged.com.google.common.base.Joiner;
+import com.google.common.base.Charsets;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.io.Files;
+
+// Test are integration, because relies on ssh/scp via SshMachineLocation
+public class ArchiveUtilsTest extends BrooklynAppUnitTestSupport {
+
+ private SshMachineLocation machine;
+ private ResourceUtils resourceUtils;
+
+ private Map<String, String> archiveContents = ImmutableMap.of("a.txt", "mya");
+ private File destDir;
+ private File origZip;
+ private File origJar;
+
+ @BeforeClass(alwaysRun=true)
+ public void setUpClass() throws Exception {
+ origZip = newZip(archiveContents);
+ origJar = Os.newTempFile(ArchiveUtilsTest.class, ".jar");
+ Files.copy(origZip, origJar);
+ }
+
+ @AfterClass(alwaysRun=true)
+ public void tearDownClass() throws Exception {
+ if (origZip != null) origZip.delete();
+ if (origJar != null) origJar.delete();
+ }
+
+ @BeforeMethod(alwaysRun=true)
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ machine = app.newLocalhostProvisioningLocation().obtain();
+ resourceUtils = ResourceUtils.create(ArchiveUtilsTest.class);
+ destDir = Os.newTempDir(getClass().getSimpleName());
+ }
+
+ @AfterMethod(alwaysRun=true)
+ @Override
+ public void tearDown() throws Exception {
+ super.tearDown();
+ if (destDir != null) Os.deleteRecursively(destDir);
+ }
+
+ @Test(groups="Integration")
+ public void testDeployZipWithNoOptionalArgsSupplied() throws Exception {
+ boolean result = ArchiveUtils.deploy(resourceUtils, ImmutableMap.<String, Object>of(), origZip.getAbsolutePath(), machine, destDir.getAbsolutePath(), true, null, null);
+ assertTrue(result);
+ assertFilesEqual(new File(destDir, origZip.getName()), origZip);
+ assertSubFilesEqual(destDir, archiveContents);
+ }
+
+ @Test(groups="Integration")
+ public void testDeployZipDeletingArchiveAfterUnpack() throws Exception {
+ boolean result = ArchiveUtils.deploy(resourceUtils, ImmutableMap.<String, Object>of(), origZip.getAbsolutePath(), machine, destDir.getAbsolutePath(), false, null, null);
+ assertTrue(result);
+ assertFalse(new File(destDir, origZip.getName()).exists());
+ assertSubFilesEqual(destDir, archiveContents);
+ }
+
+ @Test(groups="Integration")
+ public void testDeployJarNotUnpacked() throws Exception {
+ ArchiveUtils.deploy(origJar.getAbsolutePath(), machine, destDir.getAbsolutePath());
+ assertFilesEqual(new File(destDir, origJar.getName()), origJar);
+ }
+
+ @Test(groups="Integration")
+ public void testDeployExplicitDestFile() throws Exception {
+ String destFile = "custom-destFile.jar";
+ ArchiveUtils.deploy(origJar.getAbsolutePath(), machine, destDir.getAbsolutePath(), destFile);
+ assertFilesEqual(new File(destDir, destFile), origJar);
+ }
+
+ private File newZip(Map<String, String> files) throws Exception {
+ File parentDir = Os.newTempDir(getClass().getSimpleName()+"-archive");
+ for (Map.Entry<String, String> entry : files.entrySet()) {
+ File subFile = new File(Os.mergePaths(parentDir.getAbsolutePath(), entry.getKey()));
+ subFile.getParentFile().mkdirs();
+ Files.write(entry.getValue(), subFile, Charsets.UTF_8);
+ }
+ return ArchiveBuilder.zip().addDirContentsAt(parentDir, ".").create();
+ }
+
+ private void assertFilesEqual(File f1, File f2) throws Exception {
+ byte[] bytes1 = Files.asByteSource(f1).read();
+ byte[] bytes2 = Files.asByteSource(f1).read();
+ assertEquals(bytes1, bytes2, "f1="+f1+"; f2="+f2);
+ }
+
+ private void assertSubFilesEqual(File parentDir, Map<String, String> files) throws Exception {
+ for (Map.Entry<String, String> entry : archiveContents.entrySet()) {
+ File subFile = new File(Os.mergePaths(parentDir.getAbsolutePath(), entry.getKey()));
+ assertEquals(Joiner.on("\n").join(Files.readLines(subFile, Charsets.UTF_8)), entry.getValue());
+ }
+ }
+}
[2/2] incubator-brooklyn git commit: This closes #475
Posted by al...@apache.org.
This closes #475
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e59aac03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e59aac03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e59aac03
Branch: refs/heads/master
Commit: e59aac03bc21c63dc8f0613edc42c1b8cea7bb98
Parents: 845afe3 a1c83f6
Author: Aled Sage <al...@gmail.com>
Authored: Mon Feb 9 15:04:58 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Feb 9 15:04:58 2015 +0000
----------------------------------------------------------------------
.../java/brooklyn/util/file/ArchiveUtils.java | 2 +-
.../brooklyn/util/file/ArchiveUtilsTest.java | 135 +++++++++++++++++++
2 files changed, 136 insertions(+), 1 deletion(-)
----------------------------------------------------------------------