Prepared fix for issue #1118.

nilsschmidt1337 · Oct 24, 2024 · 3c18dd1 · 3c18dd1
1 parent c9f7334
commit 3c18dd1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 16 deletions.
diff --git a/build-linux.xml b/build-linux.xml
@@ -344,6 +344,8 @@
         <!-- Copy files required for testing -->
         <copy file="${testFolder}/stl2dat_ascii.stl" overwrite="true" todir="${targetFolder}"/>
         <copy file="${testFolder}/stl2dat_binary.stl" overwrite="true" todir="${targetFolder}"/>
+        <copy file="${testFolder}/3782.jpg-NetworkShortcut.lnk" overwrite="true" todir="${targetFolder}"/>
+        <copy file="${testFolder}/3782.jpg-Shortcut.lnk" overwrite="true" todir="${targetFolder}"/>
 
         <!-- Compile tests -->
         <javac

diff --git a/build-macos-arm.xml b/build-macos-arm.xml
@@ -343,6 +343,8 @@
         <!-- Copy files required for testing -->
         <copy file="${testFolder}/stl2dat_ascii.stl" overwrite="true" todir="${targetFolder}"/>
         <copy file="${testFolder}/stl2dat_binary.stl" overwrite="true" todir="${targetFolder}"/>
+        <copy file="${testFolder}/3782.jpg-NetworkShortcut.lnk" overwrite="true" todir="${targetFolder}"/>
+        <copy file="${testFolder}/3782.jpg-Shortcut.lnk" overwrite="true" todir="${targetFolder}"/>
 
         <!-- Compile tests -->
         <javac

diff --git a/build-macos.xml b/build-macos.xml
@@ -343,6 +343,8 @@
         <!-- Copy files required for testing -->
         <copy file="${testFolder}/stl2dat_ascii.stl" overwrite="true" todir="${targetFolder}"/>
         <copy file="${testFolder}/stl2dat_binary.stl" overwrite="true" todir="${targetFolder}"/>
+        <copy file="${testFolder}/3782.jpg-NetworkShortcut.lnk" overwrite="true" todir="${targetFolder}"/>
+        <copy file="${testFolder}/3782.jpg-Shortcut.lnk" overwrite="true" todir="${targetFolder}"/>
 
         <!-- Compile tests -->
         <javac

diff --git a/build-windows.xml b/build-windows.xml
@@ -344,6 +344,8 @@
         <!-- Copy files required for testing -->
         <copy file="${testFolder}/stl2dat_ascii.stl" overwrite="true" todir="${targetFolder}"/>
         <copy file="${testFolder}/stl2dat_binary.stl" overwrite="true" todir="${targetFolder}"/>
+        <copy file="${testFolder}/3782.jpg-NetworkShortcut.lnk" overwrite="true" todir="${targetFolder}"/>
+        <copy file="${testFolder}/3782.jpg-Shortcut.lnk" overwrite="true" todir="${targetFolder}"/>
 
         <!-- Compile tests -->
         <javac

diff --git a/test/org/nschmidt/ldparteditor/StlToDatTest.java b/test/org/nschmidt/ldparteditor/StlToDatTest.java
@@ -51,7 +51,7 @@ private UserSettingState createTestUserSettings() {
         return userSettings;
     }
 
-    private String resourcePath(String fileName) {
+    public static String resourcePath(String fileName) {
         URL stlToTest = Thread.currentThread().getContextClassLoader().getResource(fileName);
         String resPath = "(none)"; //$NON-NLS-1$
         try {

diff --git a/test/org/nschmidt/ldparteditor/Win32LnkParserTest.java b/test/org/nschmidt/ldparteditor/Win32LnkParserTest.java
@@ -1,11 +1,10 @@
 package org.nschmidt.ldparteditor;
 
+
+import static org.nschmidt.ldparteditor.StlToDatTest.resourcePath;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.io.File;
-import java.net.URISyntaxException;
-import java.net.URL;
 
 import org.junit.Test;
 import org.nschmidt.ldparteditor.text.Win32LnkParser;
@@ -32,16 +31,4 @@ public void testLinkToFileOnNetwork() {
 
         assertTrue(result.getName().contains("3782.jpg")); //$NON-NLS-1$
     }
-
-    private String resourcePath(String fileName) {
-        URL stlToTest = Thread.currentThread().getContextClassLoader().getResource(fileName);
-        String resPath = "(none)"; //$NON-NLS-1$
-        try {
-            resPath = java.nio.file.Paths.get(stlToTest.toURI()).toString();
-        } catch (URISyntaxException e) {
-            fail("Resource " + fileName + " was not found."); //$NON-NLS-1$ //$NON-NLS-2$
-        }
-
-        return resPath;
-    }
 }