You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2019/08/09 06:47:18 UTC

svn commit: r1864770 [2/2] - in /jackrabbit/commons/filevault/trunk: vault-cli/src/main/java/org/apache/jackrabbit/vault/cli/ vault-cli/src/main/java/org/apache/jackrabbit/vault/util/console/ vault-cli/src/main/java/org/apache/jackrabbit/vault/util/con...

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSpecialDoubleProperties.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSpecialDoubleProperties.java?rev=1864770&r1=1864769&r2=1864770&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSpecialDoubleProperties.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSpecialDoubleProperties.java Fri Aug  9 06:47:17 2019
@@ -72,20 +72,21 @@ public class TestSpecialDoubleProperties
 
         Archive.Entry e = pkg.getArchive().getEntry("jcr_root/tmp/.content.xml");
         InputSource is = pkg.getArchive().getInputSource(e);
-        Reader r = new InputStreamReader(is.getByteStream(), "utf-8");
-        String contentXml = IOUtils.toString(r);
+        try (Reader r = new InputStreamReader(is.getByteStream(), "utf-8")) {
+            String contentXml = IOUtils.toString(r);
 
-        assertEquals("Serialized content",
-                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-                        "<jcr:root xmlns:jcr=\"http://www.jcp.org/jcr/1.0\" xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\"\n" +
-                        "    jcr:primaryType=\"nt:unstructured\">\n" +
-                        "    <jcr:content\n" +
-                        "        jcr:primaryType=\"nt:unstructured\"\n" +
-                        "        double_nan=\"{Double}NaN\"\n" +
-                        "        double_neg_inf=\"{Double}-Infinity\"\n" +
-                        "        double_pos_inf=\"{Double}Infinity\"/>\n" +
-                        "</jcr:root>\n",
-                contentXml);
+            assertEquals("Serialized content",
+                    "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                            "<jcr:root xmlns:jcr=\"http://www.jcp.org/jcr/1.0\" xmlns:nt=\"http://www.jcp.org/jcr/nt/1.0\"\n" +
+                            "    jcr:primaryType=\"nt:unstructured\">\n" +
+                            "    <jcr:content\n" +
+                            "        jcr:primaryType=\"nt:unstructured\"\n" +
+                            "        double_nan=\"{Double}NaN\"\n" +
+                            "        double_neg_inf=\"{Double}-Infinity\"\n" +
+                            "        double_pos_inf=\"{Double}Infinity\"/>\n" +
+                            "</jcr:root>\n",
+                    contentXml);
+        }
         pkg.close();
         tmpFile.delete();
     }

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSubPackages.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSubPackages.java?rev=1864770&r1=1864769&r2=1864770&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSubPackages.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestSubPackages.java Fri Aug  9 06:47:17 2019
@@ -674,61 +674,62 @@ public class TestSubPackages extends Int
         JcrPackage pkg = packMgr.open(PACKAGE_ID_SUB_TEST);
         packMgr.assemble(pkg, new DefaultProgressListener());
 
