add tests for library loading from resource path

CHANGES.md

@@ -15,6 +15,7 @@ Bug Fixes
 * Use TLS to indicate callback detach state, to avoid any potential conflicts with last error storage - [@twall](https://github.com/twall).
 * [#173](https://github.com/twall/jna/issues/173): Fix OSX 10.8/Xcode 4+ builds, web start path with Oracle 1.7 JDK - [@mkjellman](https://github.com/mkjellman).
 * [#215](https://github.com/twall/jna/issues/215): Force use of XSI `strerror_r` on linux - [LionelCons](https://github.com/LionelCons).
+* [#214](https://github.com/twall/jna/issues/214): Don't map library names when an absolute path is provided - [@twall](https://github.com/twall).
 
 Release 3.5.2
 =============

build.xml

@@ -725,26 +725,26 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc
       <src path="${test.src}"/>
       <exclude name="${tests.exclude}"/>
     </javac>
-    <!-- Move (not copy) embedded testlib to test class folder so that it will be -->
-    <!-- packaged into the test jar and NOT available in the FS-based class path -->
-    <move todir="${test.classes}/${os.prefix}">
+    <!-- Set up versions of test library for resource path loading -->
+    <copy todir="${test.classes}/${os.prefix}">
       <fileset dir="${build.native}">
-        <patternset id="embedded-testlib">
-          <include name="**/*embedded-testlib*"/>
+        <patternset>
+          <include name="**/*testlib-jar*"/>
+          <include name="**/*testlib-path*"/>
         </patternset>
       </fileset>
-    </move>
-    <!-- Create a jar for easy movement of tests, and embedded load test -->
+    </copy>
+    <!-- Create a jar for easy movement of tests, and jar load test -->
     <jar jarfile="${build}/${testjar}">
       <fileset dir="${test.classes}">
         <patternset refid="jar-compiled"/>
-        <include name="**/*embedded-testlib*"/>
+        <include name="**/*testlib-jar*"/>
       </fileset>
     </jar>
-    <!-- Ensure embedded library unavailable on FS-based class path -->
+    <!-- Ensure jar-based library unavailable on FS-based class path -->
     <delete>
       <fileset dir="${test.classes}">
-        <include name="**/*embedded-testlib*"/>
+        <include name="**/*testlib-jar*"/>
       </fileset>
     </delete>
     <mkdir dir="${build}/jws"/>

native/Makefile

@@ -67,7 +67,9 @@ FFI_CONFIG=--enable-static --disable-shared --with-pic=yes
 endif
 LIBRARY=$(BUILD)/$(LIBPFX)jnidispatch$(JNISFX)
 TESTLIB=$(BUILD)/$(LIBPFX)testlib$(LIBSFX)
-TESTLIB_EMBEDDED=$(BUILD)/$(LIBPFX)embedded-testlib$(LIBSFX)
+TESTLIB_JAR=$(BUILD)/$(LIBPFX)testlib-jar$(LIBSFX)
+TESTLIB_PATH=$(BUILD)/$(LIBPFX)testlib-path$(LIBSFX)
+TESTLIB_TRUNC=$(BUILD)/testlib-truncated
 TESTLIB2=$(BUILD)/$(LIBPFX)testlib2$(LIBSFX)
 
 # Reasonable defaults based on GCC
@@ -342,7 +344,7 @@ else
 	$(CC) $(CFLAGS) -c $< $(COUT)
 endif
 
-all: $(LIBRARY) $(TESTLIB) $(TESTLIB2) $(TESTLIB_EMBEDDED)
+all: $(LIBRARY) $(TESTLIB) $(TESTLIB2) $(TESTLIB_JAR) $(TESTLIB_PATH) $(TESTLIB_TRUNC)
 
 install:
 	mkdir $(INSTALLDIR)
@@ -365,8 +367,8 @@ $(LIBRARY): $(JNIDISPATCH_OBJS) $(FFI_LIB)
 $(TESTLIB): $(BUILD)/testlib.o
 	$(LD) $(LDFLAGS) $< $(LIBS)
 
-$(TESTLIB_EMBEDDED): $(BUILD)/testlib.o
-	$(LD) $(LDFLAGS) $< $(LIBS)
+$(TESTLIB_JAR) $(TESTLIB_PATH) $(TESTLIB_TRUNC): $(TESTLIB)
+	@cp $< $@
 
 ifeq ($(ARSFX),.lib)
 TESTDEP=$(TESTLIB:.dll=.lib)

src/com/sun/jna/Native.java

@@ -699,7 +699,7 @@ private static void loadNativeDispatchLibrary() {
      */
     private static void loadNativeDispatchLibraryFromClasspath() {
         try {
-            String prefix = "com/sun/jna/" + getNativeLibraryResourcePrefix();
+            String prefix = "/com/sun/jna/" + getNativeLibraryResourcePrefix();
             File lib = extractFromResourcePath("jnidispatch", prefix, Native.class.getClassLoader());
             if (lib == null) {
                 throw new UnsatisfiedLinkError("Could not find JNA native support");
@@ -733,7 +733,7 @@ static boolean isUnpacked(File file) {
      * @throws IOException if resource not found
      */
     static File extractFromResourcePath(String name) throws IOException {
-        return extractFromResourcePath(name, getNativeLibraryResourcePrefix(), Thread.currentThread().getContextClassLoader());
+        return extractFromResourcePath(name, "/" + getNativeLibraryResourcePrefix(), Thread.currentThread().getContextClassLoader());
     }
 
     /** Attempt to extract a native library from the current resource path. 
@@ -747,8 +747,11 @@ static File extractFromResourcePath(String name) throws IOException {
      * @throws IOException if resource not found
      */
     static File extractFromResourcePath(String name, String resourcePrefix, ClassLoader loader) throws IOException {
-        String libname = System.mapLibraryName(name);
-        String resourcePath = resourcePrefix + "/" + libname;
+        String libname = name.startsWith("/") ? name : System.mapLibraryName(name);
+        String resourcePath = name.startsWith("/") ? name : resourcePrefix + "/" + libname;
+        if (resourcePath.startsWith("/")) {
+            resourcePath = resourcePath.substring(1);
+        }
         URL url = loader.getResource(resourcePath);
 
         // User libraries will have '.dylib'
@@ -764,7 +767,7 @@ else if (resourcePath.endsWith(".dylib")) {
             url = loader.getResource(resourcePath);
         }
         if (url == null) {
-            throw new IOException("JNA native support (" + resourcePath + ") not found in resource path (" + System.getProperty("java.class.path") + ")");
+            throw new IOException("Native library (" + resourcePath + ") not found in resource path (" + System.getProperty("java.class.path") + ")");
         }
 
         File lib = null;

test/com/sun/jna/LibraryLoadTest.java

@@ -52,6 +52,35 @@ public void testLoadAWTAfterJNA() {
         }
     }
 
+    public interface TestLibrary extends Library {
+    }
+
+    public void testLoadFromJNALibraryPath() {
+        NativeLibrary.getInstance("testlib");
+    }
+
+    public void testLoadFromClasspath() {
+        NativeLibrary.getInstance("testlib-path");
+    }
+
+    public void testLoadFromClasspathAbsolute() {
+        String name = System.mapLibraryName("testlib-path").replace(".jnilib", ".dylib");
+        NativeLibrary.getInstance("/" + Platform.RESOURCE_PREFIX + "/" + name);
+    }
+
+    public void testLoadFromJar() {
+        NativeLibrary.getInstance("testlib-jar");
+    }
+
+    public void testLoadFromJarAbsolute() {
+        String name = System.mapLibraryName("testlib-jar").replace(".jnilib", ".dylib");
+        NativeLibrary.getInstance("/" + Platform.RESOURCE_PREFIX + "/" + name);
+    }
+
+    public void testLoadExplicitAbsolutePath() {
+        NativeLibrary.getInstance(new File(BUILDDIR + "/native/testlib-truncated").getAbsolutePath());
+    }
+
     public static interface CLibrary extends Library {
         int wcslen(WString wstr);
         int strlen(String str);

test/com/sun/jna/NativeLibraryTest.java

@@ -249,10 +249,6 @@ public void testLoadLibraryWithOptions() {
         Native.loadLibrary("testlib", TestLibrary.class, options);
     }
 
-    public void testEmbeddedLibrary() {
-        Native.loadLibrary("embedded-testlib", TestLibrary.class);
-    }
-
     public static void main(String[] args) {
         junit.textui.TestRunner.run(NativeLibraryTest.class);
     }