--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config/src/test/java/com/redhat/thermostat/shared/config/NativeLibraryResolverTest.java	Fri Dec 05 18:11:02 2014 -0700
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2012-2014 Red Hat, Inc.
+ *
+ * This file is part of Thermostat.
+ *
+ * Thermostat is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2, or (at your
+ * option) any later version.
+ *
+ * Thermostat is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Thermostat; see the file COPYING.  If not see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Linking this code with other modules is making a combined work
+ * based on this code.  Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of this code give
+ * you permission to link this code with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also
+ * meet, for each linked independent module, the terms and conditions
+ * of the license of that module.  An independent module is a module
+ * which is not derived from or based on this code.  If you modify
+ * this code, you may extend this exception to your version of the
+ * library, but you are not obligated to do so.  If you do not wish
+ * to do so, delete this exception statement from your version.
+ */
+
+package com.redhat.thermostat.shared.config;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+
+import org.junit.Test;
+
+public class NativeLibraryResolverTest {
+
+    @Test
+    public void testGetAbsoluteLibraryPath() {
+        String mockNativeLibRoot = "/arbitrary/path";
+        String libName = "foo";
+        CommonPaths cp = mock(CommonPaths.class);
+        when(cp.getSystemNativeLibsRoot()).thenReturn(new File(mockNativeLibRoot));
+
+        NativeLibraryResolver.setCommonPaths(cp);
+        String absPath = NativeLibraryResolver.getAbsoluteLibraryPath(libName);
+
+        assertNotNull(absPath);
+        assertTrue(absPath.startsWith(mockNativeLibRoot));
+        assertTrue(absPath.contains(libName));
+    }
+
+    @Test
+    public void testExceptionThrownOnMissingPaths() {
+        NativeLibraryResolver.setCommonPaths(null);
+        try {
+            NativeLibraryResolver.getAbsoluteLibraryPath("");
+        } catch (IllegalStateException ex) {
+            // Expected
+            return;
+        }
+        fail("Should throw exception if CommonPaths not set.");
+    }
+}
+

--- a/config/src/test/java/com/redhat/thermostat/shared/config/NativeLibrayResolverTest.java	Mon Dec 08 10:26:02 2014 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
- * Copyright 2012-2014 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.shared.config;
-
-import static org.junit.Assert.assertFalse;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.redhat.thermostat.shared.config.internal.CommonPathsImpl;
-
-public class NativeLibrayResolverTest {
-
-    private static final String THERMOSTAT_HOME = "THERMOSTAT_HOME";
-
-    private String saved;
-
-    @Before
-    public void setUp() {
-        saved = System.setProperty(THERMOSTAT_HOME, "../foo/");
-        NativeLibraryResolver.setCommonPaths(new CommonPathsImpl());
-    }
-
-    @After
-    public void tearDown() {
-        if (saved == null) {
-            System.clearProperty(THERMOSTAT_HOME);
-        } else {
-            System.setProperty(THERMOSTAT_HOME, null);
-        }
-    }
-
-    @Test
-    public void testGetAbsoluteLibraryPath() {
-        String absPath = NativeLibraryResolver.getAbsoluteLibraryPath("foo");
-        assertFalse(absPath.startsWith(".."));
-    }
-}
-