-        ZipInputStream in = new ZipInputStream(pkg.getData().getBinary().getStream());
-        ZipEntry e;
-        List<String> entries = new ArrayList<>();
-        String filter = "";
-        while ((e = in.getNextEntry()) != null) {
-            entries.add(e.getName());
-            if ("META-INF/vault/filter.xml".equals(e.getName())) {
-                filter = IOUtils.toString(in, "utf-8");
+        try (ZipInputStream in = new ZipInputStream(pkg.getData().getBinary().getStream())) {
+            ZipEntry e;
+            List<String> entries = new ArrayList<>();
+            String filter = "";
+            while ((e = in.getNextEntry()) != null) {
+                entries.add(e.getName());
+                if ("META-INF/vault/filter.xml".equals(e.getName())) {
+                    filter = IOUtils.toString(in, "utf-8");
+                }
             }
-        }
-        in.close();
-        Collections.sort(entries);
-        StringBuffer result = new StringBuffer();
-        for (String name: entries) {
-            // exclude some of the entries that depend on the repository setup
-            if ("jcr_root/etc/.content.xml".equals(name)
-                    || "jcr_root/etc/packages/my_packages/.content.xml".equals(name)
-                    || "jcr_root/etc/packages/.content.xml".equals(name)) {
-                continue;
+            Collections.sort(entries);
+            StringBuffer result = new StringBuffer();
+            for (String name: entries) {
+                // exclude some of the entries that depend on the repository setup
+                if ("jcr_root/etc/.content.xml".equals(name)
+                        || "jcr_root/etc/packages/my_packages/.content.xml".equals(name)
+                        || "jcr_root/etc/packages/.content.xml".equals(name)) {
+                    continue;
+                }
+                result.append(name).append("\n");
             }
-            result.append(name).append("\n");
+        
+            assertEquals("Filter must be correct",
+                    "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                    "<workspaceFilter version=\"1.0\">\n" +
+                    "    <filter root=\"/etc/packages/my_packages/sub_a.zip\"/>\n" +
+                    "    <filter root=\"/etc/packages/my_packages/sub_b.zip\"/>\n" +
+                    "</workspaceFilter>\n", filter);
+    
+            assertEquals("Package must contain proper entries.",
+                    "META-INF/\n" +
+                    "META-INF/MANIFEST.MF\n" +
+                    "META-INF/vault/\n" +
+                    "META-INF/vault/config.xml\n" +
+                    "META-INF/vault/definition/\n" +
+                    "META-INF/vault/definition/.content.xml\n" +
+                    "META-INF/vault/filter.xml\n" +
+                    "META-INF/vault/nodetypes.cnd\n" +
+                    "META-INF/vault/properties.xml\n" +
+                    "jcr_root/.content.xml\n" +
+                    "jcr_root/etc/\n" +
+                    "jcr_root/etc/packages/\n" +
+                    "jcr_root/etc/packages/my_packages/\n" +
+                    "jcr_root/etc/packages/my_packages/sub_a.zip\n" +
+                    "jcr_root/etc/packages/my_packages/sub_a.zip.dir/\n" +
+                    "jcr_root/etc/packages/my_packages/sub_a.zip.dir/.content.xml\n" +
+                    "jcr_root/etc/packages/my_packages/sub_a.zip.dir/_jcr_content/\n" +
+                    "jcr_root/etc/packages/my_packages/sub_a.zip.dir/_jcr_content/_vlt_definition/\n" +
+                    "jcr_root/etc/packages/my_packages/sub_a.zip.dir/_jcr_content/_vlt_definition/.content.xml\n" +
+                    "jcr_root/etc/packages/my_packages/sub_b.zip\n" +
+                    "jcr_root/etc/packages/my_packages/sub_b.zip.dir/\n" +
+                    "jcr_root/etc/packages/my_packages/sub_b.zip.dir/.content.xml\n" +
+                    "jcr_root/etc/packages/my_packages/sub_b.zip.dir/_jcr_content/\n" +
+                    "jcr_root/etc/packages/my_packages/sub_b.zip.dir/_jcr_content/_vlt_definition/\n" +
+                    "jcr_root/etc/packages/my_packages/sub_b.zip.dir/_jcr_content/_vlt_definition/.content.xml\n", result.toString());
         }
-        assertEquals("Filter must be correct",
-                "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-                "<workspaceFilter version=\"1.0\">\n" +
-                "    <filter root=\"/etc/packages/my_packages/sub_a.zip\"/>\n" +
-                "    <filter root=\"/etc/packages/my_packages/sub_b.zip\"/>\n" +
-                "</workspaceFilter>\n", filter);
-
-        assertEquals("Package must contain proper entries.",
-                "META-INF/\n" +
-                "META-INF/MANIFEST.MF\n" +
-                "META-INF/vault/\n" +
-                "META-INF/vault/config.xml\n" +
-                "META-INF/vault/definition/\n" +
-                "META-INF/vault/definition/.content.xml\n" +
-                "META-INF/vault/filter.xml\n" +
-                "META-INF/vault/nodetypes.cnd\n" +
-                "META-INF/vault/properties.xml\n" +
-                "jcr_root/.content.xml\n" +
-                "jcr_root/etc/\n" +
-                "jcr_root/etc/packages/\n" +
-                "jcr_root/etc/packages/my_packages/\n" +
-                "jcr_root/etc/packages/my_packages/sub_a.zip\n" +
-                "jcr_root/etc/packages/my_packages/sub_a.zip.dir/\n" +
-                "jcr_root/etc/packages/my_packages/sub_a.zip.dir/.content.xml\n" +
-                "jcr_root/etc/packages/my_packages/sub_a.zip.dir/_jcr_content/\n" +
-                "jcr_root/etc/packages/my_packages/sub_a.zip.dir/_jcr_content/_vlt_definition/\n" +
-                "jcr_root/etc/packages/my_packages/sub_a.zip.dir/_jcr_content/_vlt_definition/.content.xml\n" +
-                "jcr_root/etc/packages/my_packages/sub_b.zip\n" +
-                "jcr_root/etc/packages/my_packages/sub_b.zip.dir/\n" +
-                "jcr_root/etc/packages/my_packages/sub_b.zip.dir/.content.xml\n" +
-                "jcr_root/etc/packages/my_packages/sub_b.zip.dir/_jcr_content/\n" +
-                "jcr_root/etc/packages/my_packages/sub_b.zip.dir/_jcr_content/_vlt_definition/\n" +
-                "jcr_root/etc/packages/my_packages/sub_b.zip.dir/_jcr_content/_vlt_definition/.content.xml\n", result.toString());
     }
 
     /**

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSRegisteredPackageTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSRegisteredPackageTest.java?rev=1864770&r1=1864769&r2=1864770&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSRegisteredPackageTest.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/registry/impl/FSRegisteredPackageTest.java Fri Aug  9 06:47:17 2019
@@ -42,12 +42,11 @@ public class FSRegisteredPackageTest {
     private static final PackageId DUMMY_ID = new PackageId("someGroup", "someName", "someVersion");
 
     private File getTempFile(String name) throws IOException {
-        InputStream in = getClass().getResourceAsStream(name);
         File tmpFile = File.createTempFile("vaultpack", ".zip");
-        FileOutputStream out = FileUtils.openOutputStream(tmpFile);
-        IOUtils.copy(in, out);
-        in.close();
-        out.close();
+        try (InputStream in = getClass().getResourceAsStream(name);
+             FileOutputStream out = FileUtils.openOutputStream(tmpFile)) {
+            IOUtils.copy(in, out);
+        }
         return tmpFile;
     }
 

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/util/MD5Test.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/util/MD5Test.java?rev=1864770&r1=1864769&r2=1864770&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/util/MD5Test.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/util/MD5Test.java Fri Aug  9 06:47:17 2019
@@ -65,9 +65,10 @@ public class MD5Test extends TestCase {
 
 
     public void testDigest() throws IOException {
-        InputStream in = new ByteArrayInputStream(testData.getBytes());
-        MD5 md5 = MD5.digest(in);
-        assertEquals(testString, md5.toString());
+        try (InputStream in = new ByteArrayInputStream(testData.getBytes())) {
+            MD5 md5 = MD5.digest(in);
+            assertEquals(testString, md5.toString());
+        }
     }
 
     private void assertEquals(byte[] expected, byte[] result) {

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/util/SHA1Test.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/util/SHA1Test.java?rev=1864770&r1=1864769&r2=1864770&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/util/SHA1Test.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/util/SHA1Test.java Fri Aug  9 06:47:17 2019
@@ -67,9 +67,10 @@ public class SHA1Test extends TestCase {
 
 
     public void testDigest() throws IOException {
-        InputStream in = new ByteArrayInputStream(testData.getBytes());
-        SHA1 sha1 = SHA1.digest(in);
-        assertEquals(testString, sha1.toString());
+        try (InputStream in = new ByteArrayInputStream(testData.getBytes())) {
+            SHA1 sha1 = SHA1.digest(in);
+            assertEquals(testString, sha1.toString());
+        }
     }
 
     private void assertEquals(byte[] expected, byte[] result) {