update tests and fixes

.gitattributes

@@ -3,3 +3,4 @@
 *.kt             text
 *.json           text
 *.asar           -text
+*.zip            -text

url/build.gradle.kts

@@ -6,3 +6,17 @@ dependencies {
     implementation(project(":common"))
     implementation(project(":file"))
 }
+
+val createAsarZip by tasks.creating(Zip::class) {
+    archiveFileName.set("test.zip")
+    destinationDirectory.set(file("testData"))
+    from("testData") {
+        include("test.asar")
+    }
+}
+
+tasks.test {
+    dependsOn(createAsarZip)
+    systemProperty("com.anatawa12.asar4j.test-asar", file("testData/test.asar").toString())
+    systemProperty("com.anatawa12.asar4j.test-zip", createAsarZip.archiveFile.get().toString())
+}

url/src/main/java/com/anatawa12/asar4j/url/AsarFileFactory.java

@@ -4,6 +4,8 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -43,7 +45,11 @@ AsarFile getAsarFile(URL url, boolean useCache) throws IOException {
 
     private AsarFile createURLAsarFile(URL url) throws IOException {
         if (isLocalFileUrl(url)) {
-            return new AsarFile(Paths.get(UrlUtil.decodeURL(url.getFile())));
+            try {
+                return new AsarFile(Paths.get(new URI("file:" + url.getFile())));
+            } catch (URISyntaxException e) {
+                throw new AssertionError(e);
+            }
         } else {
             return getAndCreate(url);
         }

url/src/main/java/com/anatawa12/asar4j/url/AsarURLConnection.java

@@ -26,7 +26,7 @@ public class AsarURLConnection extends URLConnection {
     public AsarURLConnection(URL url) throws IOException {
         super(url);
         parseSpec(url.getFile());
-        asarFileConnection = url.openConnection();
+        asarFileConnection = asarFileURL.openConnection();
     }
 
     private void parseSpec(String spec) throws MalformedURLException {

url/src/test/java/com/anatawa12/asar4j/url/ConnectionTest.java

@@ -0,0 +1,44 @@
+package com.anatawa12.asar4j.url;
+
+import com.google.common.io.ByteStreams;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
+public class ConnectionTest {
+    static {
+        FactoryRegistrar.register();
+    }
+
+    @Test
+    void onFileSystem() throws IOException {
+        URL asarFile = new File(System.getProperty("com.anatawa12.asar4j.test-asar")).toURI().toURL();
+        URL testText = AsarURLStreamHandlerFactory.createUrl(asarFile, "test.txt");
+        // link
+        URL testTextLink = AsarURLStreamHandlerFactory.createUrl(asarFile, "test.txt.1");
+
+        assertArrayEquals("test text file\n".getBytes(StandardCharsets.UTF_8),
+                ByteStreams.toByteArray(testText.openStream()));
+        assertArrayEquals("test text file\n".getBytes(StandardCharsets.UTF_8),
+                ByteStreams.toByteArray(testTextLink.openStream()));
+    }
+
+    @Test
+    void onZipFile() throws IOException {
+        URL zipFile = new File(System.getProperty("com.anatawa12.asar4j.test-zip")).toURI().toURL();
+        URL asarFile = new URL("jar:" + zipFile + "!/test.asar");
+        URL testText = AsarURLStreamHandlerFactory.createUrl(asarFile, "test.txt");
+        // link
+        URL testTextLink = AsarURLStreamHandlerFactory.createUrl(asarFile, "test.txt.1");
+
+        assertArrayEquals("test text file\n".getBytes(StandardCharsets.UTF_8),
+                ByteStreams.toByteArray(testText.openStream()));
+        assertArrayEquals("test text file\n".getBytes(StandardCharsets.UTF_8),
+                ByteStreams.toByteArray(testTextLink.openStream()));
+    }
+}

url/src/test/java/com/anatawa12/asar4j/url/FactoryRegistrar.java

@@ -0,0 +1,14 @@
+package com.anatawa12.asar4j.url;
+
+import java.net.URL;
+
+public class FactoryRegistrar {
+    static {
+        URL.setURLStreamHandlerFactory(AsarURLStreamHandlerFactory.INSTANCE);
+    }
+
+    // run in static initializer
+    public static void register() {
+
+    }
+}

url/src/test/java/com/anatawa12/asar4j/url/URLTest.java

@@ -10,7 +10,7 @@
 
 public class URLTest {
     static {
-        URL.setURLStreamHandlerFactory(AsarURLStreamHandlerFactory.INSTANCE);
+        FactoryRegistrar.register();
     }
 
     @Test

url/testData/.gitignore

@@ -0,0 +1 @@
+test.zip