From 3c18dd1fe7453b673a97369bc3576aa3c2d8d489 Mon Sep 17 00:00:00 2001
From: Nils Schmidt <nilsschmidt1337@users.noreply.github.com>
Date: Thu, 24 Oct 2024 22:08:39 +0200
Subject: [PATCH] Prepared fix for issue #1118.

---
 build-linux.xml                                 |  2 ++
 build-macos-arm.xml                             |  2 ++
 build-macos.xml                                 |  2 ++
 build-windows.xml                               |  2 ++
 .../org/nschmidt/ldparteditor/StlToDatTest.java |  2 +-
 .../ldparteditor/Win32LnkParserTest.java        | 17 ++---------------
 6 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/build-linux.xml b/build-linux.xml
index 2f4d7a4d..34f1b875 100644
--- 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
index b19ecb05..14b931e8 100644
--- 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
index ff202f69..7c285c3d 100644
--- 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
index bf026dbf..4ea016cb 100644
--- 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
index fd77b834..7fe9340e 100644
--- 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
index 2ddc452d..80aa3fc6 100644
--- 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;
-    }
 }