Merge branch 'develop' of github.com:oracle/weblogic-deploy-tooling into develop

Author: robertpatrick

core/src/test/java/oracle/weblogic/deploy/util/FileUtilsTest.java

@@ -7,16 +7,18 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.nio.file.attribute.PosixFilePermission;
 import java.text.MessageFormat;
 import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class FileUtilsTest {
     private static final String FILE_ERR_FORMAT = "Unexpected {0}: got {1}, expected {2}";
@@ -60,15 +62,15 @@ public class FileUtilsTest {
     private static final File UNIT_TEST_TARGET_DIR = new File(WLSDeployZipFileTest.UNIT_TEST_TARGET_DIR, "fileutils");
     private static final String WALLET_PATH = "wlsdeploy/wallet.zip";
 
-    @Before
-    public void initialize() throws Exception {
+    @BeforeAll
+    static void initialize() throws Exception {
         if(!UNIT_TEST_TARGET_DIR.exists() && !UNIT_TEST_TARGET_DIR.mkdirs()) {
             throw new Exception("Unable to create unit test directory: " + UNIT_TEST_TARGET_DIR);
         }
     }
 
     @Test
-    public void testNormalFile_parseFileName() throws Exception {
+    void testNormalFile_parseFileName() {
         File f = new File(FILE1);
         String[] nameComponents = FileUtils.parseFileName(f);
         assertMatch("filename", nameComponents[0], FILE1_EXPECTED_NAME);
@@ -111,22 +113,22 @@ public void testNormalFile_parseFileName() throws Exception {
     }
 
     @Test
-    public void testHashing() throws Exception {
+    void testHashing() throws Exception {
         File archiveFile = FileUtils.getCanonicalFile(new File(ARCHIVE_FILE_NAME));
         WLSDeployArchive archive = new WLSDeployArchive(archiveFile.getAbsolutePath());
         String archiveHash = archive.getFileHash(APP_PATH);
 
         File appFile = FileUtils.getCanonicalFile(new File(APP_FILE_NAME));
         String appHash = FileUtils.computeHash(appFile.getAbsolutePath());
 
-        Assert.assertEquals(appHash, archiveHash);
+        assertEquals(appHash, archiveHash);
     }
 
     @Test
     /* A wallet zip inside the archive must not contain an entry such as ../info.txt,
        since this creates a file overwrite security vulnerability (zip slip).
      */
-    public void testZipVulnerability() throws Exception {
+    void testZipVulnerability() throws Exception {
         String extractPath = UNIT_TEST_TARGET_DIR.getPath();
 
         // an entry with a simple name or path works fine
@@ -135,15 +137,12 @@ public void testZipVulnerability() throws Exception {
         FileUtils.extractZipFileContent(deployArchive, WALLET_PATH, extractPath);
 
         // an entry with parent directory notation should throw an exception
-        try {
-            zipFile = buildWalletArchiveZip("../info.txt");
-            deployArchive = new WLSDeployArchive(zipFile.getPath());
-            FileUtils.extractZipFileContent(deployArchive, WALLET_PATH, extractPath);
-            Assert.fail("Exception not thrown for zip entry outside extract directory");
-
-        } catch(IllegalArgumentException e) {
-            // expected behavior
-        }
+        zipFile = buildWalletArchiveZip("../info.txt");
+        final WLSDeployArchive deployArchive2 = new WLSDeployArchive(zipFile.getPath());
+        assertThrows(IllegalArgumentException.class,
+            () -> FileUtils.extractZipFileContent(deployArchive2, WALLET_PATH, extractPath),
+            "Exception not thrown for zip entry outside extract directory");
+
     }
 
     /* Build an archive zip containing a wallet zip.
@@ -174,19 +173,18 @@ private File buildWalletArchiveZip(String contentName) throws Exception {
     }
 
     private void assertMatch(String name, String got, String expected) {
-        Assert.assertTrue(MessageFormat.format(FILE_ERR_FORMAT, name, got, expected),
-            got.equals(expected));
+        assertEquals(expected, got, MessageFormat.format(FILE_ERR_FORMAT, name, got, expected));
     }
 
     @Test
-    public void posixPermissions() throws IOException {
+    void posixPermissions() {
         Set<PosixFilePermission> perms = FileUtils.getPermissions(0700);
-        Assert.assertTrue(perms.contains(PosixFilePermission.OWNER_READ));
-        Assert.assertTrue(perms.contains(PosixFilePermission.OWNER_WRITE));
-        Assert.assertTrue(perms.contains(PosixFilePermission.OWNER_EXECUTE));
+        assertTrue(perms.contains(PosixFilePermission.OWNER_READ));
+        assertTrue(perms.contains(PosixFilePermission.OWNER_WRITE));
+        assertTrue(perms.contains(PosixFilePermission.OWNER_EXECUTE));
 
         Set<PosixFilePermission> perms2 = FileUtils.getPermissions(0006);
-        Assert.assertTrue(perms2.contains(PosixFilePermission.OTHERS_READ));
-        Assert.assertTrue(perms2.contains(PosixFilePermission.OTHERS_WRITE));
+        assertTrue(perms2.contains(PosixFilePermission.OTHERS_READ));
+        assertTrue(perms2.contains(PosixFilePermission.OTHERS_WRITE));
     }
 }

core/src/test/java/oracle/weblogic/deploy/util/PyOrderedDictTest.java

@@ -4,29 +4,27 @@
  */
 package oracle.weblogic.deploy.util;
 
-import org.python.core.PyList;
-import org.python.core.PyTuple;
-import org.python.core.PyString;
+import org.junit.jupiter.api.Test;
+import org.python.core.PyDictionary;
 import org.python.core.PyInteger;
+import org.python.core.PyList;
 import org.python.core.PyObject;
-import org.python.core.PyDictionary;
-
-import org.junit.jupiter.api.Test;
+import org.python.core.PyString;
+import org.python.core.PyTuple;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class PyOrderedDictTest {
     @Test
-    public void testIsInstance() throws Exception {
+    void testIsInstance() {
         PyOrderedDict myOrderedDict = new PyOrderedDict();
         boolean result = (myOrderedDict instanceof PyDictionary);
         assertTrue(result, "isinstance(myOrderedDict, dict) returns true");
     }
 
     @Test
-    public void testSetItem() throws Exception {
+    void testSetItem() {
         PyOrderedDict myOrderedDict = new PyOrderedDict();
 
         myOrderedDict.__setitem__("nba_player", new PyString("Steph Curry"));
@@ -45,7 +43,7 @@ public void testSetItem() throws Exception {
     }
 
     @Test
-    public void testKeyOrdering() throws Exception {
+    void testKeyOrdering() {
         PyOrderedDict myOrderedDict = new PyOrderedDict();
 
         myOrderedDict.__setitem__("one", new PyInteger(1));
@@ -72,7 +70,7 @@ public void testKeyOrdering() throws Exception {
     }
 
     @Test
-    public void testIteritems() throws Exception {
+    void testIteritems() {
         PyOrderedDict myOrderedDict = new PyOrderedDict();
 
         myOrderedDict.__setitem__("one", new PyInteger(1));
@@ -90,7 +88,7 @@ public void testIteritems() throws Exception {
     }
 
     @Test
-    public void testOrderedDictAsValue() throws Exception {
+    void testOrderedDictAsValue() {
         PyOrderedDict myOrderedDict = new PyOrderedDict();
         PyOrderedDict anotherOrderedDict = new PyOrderedDict();
         anotherOrderedDict.__setitem__("nested_key", new PyString("nested_value"));
@@ -100,7 +98,7 @@ public void testOrderedDictAsValue() throws Exception {
     }
 
     @Test
-    public void testCopyConstructor() throws Exception {
+    void testCopyConstructor() {
         PyOrderedDict myOrderedDict = new PyOrderedDict();
 
         myOrderedDict.__setitem__("foo", new PyString("bar"));
@@ -109,7 +107,7 @@ public void testCopyConstructor() throws Exception {
     }
 
     @Test
-    public void testUpdate() throws Exception {
+    void testUpdate() {
         PyOrderedDict myOrderedDict = new PyOrderedDict();
         myOrderedDict.__setitem__("network_type", new PyString("ETHERNET"));
 

core/src/test/java/oracle/weblogic/deploy/util/SwapFilesTest.java

@@ -8,12 +8,13 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.security.MessageDigest;
-
 import javax.xml.bind.DatatypeConverter;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 
 public class SwapFilesTest {
@@ -26,62 +27,62 @@ public class SwapFilesTest {
 
     private WLSDeployArchive archive;
 
-    @Before
-    public void init() throws Exception {
+    @BeforeEach
+    void init() {
         File folder = new File(UNIT_TEST_TARGET_DIR);
         File archiveFile = new File(folder, "swapFileTests.zip");
 
         if ( !folder.exists() ) {
-            Assert.assertTrue("Could not create directory " + folder.getPath(), folder.mkdirs());
+            assertTrue(folder.mkdirs(), "Could not create directory " + folder.getPath());
         }
         archive = new WLSDeployArchive( archiveFile.getAbsolutePath() );
     }
 
     @Test
-    public void updateTwoThings() throws Exception {
+    void updateTwoThings() throws Exception {
         File sourceModel = new File(SOURCE_MODEL_FILE);
         archive.addModel(sourceModel);
 
         File unitTestDir = new File(UNIT_TEST_TARGET_DIR);
         archive.extractModel(unitTestDir);
         File targetModel = new File(TARGET_MODEL_FILE);
 
-        Assert.assertTrue("Target model file does not exist", targetModel.exists());
+        assertTrue(targetModel.exists(), "Target model file does not exist");
         String sourceHash = getMD5Hash(sourceModel);
         String targetHash = getMD5Hash(targetModel);
-        Assert.assertEquals("source and target models are different", sourceHash, targetHash);
+        assertEquals(sourceHash, targetHash, "source and target models are different");
 
         archive.removeAllBinaries();
         File sourceApp = new File(SOURCE_APP_FILE);
         archive.addApplication(sourceApp);
         archive.extractFileFromZip(TARGET_APP_ARCHIVE_LOCATION, unitTestDir);
         File targetApp = new File(TARGET_APP_FILE);
 
-        Assert.assertTrue("Target app file does not exist", targetApp.exists());
+        assertTrue(targetApp.exists(), "Target app file does not exist");
         sourceHash = getMD5Hash(sourceApp);
         targetHash = getMD5Hash(targetApp);
-        Assert.assertEquals("source and target apps are different", sourceHash, targetHash);
+        assertEquals(sourceHash, targetHash, "source and target apps are different");
         archive.close();
     }
 
     @Test
-    public void updateModel() throws Exception {
+    void updateModel() throws Exception {
         File sourceModel = new File(SOURCE_MODEL_FILE);
         archive.addModel(sourceModel);
 
         File unitTestDir = new File(UNIT_TEST_TARGET_DIR);
         archive.extractModel(unitTestDir);
         File targetModel = new File(TARGET_MODEL_FILE);
 
-        Assert.assertTrue("Target model file does not exist", targetModel.exists());
+        assertTrue(targetModel.exists(), "Target model file does not exist");
         String sourceHash = getMD5Hash(sourceModel);
         String targetHash = getMD5Hash(targetModel);
-        Assert.assertEquals("source and target models are different", sourceHash, targetHash);
+        assertEquals(sourceHash, targetHash, "source and target models are different");
         archive.close();
     }
 
     @Test
-    public void updateApp() throws Exception {
+    void updateApp() throws Exception {
         File unitTestDir = new File(UNIT_TEST_TARGET_DIR);
 
         archive.removeAllBinaries();
@@ -90,10 +91,10 @@ public void updateApp() throws Exception {
         archive.extractFileFromZip(TARGET_APP_ARCHIVE_LOCATION, unitTestDir);
         File targetApp = new File(TARGET_APP_FILE);
 
-        Assert.assertTrue("Target app file does not exist", targetApp.exists());
+        assertTrue(targetApp.exists(), "Target app file does not exist");
         String sourceHash = getMD5Hash(sourceApp);
         String targetHash = getMD5Hash(targetApp);
-        Assert.assertEquals("source and target apps are different", sourceHash, targetHash);
+        assertEquals(sourceHash, targetHash, "source and target apps are different");
         archive.close();
     }