From 31137f6ebe06290df8860c36613dc9da34e75fe2 Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Tue, 15 Mar 2016 11:24:28 +0000 Subject: [PATCH] Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1) 121758 nsmintanca: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0) 121690 mrogers: UTF-370 - Replace TgZFormatIntegrationTest with ZipFormatIntegrationTest git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123969 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- ...est.java => ZipFormatIntegrationTest.java} | 252 +++++++++--------- 1 file changed, 124 insertions(+), 128 deletions(-) rename enterprise-update/src/test/java/org/alfresco/update/pkg/test/{TgzFormatIntegrationTest.java => ZipFormatIntegrationTest.java} (69%) diff --git a/enterprise-update/src/test/java/org/alfresco/update/pkg/test/TgzFormatIntegrationTest.java b/enterprise-update/src/test/java/org/alfresco/update/pkg/test/ZipFormatIntegrationTest.java similarity index 69% rename from enterprise-update/src/test/java/org/alfresco/update/pkg/test/TgzFormatIntegrationTest.java rename to enterprise-update/src/test/java/org/alfresco/update/pkg/test/ZipFormatIntegrationTest.java index 30a33760dd..9617d1b070 100644 --- a/enterprise-update/src/test/java/org/alfresco/update/pkg/test/TgzFormatIntegrationTest.java +++ b/enterprise-update/src/test/java/org/alfresco/update/pkg/test/ZipFormatIntegrationTest.java @@ -1,128 +1,124 @@ -/* - * Copyright 2005-2015 Alfresco Software, Ltd. All rights reserved. - * - * License rights for this program may be obtained from Alfresco Software, Ltd. - * pursuant to a written agreement and any use of this program without such an - * agreement is prohibited. - */ -package org.alfresco.update.pkg.test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; - -import org.apache.commons.compress.archivers.ArchiveException; -import org.apache.commons.compress.archivers.ArchiveStreamFactory; -import org.apache.commons.compress.archivers.tar.TarArchiveEntry; -import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; -import org.apache.commons.compress.compressors.CompressorException; -import org.apache.commons.compress.compressors.CompressorInputStream; -import org.apache.commons.compress.compressors.CompressorStreamFactory; -import org.junit.Before; -import org.junit.Test; - -/** - * Tests for the tgz format packaging. - * - * To run these tests in Eclipse, add the following to the "VM arguments" for the junit Run Configuration: - * 
- *   -Dalfresco.update.package.tgz=target/alfresco-enterprise-update-package-2015-1-EA-SNAPSHOT.zip
- *
- * - * @author Matt Ward - */ -public class TgzFormatIntegrationTest extends AbstractIntegrationTest -{ - private boolean found; - - File updatePackage; - - @Before - public void setUp() throws Exception - { - super.setUp(); - String pkgName = System.getProperty("alfresco.update.package.tgz"); - assertNotNull("Could not determine package name.", pkgName); - updatePackage = new File(pkgName); - } - - public final String ARTIFACT_NAME="alfresco-enterprise-update-package-"; - - @Test - public void applyUpdatesScriptHasExecutableBitsSet() throws FileNotFoundException, ArchiveException, IOException, CompressorException - { - - if (runningOnWindows()) - { - // This is a Unix only test. - return; - } - - assertTrue("File does not exist: "+ updatePackage, updatePackage.exists()); - FileInputStream fis = null; - try - { - fis = new FileInputStream(updatePackage); - - handleArchiveEntries(fis, new ArchiveEntryHandler() - { - @Override - public boolean handle(TarArchiveEntry entry) - { - System.out.println("Handling tar entry: "+entry.getName()); - if (entry.getName().contains("/apply_updates.sh")) - { - System.out.println("Found the unix shell wrapper script."); - - final int expectedPerms = 0755; - // Other bits may be set, but check 755 octal are set. - System.out.println("File has permissions: "+Integer.toString(entry.getMode(), 8)); - assertEquals(expectedPerms, entry.getMode() & expectedPerms); - found = true; - } - return !found; - } - }); - - assertTrue("apply_updates.sh is a required file.", found); - } - finally - { - if (fis != null) - { - fis.close(); - } - } - } - - private static interface ArchiveEntryHandler - { - boolean handle(TarArchiveEntry entry); - } - - private void handleArchiveEntries(InputStream raw, ArchiveEntryHandler handler) throws ArchiveException, IOException, CompressorException - { - try - ( - BufferedInputStream bis = new BufferedInputStream(raw); - CompressorInputStream gzIs = new CompressorStreamFactory().createCompressorInputStream(bis); - BufferedInputStream bgzIs = new BufferedInputStream(gzIs); - TarArchiveInputStream aris = (TarArchiveInputStream) new ArchiveStreamFactory().createArchiveInputStream(bgzIs); - ) - { - TarArchiveEntry entry = null; - boolean carryOn = true; - while (carryOn && (entry = aris.getNextTarEntry()) != null) - { - carryOn = handler.handle(entry); - } - } - } -} +/* + * Copyright 2005-2015 Alfresco Software, Ltd. All rights reserved. + * + * License rights for this program may be obtained from Alfresco Software, Ltd. + * pursuant to a written agreement and any use of this program without such an + * agreement is prohibited. + */ +package org.alfresco.update.pkg.test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; + +import org.apache.commons.compress.archivers.ArchiveException; +import org.apache.commons.compress.archivers.ArchiveStreamFactory; +import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; +import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream; +import org.apache.commons.compress.compressors.CompressorException; +import org.apache.commons.compress.compressors.CompressorInputStream; +import org.apache.commons.compress.compressors.CompressorStreamFactory; +import org.junit.Before; +import org.junit.Test; + +/** + * Tests for the tgz format packaging. + * + * To run these tests in Eclipse, add the following to the "VM arguments" for the junit Run Configuration: + * 
+ *   -Dalfresco.update.package.zip=target/alfresco-enterprise-update-package-2015-1-EA-SNAPSHOT.zip
+ *
+ * + * @author Matt Ward + */ +public class ZipFormatIntegrationTest extends AbstractIntegrationTest +{ + private boolean found; + + @Before + public void setUp() throws Exception + { + super.setUp(); + } + + public final String ARTIFACT_NAME="alfresco-enterprise-update-package-"; + + @Test + public void applyUpdatesScriptHasExecutableBitsSet() throws FileNotFoundException, ArchiveException, IOException, CompressorException + { + + if (runningOnWindows()) + { + // This is a Unix only test. + return; + } + + File archive = new File(targetDir, ARTIFACT_NAME+version+".zip"); + assertTrue("File does not exist: "+archive, archive.exists()); + FileInputStream fis = null; + try + { + fis = new FileInputStream(archive); + + handleArchiveEntries(fis, new ArchiveEntryHandler() + { + @Override + public boolean handle(ZipArchiveEntry entry) + { + System.out.println("Handling tar entry: "+entry.getName()); + if (entry.getName().equals(ARTIFACT_NAME+version+"/apply_updates.sh")) + { + System.out.println("Found the unix shell wrapper script."); + + final int expectedPerms = 0755; + // Other bits may be set, but check 755 octal are set. + System.out.println("File has permissions: "+Integer.toString(entry.getUnixMode(), 8)); + assertEquals(expectedPerms, entry.getUnixMode() & expectedPerms); + found = true; + } + return !found; + } + }); + + assertTrue("apply_updates.sh is a required file.", found); + } + finally + { + if (fis != null) + { + fis.close(); + } + } + } + + private static interface ArchiveEntryHandler + { + boolean handle(ZipArchiveEntry entry); + } + + private void handleArchiveEntries(InputStream raw, ArchiveEntryHandler handler) throws ArchiveException, IOException, CompressorException + { + try + ( + BufferedInputStream bis = new BufferedInputStream(raw); + //CompressorInputStream gzIs = new CompressorStreamFactory().createCompressorInputStream(bis); + BufferedInputStream bgzIs = new BufferedInputStream(bis); + ZipArchiveInputStream aris = (ZipArchiveInputStream) new ArchiveStreamFactory().createArchiveInputStream(bgzIs); + ) + { + ZipArchiveEntry entry = null; + boolean carryOn = true; + while (carryOn && (entry = aris.getNextZipEntry()) != null) + { + carryOn = handler.handle(entry); + } + } + } +}