Fix bugs

Author: sbabcoc

src/main/java/com/nordstrom/common/file/PathUtils.java

@@ -13,8 +13,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
-import org.testng.util.Strings;
-
 public class PathUtils {
 
     private PathUtils() {
@@ -34,15 +32,17 @@ public static Path getNextPath(Path targetPath, String baseName, String extensio
         String newName;
 
         Objects.requireNonNull(targetPath, "[targetPath] must be non-null");
+        Objects.requireNonNull(baseName, "[baseName] must be non-null");
+        Objects.requireNonNull(extension, "[extension] must be non-null");
 
         File targetFile = targetPath.toFile();
         if ( ! (targetFile.exists() && targetFile.isDirectory())) {
             throw new IllegalArgumentException("[targetPath] must specify an existing directory");
         }
-        if (Strings.isNullOrEmpty(baseName)) {
+        if (baseName.isEmpty()) {
             throw new IllegalArgumentException("[baseName] must specify a non-empty string");
         }
-        if (Strings.isNullOrEmpty(extension)) {
+        if (extension.isEmpty()) {
             throw new IllegalArgumentException("[extension] must specify a non-empty string");
         }
 

src/test/java/com/nordstrom/common/file/PathUtilsTest.java

@@ -27,7 +27,7 @@ public void testNextPath() throws IOException {
                 file.delete();
             }
         } else {
-            Files.createDirectory(targetPath);
+            Files.createDirectories(targetPath);
         }
 
         Path path1 = PathUtils.getNextPath(targetPath, "test", "txt");
@@ -75,7 +75,7 @@ public void testNonExistentPath() throws IOException {
         PathUtils.getNextPath(Paths.get("foobar"), "test", "txt");
     }
 
-    @Test(expectedExceptions = {IllegalArgumentException.class})
+    @Test(expectedExceptions = {NullPointerException.class})
     public void testNullBaseName() throws IOException {
         PathUtils.getNextPath(getOutputPath(), null, "txt");
     }
@@ -85,7 +85,7 @@ public void testEmptyBaseName() throws IOException {
         PathUtils.getNextPath(getOutputPath(), "", "txt");
     }
 
-    @Test(expectedExceptions = {IllegalArgumentException.class})
+    @Test(expectedExceptions = {NullPointerException.class})
     public void testNullExtenstion() throws IOException {
         PathUtils.getNextPath(getOutputPath(), "test", null);
     }