Move support resources into a resources directory.

That way, they get included as resources and a bunch of tests start passing.
(Primarily the jar and zip tests.)

Change-Id: I977bbe52db64943c8f0f456ea753f81c15c1d345

88 files changed, 99 insertions, 114 deletions

diff --git a/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/PackageTest.java b/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/PackageTest.java
index 61dab9a..0b4d84f 100644
--- a/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/PackageTest.java
+++ b/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/PackageTest.java
@@ -234,7 +234,7 @@ public class PackageTest extends junit.framework.TestCase {
         } catch (NullPointerException compatible) {
             /*
              * RI throws NPE instead of NFE...
-             */ 
+             */
         }
 
         try {
@@ -290,7 +290,7 @@ public class PackageTest extends junit.framework.TestCase {
         assertTrue("Package toString returns wrong string", p.toString()
                 .length() > 0);
     }
-    
+
     public void test_SealedPackage_forName() throws Exception {
         Support_Resources.copyFile(resources, "Package", "hyts_c.jar");
         Support_Resources.copyFile(resources, "Package", "hyts_d.jar");
@@ -318,7 +318,7 @@ public class PackageTest extends junit.framework.TestCase {
         // setup for next test
         Support_Resources.copyFile(resources, "p", "");
         InputStream in = uclClassLoader.getResourceAsStream("p/D.class");
-        Support_Resources.copyLocalFileto(new File(resources.toString(),
+        Support_Resources.copyLocalFileTo(new File(resources.toString(),
                 "p/D.class"), in);
 
         // load from a sealed jar, then the directory
diff --git a/support/src/test/java/tests/support/resource/Support_Resources.java b/support/src/test/java/tests/support/resource/Support_Resources.java
index 849b9bb..ec1a4b7 100644
--- a/support/src/test/java/tests/support/resource/Support_Resources.java
+++ b/support/src/test/java/tests/support/resource/Support_Resources.java
@@ -1,13 +1,13 @@
-/* 
+/*
  * 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.
@@ -30,139 +30,124 @@ import tests.support.Support_Configuration;
 
 public class Support_Resources {
 
-	public static final String RESOURCE_PACKAGE = "/tests/resources/";
-
-	public static final String RESOURCE_PACKAGE_NAME = "tests.resources";
-
-	public static InputStream getStream(String name) {
-		return Support_Resources.class.getResourceAsStream(RESOURCE_PACKAGE
-				+ name);
-	}
-
-	public static String getURL(String name) {
-		String folder = null;
-		String fileName = name;
-		File resources = createTempFolder();
-		int index = name.lastIndexOf("/");
-		if (index != -1) {
-			folder = name.substring(0, index);
-			name = name.substring(index + 1);
-		}
-		copyFile(resources, folder, name);
-		URL url = null;
-		String resPath = resources.toString();
-		if (resPath.charAt(0) == '/' || resPath.charAt(0) == '\\') {
+    public static final String RESOURCE_PACKAGE = "/tests/resources/";
+
+    public static final String RESOURCE_PACKAGE_NAME = "tests.resources";
+
+    public static InputStream getStream(String name) {
+        // System.err.println("getResourceAsStream(" + RESOURCE_PACKAGE + name + ")");
+        return Support_Resources.class.getResourceAsStream(RESOURCE_PACKAGE + name);
+    }
+
+    public static String getURL(String name) {
+        String folder = null;
+        String fileName = name;
+        File resources = createTempFolder();
+        int index = name.lastIndexOf("/");
+        if (index != -1) {
+            folder = name.substring(0, index);
+            name = name.substring(index + 1);
+        }
+        copyFile(resources, folder, name);
+        URL url = null;
+        String resPath = resources.toString();
+        if (resPath.charAt(0) == '/' || resPath.charAt(0) == '\\') {
             resPath = resPath.substring(1);
         }
-		try {
-			url = new URL("file:/" + resPath + "/" + fileName);
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return url.toString();
-	}
-
-	public static File createTempFolder() {
-
-		File folder = null;
-		try {
-			folder = File.createTempFile("hyts_resources", "", null);
-			folder.delete();
-			folder.mkdirs();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		folder.deleteOnExit();
-		return folder;
-	}
-
-	public static void copyFile(File root, String folder, String file) {
-		File f;
-		if (folder != null) {
-			f = new File(root.toString() + "/" + folder);
-			if (!f.exists()) {
-				f.mkdirs();
-				f.deleteOnExit();
-			}
-		} else {
+        try {
+            url = new URL("file:/" + resPath + "/" + fileName);
+        } catch (MalformedURLException e) {
+            throw new RuntimeException(e);
+        }
+        return url.toString();
+    }
+
+    public static File createTempFolder() {
+        File folder = null;
+        try {
+            folder = File.createTempFile("hyts_resources", "", null);
+            folder.delete();
+            folder.mkdirs();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        folder.deleteOnExit();
+        return folder;
+    }
+
+    public static void copyFile(File root, String folder, String file) {
+        File f;
+        if (folder != null) {
+            f = new File(root.toString() + "/" + folder);
+            if (!f.exists()) {
+                f.mkdirs();
+                f.deleteOnExit();
+            }
+        } else {
             f = root;
         }
 
-		File dest = new File(f.toString() + "/" + file);
-
-		InputStream in = Support_Resources.getStream(folder == null ? file
-				: folder + "/" + file);
-		try {
-			copyLocalFileto(dest, in);
-		} catch (FileNotFoundException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	public static File createTempFile(String suffix) throws IOException {
-		return File.createTempFile("hyts_", suffix, null);
-	}
-
-	public static void copyLocalFileto(File dest, InputStream in)
-			throws FileNotFoundException, IOException {
-		if (!dest.exists()) {
-			FileOutputStream out = new FileOutputStream(dest);
-			int result;
-			byte[] buf = new byte[4096];
-			while ((result = in.read(buf)) != -1) {
+        String src = folder == null ? file : folder + "/" + file;
+        InputStream in = Support_Resources.getStream(src);
+        try {
+            File dst = new File(f.toString() + "/" + file);
+            copyLocalFileTo(dst, in);
+        } catch (Exception e) {
+            throw new RuntimeException("copyFile failed: root=" + root + " folder=" + folder + " file=" + file + " (src=" + src + ")", e);
+        }
+    }
+
+    public static File createTempFile(String suffix) throws IOException {
+        return File.createTempFile("hyts_", suffix, null);
+    }
+
+    public static void copyLocalFileTo(File dest, InputStream in) throws IOException {
+        if (!dest.exists()) {
+            FileOutputStream out = new FileOutputStream(dest);
+            int result;
+            byte[] buf = new byte[4096];
+            while ((result = in.read(buf)) != -1) {
                 out.write(buf, 0, result);
             }
-			in.close();
-			out.close();
-			dest.deleteOnExit();
-		}
-	}
-
-	public static File getExternalLocalFile(String url) throws IOException,
-			MalformedURLException {
-		File resources = createTempFolder();
-		InputStream in = new URL(url).openStream();
-		File temp = new File(resources.toString() + "/local.tmp");
-		copyLocalFileto(temp, in);
-		return temp;
-	}
-
-	public static String getResourceURL(String resource) {
-		return "http://" + Support_Configuration.TestResources + resource;
-	}
+            in.close();
+            out.close();
+            dest.deleteOnExit();
+        }
+    }
+
+    public static File getExternalLocalFile(String url) throws IOException, MalformedURLException {
+        File resources = createTempFolder();
+        InputStream in = new URL(url).openStream();
+        File temp = new File(resources.toString() + "/local.tmp");
+        copyLocalFileTo(temp, in);
+        return temp;
+    }
+
+    public static String getResourceURL(String resource) {
+        return "http://" + Support_Configuration.TestResources + resource;
+    }
 
     /**
      * Util method to load resource files
-     * 
+     *
      * @param name - name of resource file
      * @return - resource input stream
      */
     public static InputStream getResourceStream(String name) {
-
-        InputStream is = ClassLoader.getSystemClassLoader()
-                .getResourceAsStream(name);
-
+        InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream(name);
         if (is == null) {
             throw new RuntimeException("Failed to load resource: " + name);
         }
-        
         return is;
     }
-    
+
     /**
      * Util method to get absolute path to resource file
-     * 
+     *
      * @param name - name of resource file
      * @return - path to resource
      */
     public static String getAbsoluteResourcePath(String name) {
-
         URL url = ClassLoader.getSystemClassLoader().getResource(name);
         if (url == null) {
             throw new RuntimeException("Failed to load resource: " + name);
diff --git a/support/src/test/java/tests/resources/Broken_entry.jar b/support/src/test/resources/tests/resources/Broken_entry.jar
index e6e7927..e6e7927 100644
--- a/support/src/test/java/tests/resources/Broken_entry.jar
+++ b/support/src/test/resources/tests/resources/Broken_entry.jar
diff --git a/support/src/test/java/tests/resources/Broken_manifest.jar b/support/src/test/resources/tests/resources/Broken_manifest.jar
index 4c3ff31..4c3ff31 100644
--- a/support/src/test/java/tests/resources/Broken_manifest.jar
+++ b/support/src/test/resources/tests/resources/Broken_manifest.jar
diff --git a/support/src/test/java/tests/resources/Created_by_1_4.jar b/support/src/test/resources/tests/resources/Created_by_1_4.jar
index 1fe7947..1fe7947 100644
--- a/support/src/test/java/tests/resources/Created_by_1_4.jar
+++ b/support/src/test/resources/tests/resources/Created_by_1_4.jar
diff --git a/support/src/test/java/tests/resources/EmptyEntries_signed.jar b/support/src/test/resources/tests/resources/EmptyEntries_signed.jar
index 237d244..237d244 100644
--- a/support/src/test/java/tests/resources/EmptyEntries_signed.jar
+++ b/support/src/test/resources/tests/resources/EmptyEntries_signed.jar
diff --git a/support/src/test/java/tests/resources/GZIPInputStream/hyts_gInput.txt.gz b/support/src/test/resources/tests/resources/GZIPInputStream/hyts_gInput.txt.gz
index e0f5a00..e0f5a00 100644
--- a/support/src/test/java/tests/resources/GZIPInputStream/hyts_gInput.txt.gz
+++ b/support/src/test/resources/tests/resources/GZIPInputStream/hyts_gInput.txt.gz
diff --git a/support/src/test/java/tests/resources/Harmony.GIF b/support/src/test/resources/tests/resources/Harmony.GIF
index be2dc56..be2dc56 100644
--- a/support/src/test/java/tests/resources/Harmony.GIF
+++ b/support/src/test/resources/tests/resources/Harmony.GIF
diff --git a/support/src/test/java/tests/resources/Harmony.jpg b/support/src/test/resources/tests/resources/Harmony.jpg
index 85bfc6e..85bfc6e 100644
--- a/support/src/test/java/tests/resources/Harmony.jpg
+++ b/support/src/test/resources/tests/resources/Harmony.jpg
diff --git a/support/src/test/java/tests/resources/Harmony.png b/support/src/test/resources/tests/resources/Harmony.png
index 5ec399c..5ec399c 100644
--- a/support/src/test/java/tests/resources/Harmony.png
+++ b/support/src/test/resources/tests/resources/Harmony.png
diff --git a/support/src/test/java/tests/resources/Inserted_Entry_Manifest.jar b/support/src/test/resources/tests/resources/Inserted_Entry_Manifest.jar
index 154d8d6..154d8d6 100644
--- a/support/src/test/java/tests/resources/Inserted_Entry_Manifest.jar
+++ b/support/src/test/resources/tests/resources/Inserted_Entry_Manifest.jar
diff --git a/support/src/test/java/tests/resources/Inserted_Entry_Manifest_with_DigestCode.jar b/support/src/test/resources/tests/resources/Inserted_Entry_Manifest_with_DigestCode.jar
index a94ae49..a94ae49 100644
--- a/support/src/test/java/tests/resources/Inserted_Entry_Manifest_with_DigestCode.jar
+++ b/support/src/test/resources/tests/resources/Inserted_Entry_Manifest_with_DigestCode.jar
diff --git a/support/src/test/java/tests/resources/Integrate.jar b/support/src/test/resources/tests/resources/Integrate.jar
index 16e9c55..16e9c55 100644
--- a/support/src/test/java/tests/resources/Integrate.jar
+++ b/support/src/test/resources/tests/resources/Integrate.jar
diff --git a/support/src/test/java/tests/resources/JarIndex/hyts_11.jar b/support/src/test/resources/tests/resources/JarIndex/hyts_11.jar
index 19cf5f2..19cf5f2 100644
--- a/support/src/test/java/tests/resources/JarIndex/hyts_11.jar
+++ b/support/src/test/resources/tests/resources/JarIndex/hyts_11.jar
diff --git a/support/src/test/java/tests/resources/JarIndex/hyts_12.jar b/support/src/test/resources/tests/resources/JarIndex/hyts_12.jar
index 236659b..236659b 100644
--- a/support/src/test/java/tests/resources/JarIndex/hyts_12.jar
+++ b/support/src/test/resources/tests/resources/JarIndex/hyts_12.jar
diff --git a/support/src/test/java/tests/resources/JarIndex/hyts_13.jar b/support/src/test/resources/tests/resources/JarIndex/hyts_13.jar
index 9ea6806..9ea6806 100644
--- a/support/src/test/java/tests/resources/JarIndex/hyts_13.jar
+++ b/support/src/test/resources/tests/resources/JarIndex/hyts_13.jar
diff --git a/support/src/test/java/tests/resources/JarIndex/hyts_14.jar b/support/src/test/resources/tests/resources/JarIndex/hyts_14.jar
index d8bc44b..d8bc44b 100644
--- a/support/src/test/java/tests/resources/JarIndex/hyts_14.jar
+++ b/support/src/test/resources/tests/resources/JarIndex/hyts_14.jar
diff --git a/support/src/test/java/tests/resources/JarIndex/hyts_21.jar b/support/src/test/resources/tests/resources/JarIndex/hyts_21.jar
index c25d4bf..c25d4bf 100644
--- a/support/src/test/java/tests/resources/JarIndex/hyts_21.jar
+++ b/support/src/test/resources/tests/resources/JarIndex/hyts_21.jar
diff --git a/support/src/test/java/tests/resources/JarIndex/hyts_22-new.jar b/support/src/test/resources/tests/resources/JarIndex/hyts_22-new.jar
index 542c22a..542c22a 100644
--- a/support/src/test/java/tests/resources/JarIndex/hyts_22-new.jar
+++ b/support/src/test/resources/tests/resources/JarIndex/hyts_22-new.jar
diff --git a/support/src/test/java/tests/resources/JarIndex/hyts_22.jar b/support/src/test/resources/tests/resources/JarIndex/hyts_22.jar
index 84c7af0..84c7af0 100644
--- a/support/src/test/java/tests/resources/JarIndex/hyts_22.jar
+++ b/support/src/test/resources/tests/resources/JarIndex/hyts_22.jar
diff --git a/support/src/test/java/tests/resources/JarIndex/hyts_23.jar b/support/src/test/resources/tests/resources/JarIndex/hyts_23.jar
index a932052..a932052 100644
--- a/support/src/test/java/tests/resources/JarIndex/hyts_23.jar
+++ b/support/src/test/resources/tests/resources/JarIndex/hyts_23.jar
diff --git a/support/src/test/java/tests/resources/JarIndex/hyts_31.jar b/support/src/test/resources/tests/resources/JarIndex/hyts_31.jar
index ab69696..ab69696 100644
--- a/support/src/test/java/tests/resources/JarIndex/hyts_31.jar
+++ b/support/src/test/resources/tests/resources/JarIndex/hyts_31.jar
diff --git a/support/src/test/java/tests/resources/JarIndex/hyts_32.jar b/support/src/test/resources/tests/resources/JarIndex/hyts_32.jar
index 12de6bb..12de6bb 100644
--- a/support/src/test/java/tests/resources/JarIndex/hyts_32.jar
+++ b/support/src/test/resources/tests/resources/JarIndex/hyts_32.jar
diff --git a/support/src/test/java/tests/resources/JarIndex/hyts_33.jar b/support/src/test/resources/tests/resources/JarIndex/hyts_33.jar
index 086e494..086e494 100644
--- a/support/src/test/java/tests/resources/JarIndex/hyts_33.jar
+++ b/support/src/test/resources/tests/resources/JarIndex/hyts_33.jar
diff --git a/support/src/test/java/tests/resources/JarIndex/hyts_41.jar b/support/src/test/resources/tests/resources/JarIndex/hyts_41.jar
index fb71bf8..fb71bf8 100644
--- a/support/src/test/java/tests/resources/JarIndex/hyts_41.jar
+++ b/support/src/test/resources/tests/resources/JarIndex/hyts_41.jar
diff --git a/support/src/test/java/tests/resources/JarIndex/hyts_42.jar b/support/src/test/resources/tests/resources/JarIndex/hyts_42.jar
index 06a35cd..06a35cd 100644
--- a/support/src/test/java/tests/resources/JarIndex/hyts_42.jar
+++ b/support/src/test/resources/tests/resources/JarIndex/hyts_42.jar
diff --git a/support/src/test/java/tests/resources/Modified_Class.jar b/support/src/test/resources/tests/resources/Modified_Class.jar
index d8113c7..d8113c7 100644
--- a/support/src/test/java/tests/resources/Modified_Class.jar
+++ b/support/src/test/resources/tests/resources/Modified_Class.jar
diff --git a/support/src/test/java/tests/resources/Modified_Manifest_EntryAttributes.jar b/support/src/test/resources/tests/resources/Modified_Manifest_EntryAttributes.jar
index bd1dbb1..bd1dbb1 100644
--- a/support/src/test/java/tests/resources/Modified_Manifest_EntryAttributes.jar
+++ b/support/src/test/resources/tests/resources/Modified_Manifest_EntryAttributes.jar
diff --git a/support/src/test/java/tests/resources/Modified_Manifest_MainAttributes.jar b/support/src/test/resources/tests/resources/Modified_Manifest_MainAttributes.jar
index 5bc60e6..5bc60e6 100644
--- a/support/src/test/java/tests/resources/Modified_Manifest_MainAttributes.jar
+++ b/support/src/test/resources/tests/resources/Modified_Manifest_MainAttributes.jar
diff --git a/support/src/test/java/tests/resources/Modified_SF_EntryAttributes.jar b/support/src/test/resources/tests/resources/Modified_SF_EntryAttributes.jar
index 7b76694..7b76694 100644
--- a/support/src/test/java/tests/resources/Modified_SF_EntryAttributes.jar
+++ b/support/src/test/resources/tests/resources/Modified_SF_EntryAttributes.jar
diff --git a/support/src/test/java/tests/resources/Package/hyts_all_attributes.jar b/support/src/test/resources/tests/resources/Package/hyts_all_attributes.jar
index bde3f4d..bde3f4d 100644
--- a/support/src/test/java/tests/resources/Package/hyts_all_attributes.jar
+++ b/support/src/test/resources/tests/resources/Package/hyts_all_attributes.jar
diff --git a/support/src/test/java/tests/resources/Package/hyts_c.jar b/support/src/test/resources/tests/resources/Package/hyts_c.jar
index 111f73c..111f73c 100644
--- a/support/src/test/java/tests/resources/Package/hyts_c.jar
+++ b/support/src/test/resources/tests/resources/Package/hyts_c.jar
diff --git a/support/src/test/java/tests/resources/Package/hyts_d.jar b/support/src/test/resources/tests/resources/Package/hyts_d.jar
index 1218f76..1218f76 100644
--- a/support/src/test/java/tests/resources/Package/hyts_d.jar
+++ b/support/src/test/resources/tests/resources/Package/hyts_d.jar
diff --git a/support/src/test/java/tests/resources/Package/hyts_d1.jar b/support/src/test/resources/tests/resources/Package/hyts_d1.jar
index e4a0b4d..e4a0b4d 100644
--- a/support/src/test/java/tests/resources/Package/hyts_d1.jar
+++ b/support/src/test/resources/tests/resources/Package/hyts_d1.jar
diff --git a/support/src/test/java/tests/resources/Package/hyts_d2.jar b/support/src/test/resources/tests/resources/Package/hyts_d2.jar
index 2665a06..2665a06 100644
--- a/support/src/test/java/tests/resources/Package/hyts_d2.jar
+++ b/support/src/test/resources/tests/resources/Package/hyts_d2.jar
diff --git a/support/src/test/java/tests/resources/Package/hyts_no_attributes.jar b/support/src/test/resources/tests/resources/Package/hyts_no_attributes.jar
index 1879acb..1879acb 100644
--- a/support/src/test/java/tests/resources/Package/hyts_no_attributes.jar
+++ b/support/src/test/resources/tests/resources/Package/hyts_no_attributes.jar
diff --git a/support/src/test/java/tests/resources/Package/hyts_no_entry.jar b/support/src/test/resources/tests/resources/Package/hyts_no_entry.jar
index 66090a5..66090a5 100644
--- a/support/src/test/java/tests/resources/Package/hyts_no_entry.jar
+++ b/support/src/test/resources/tests/resources/Package/hyts_no_entry.jar
diff --git a/support/src/test/java/tests/resources/Package/hyts_pq.jar b/support/src/test/resources/tests/resources/Package/hyts_pq.jar
index 5919f6c..5919f6c 100644
--- a/support/src/test/java/tests/resources/Package/hyts_pq.jar
+++ b/support/src/test/resources/tests/resources/Package/hyts_pq.jar
diff --git a/support/src/test/java/tests/resources/Package/hyts_some_attributes.jar b/support/src/test/resources/tests/resources/Package/hyts_some_attributes.jar
index 95c87a8..95c87a8 100644
--- a/support/src/test/java/tests/resources/Package/hyts_some_attributes.jar
+++ b/support/src/test/resources/tests/resources/Package/hyts_some_attributes.jar
diff --git a/support/src/test/java/tests/resources/ServiceLoader/hyts_services.jar b/support/src/test/resources/tests/resources/ServiceLoader/hyts_services.jar
index 12503a6..12503a6 100644
--- a/support/src/test/java/tests/resources/ServiceLoader/hyts_services.jar
+++ b/support/src/test/resources/tests/resources/ServiceLoader/hyts_services.jar
diff --git a/support/src/test/java/tests/resources/ServiceLoader/hyts_services2.jar b/support/src/test/resources/tests/resources/ServiceLoader/hyts_services2.jar
index a7a754a..a7a754a 100644
--- a/support/src/test/java/tests/resources/ServiceLoader/hyts_services2.jar
+++ b/support/src/test/resources/tests/resources/ServiceLoader/hyts_services2.jar
diff --git a/support/src/test/java/tests/resources/TestCodeSigners.jar b/support/src/test/resources/tests/resources/TestCodeSigners.jar
index a4c42aa..a4c42aa 100644
--- a/support/src/test/java/tests/resources/TestCodeSigners.jar
+++ b/support/src/test/resources/tests/resources/TestCodeSigners.jar
diff --git a/support/src/test/java/tests/resources/hyts_Bar.ser b/support/src/test/resources/tests/resources/hyts_Bar.ser
index 2802528..2802528 100644
--- a/support/src/test/java/tests/resources/hyts_Bar.ser
+++ b/support/src/test/resources/tests/resources/hyts_Bar.ser
diff --git a/support/src/test/java/tests/resources/hyts_Foo.ser b/support/src/test/resources/tests/resources/hyts_Foo.ser
index 9f511ac..9f511ac 100644
--- a/support/src/test/java/tests/resources/hyts_Foo.ser
+++ b/support/src/test/resources/tests/resources/hyts_Foo.ser
diff --git a/support/src/test/java/tests/resources/hyts_PropertiesTest.properties b/support/src/test/resources/tests/resources/hyts_PropertiesTest.properties
index 6c1b950..6c1b950 100644
--- a/support/src/test/java/tests/resources/hyts_PropertiesTest.properties
+++ b/support/src/test/resources/tests/resources/hyts_PropertiesTest.properties
diff --git a/support/src/test/java/tests/resources/hyts_ZipFile.zip b/support/src/test/resources/tests/resources/hyts_ZipFile.zip
index f9cd6ed..f9cd6ed 100644
--- a/support/src/test/java/tests/resources/hyts_ZipFile.zip
+++ b/support/src/test/resources/tests/resources/hyts_ZipFile.zip
diff --git a/support/src/test/java/tests/resources/hyts_att.jar b/support/src/test/resources/tests/resources/hyts_att.jar
index 7f4530c..7f4530c 100644
--- a/support/src/test/java/tests/resources/hyts_att.jar
+++ b/support/src/test/resources/tests/resources/hyts_att.jar
diff --git a/support/src/test/java/tests/resources/hyts_available.tst b/support/src/test/resources/tests/resources/hyts_available.tst
index d67b2f4..d67b2f4 100644
--- a/support/src/test/java/tests/resources/hyts_available.tst
+++ b/support/src/test/resources/tests/resources/hyts_available.tst
diff --git a/support/src/test/java/tests/resources/hyts_checkInput.txt b/support/src/test/resources/tests/resources/hyts_checkInput.txt
index 6d49d33..6d49d33 100644
--- a/support/src/test/java/tests/resources/hyts_checkInput.txt
+++ b/support/src/test/resources/tests/resources/hyts_checkInput.txt
diff --git a/support/src/test/java/tests/resources/hyts_compDiction.bin b/support/src/test/resources/tests/resources/hyts_compDiction.bin
index f0478c8..f0478c8 100644
--- a/support/src/test/java/tests/resources/hyts_compDiction.bin
+++ b/support/src/test/resources/tests/resources/hyts_compDiction.bin
diff --git a/support/src/test/java/tests/resources/hyts_compressD.bin b/support/src/test/resources/tests/resources/hyts_compressD.bin
index 36c89f2..36c89f2 100644
--- a/support/src/test/java/tests/resources/hyts_compressD.bin
+++ b/support/src/test/resources/tests/resources/hyts_compressD.bin
diff --git a/support/src/test/java/tests/resources/hyts_construO.bin b/support/src/test/resources/tests/resources/hyts_construO.bin
index b6bd7b4..b6bd7b4 100644
--- a/support/src/test/java/tests/resources/hyts_construO.bin
+++ b/support/src/test/resources/tests/resources/hyts_construO.bin
diff --git a/support/src/test/java/tests/resources/hyts_construOD.bin b/support/src/test/resources/tests/resources/hyts_construOD.bin
index 035d12e..035d12e 100644
--- a/support/src/test/java/tests/resources/hyts_construOD.bin
+++ b/support/src/test/resources/tests/resources/hyts_construOD.bin
diff --git a/support/src/test/java/tests/resources/hyts_construODI.bin b/support/src/test/resources/tests/resources/hyts_construODI.bin
index 1e5d284..1e5d284 100644
--- a/support/src/test/java/tests/resources/hyts_construODI.bin
+++ b/support/src/test/resources/tests/resources/hyts_construODI.bin
diff --git a/support/src/test/java/tests/resources/hyts_flushed.jar b/support/src/test/resources/tests/resources/hyts_flushed.jar
index 56b717c..56b717c 100644
--- a/support/src/test/java/tests/resources/hyts_flushed.jar
+++ b/support/src/test/resources/tests/resources/hyts_flushed.jar
diff --git a/support/src/test/java/tests/resources/hyts_htmltest.html b/support/src/test/resources/tests/resources/hyts_htmltest.html
index 9464371..9464371 100644
--- a/support/src/test/java/tests/resources/hyts_htmltest.html
+++ b/support/src/test/resources/tests/resources/hyts_htmltest.html
diff --git a/support/src/test/java/tests/resources/hyts_mainClass.ser b/support/src/test/resources/tests/resources/hyts_mainClass.ser
index 0421ba9..0421ba9 100644
--- a/support/src/test/java/tests/resources/hyts_mainClass.ser
+++ b/support/src/test/resources/tests/resources/hyts_mainClass.ser
diff --git a/support/src/test/java/tests/resources/hyts_manifest1.jar b/support/src/test/resources/tests/resources/hyts_manifest1.jar
index fb292b2..fb292b2 100644
--- a/support/src/test/java/tests/resources/hyts_manifest1.jar
+++ b/support/src/test/resources/tests/resources/hyts_manifest1.jar
diff --git a/support/src/test/java/tests/resources/hyts_missingclass.ser b/support/src/test/resources/tests/resources/hyts_missingclass.ser
index 0a71403..0a71403 100644
--- a/support/src/test/java/tests/resources/hyts_missingclass.ser
+++ b/support/src/test/resources/tests/resources/hyts_missingclass.ser
diff --git a/support/src/test/java/tests/resources/hyts_patch.jar b/support/src/test/resources/tests/resources/hyts_patch.jar
index f3c51d0..f3c51d0 100644
--- a/support/src/test/java/tests/resources/hyts_patch.jar
+++ b/support/src/test/resources/tests/resources/hyts_patch.jar
diff --git a/support/src/test/java/tests/resources/hyts_patch2.jar b/support/src/test/resources/tests/resources/hyts_patch2.jar
index c26f9e7..c26f9e7 100644
--- a/support/src/test/java/tests/resources/hyts_patch2.jar
+++ b/support/src/test/resources/tests/resources/hyts_patch2.jar
diff --git a/support/src/test/java/tests/resources/hyts_resource.properties b/support/src/test/resources/tests/resources/hyts_resource.properties
index baf5762..baf5762 100644
--- a/support/src/test/java/tests/resources/hyts_resource.properties
+++ b/support/src/test/resources/tests/resources/hyts_resource.properties
diff --git a/support/src/test/java/tests/resources/hyts_security.jar b/support/src/test/resources/tests/resources/hyts_security.jar
index abef675..abef675 100644
--- a/support/src/test/java/tests/resources/hyts_security.jar
+++ b/support/src/test/resources/tests/resources/hyts_security.jar
diff --git a/support/src/test/java/tests/resources/hyts_signed.jar b/support/src/test/resources/tests/resources/hyts_signed.jar
index 8ea8489..8ea8489 100644
--- a/support/src/test/java/tests/resources/hyts_signed.jar
+++ b/support/src/test/resources/tests/resources/hyts_signed.jar
diff --git a/support/src/test/java/tests/resources/manifest/hyts_MANIFEST.MF b/support/src/test/resources/tests/resources/manifest/hyts_MANIFEST.MF
index 2402bca..2402bca 100644
--- a/support/src/test/java/tests/resources/manifest/hyts_MANIFEST.MF
+++ b/support/src/test/resources/tests/resources/manifest/hyts_MANIFEST.MF
diff --git a/support/src/test/java/tests/resources/morestuff/hyts_patch.jar b/support/src/test/resources/tests/resources/morestuff/hyts_patch.jar
index f3c51d0..f3c51d0 100644
--- a/support/src/test/java/tests/resources/morestuff/hyts_patch.jar
+++ b/support/src/test/resources/tests/resources/morestuff/hyts_patch.jar
diff --git a/support/src/test/java/tests/resources/morestuff/hyts_patch2.jar b/support/src/test/resources/tests/resources/morestuff/hyts_patch2.jar
index c26f9e7..c26f9e7 100644
--- a/support/src/test/java/tests/resources/morestuff/hyts_patch2.jar
+++ b/support/src/test/resources/tests/resources/morestuff/hyts_patch2.jar
diff --git a/support/src/test/java/tests/resources/subfolder/tests/norootresources/hyts_resource_en.properties b/support/src/test/resources/tests/resources/subfolder/tests/norootresources/hyts_resource_en.properties
index 40b8caf..40b8caf 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/norootresources/hyts_resource_en.properties
+++ b/support/src/test/resources/tests/resources/subfolder/tests/norootresources/hyts_resource_en.properties
diff --git a/support/src/test/java/tests/resources/subfolder/tests/norootresources/hyts_resource_en_US.java b/support/src/test/resources/tests/resources/subfolder/tests/norootresources/hyts_resource_en_US.java
index 1913879..1913879 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/norootresources/hyts_resource_en_US.java
+++ b/support/src/test/resources/tests/resources/subfolder/tests/norootresources/hyts_resource_en_US.java
diff --git a/support/src/test/java/tests/resources/subfolder/tests/norootresources/hyts_resource_en_US.properties b/support/src/test/resources/tests/resources/subfolder/tests/norootresources/hyts_resource_en_US.properties
index 06c99f6..06c99f6 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/norootresources/hyts_resource_en_US.properties
+++ b/support/src/test/resources/tests/resources/subfolder/tests/norootresources/hyts_resource_en_US.properties
diff --git a/support/src/test/java/tests/resources/subfolder/tests/norootresources/hyts_resource_en_US_VAR.java b/support/src/test/resources/tests/resources/subfolder/tests/norootresources/hyts_resource_en_US_VAR.java
index 1c75ec8..1c75ec8 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/norootresources/hyts_resource_en_US_VAR.java
+++ b/support/src/test/resources/tests/resources/subfolder/tests/norootresources/hyts_resource_en_US_VAR.java
diff --git a/support/src/test/java/tests/resources/subfolder/tests/norootresources/hyts_resource_fr.java b/support/src/test/resources/tests/resources/subfolder/tests/norootresources/hyts_resource_fr.java
index d049d7b..d049d7b 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/norootresources/hyts_resource_fr.java
+++ b/support/src/test/resources/tests/resources/subfolder/tests/norootresources/hyts_resource_fr.java
diff --git a/support/src/test/java/tests/resources/subfolder/tests/norootresources/hyts_resource_fr.properties b/support/src/test/resources/tests/resources/subfolder/tests/norootresources/hyts_resource_fr.properties
index 447f06c..447f06c 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/norootresources/hyts_resource_fr.properties
+++ b/support/src/test/resources/tests/resources/subfolder/tests/norootresources/hyts_resource_fr.properties
diff --git a/support/src/test/java/tests/resources/subfolder/tests/norootresources/hyts_resource_fr_FR.java b/support/src/test/resources/tests/resources/subfolder/tests/norootresources/hyts_resource_fr_FR.java
index ae11beb..ae11beb 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/norootresources/hyts_resource_fr_FR.java
+++ b/support/src/test/resources/tests/resources/subfolder/tests/norootresources/hyts_resource_fr_FR.java
diff --git a/support/src/test/java/tests/resources/subfolder/tests/norootresources/hyts_resource_fr_FR.properties b/support/src/test/resources/tests/resources/subfolder/tests/norootresources/hyts_resource_fr_FR.properties
index 0ac2c73..0ac2c73 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/norootresources/hyts_resource_fr_FR.properties
+++ b/support/src/test/resources/tests/resources/subfolder/tests/norootresources/hyts_resource_fr_FR.properties
diff --git a/support/src/test/java/tests/resources/subfolder/tests/norootresources/hyts_resource_fr_FR_VAR.java b/support/src/test/resources/tests/resources/subfolder/tests/norootresources/hyts_resource_fr_FR_VAR.java
index 958c5ff..958c5ff 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/norootresources/hyts_resource_fr_FR_VAR.java
+++ b/support/src/test/resources/tests/resources/subfolder/tests/norootresources/hyts_resource_fr_FR_VAR.java
diff --git a/support/src/test/java/tests/resources/subfolder/tests/norootresources/hyts_resource_fr_FR_VAR.properties b/support/src/test/resources/tests/resources/subfolder/tests/norootresources/hyts_resource_fr_FR_VAR.properties
index dd76478..dd76478 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/norootresources/hyts_resource_fr_FR_VAR.properties
+++ b/support/src/test/resources/tests/resources/subfolder/tests/norootresources/hyts_resource_fr_FR_VAR.properties
diff --git a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource.java b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource.java
index afa3e6e..afa3e6e 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource.java
+++ b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource.java
diff --git a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource.properties b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource.properties
index eae054e..eae054e 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource.properties
+++ b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource.properties
diff --git a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource_en.properties b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource_en.properties
index 40b8caf..40b8caf 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource_en.properties
+++ b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource_en.properties
diff --git a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource_en_US.java b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource_en_US.java
index 16c6e08..16c6e08 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource_en_US.java
+++ b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource_en_US.java
diff --git a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource_en_US.properties b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource_en_US.properties
index 06c99f6..06c99f6 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource_en_US.properties
+++ b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource_en_US.properties
diff --git a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource_en_US_VAR.java b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource_en_US_VAR.java
index aba4675..aba4675 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource_en_US_VAR.java
+++ b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource_en_US_VAR.java
diff --git a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource_fr.java b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource_fr.java
index adac070..adac070 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource_fr.java
+++ b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource_fr.java
diff --git a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource_fr.properties b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource_fr.properties
index 447f06c..447f06c 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource_fr.properties
+++ b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource_fr.properties
diff --git a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource_fr_FR.properties b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource_fr_FR.properties
index 0ac2c73..0ac2c73 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource_fr_FR.properties
+++ b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource_fr_FR.properties
diff --git a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource_fr_FR_VAR.java b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource_fr_FR_VAR.java
index 5d48aa3..5d48aa3 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource_fr_FR_VAR.java
+++ b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource_fr_FR_VAR.java
diff --git a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource_fr_FR_VAR.properties b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource_fr_FR_VAR.properties
index dd76478..dd76478 100644
--- a/support/src/test/java/tests/resources/subfolder/tests/resources/hyts_resource_fr_FR_VAR.properties
+++ b/support/src/test/resources/tests/resources/subfolder/tests/resources/hyts_resource_fr_FR_VAR.properties