improve test coverage

catalog-core/src/main/java/uk/gov/justice/schema/catalog/SchemaResolver.java

@@ -31,13 +31,13 @@ public URL resolve(
             final Optional<String> fileBaseLocation) {
 
         try {
-            final URI schemaUri = URI.create(fileBaseLocation.orElse(AN_EMPTY_STRING)).resolve(fileLocation);
+            final URI schemaUri = new URI(fileBaseLocation.orElse(AN_EMPTY_STRING)).resolve(fileLocation);
             final URI resolvedUri = uriResolver.resolve(catalogUri, schemaUri);
 
             return urlConverter.toUrl(resolvedUri);
 
-        } catch (final IllegalArgumentException | URISyntaxException e) {
-            throw new SchemaCatalogException(format("Failed to resolve %s, %s, %s", catalogUri, fileLocation, fileBaseLocation.orElse(null)), e);
+        } catch (final URISyntaxException e) {
+            throw new SchemaCatalogException(format("Failed to resolve '%s', to file location '%s', with base location '%s'", catalogUri, fileLocation, fileBaseLocation.orElse(null)), e);
         }
     }
 }

catalog-core/src/test/java/uk/gov/justice/schema/catalog/SchemaResolverTest.java

@@ -2,13 +2,16 @@
 
 import static java.util.Optional.empty;
 import static java.util.Optional.of;
+import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
 
 import uk.gov.justice.schema.catalog.util.UriResolver;
 import uk.gov.justice.schema.catalog.util.UrlConverter;
 
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Optional;
 
@@ -57,4 +60,21 @@ public void shouldResolveTheLocationToAUrlUsingTheCatalogUrlAndAnEmptyBaseLocati
 
         assertThat(resolvedUri.toString(), is("file:/src/main/some/path/to.json"));
     }
+
+    @Test
+    public void shouldFailIfResolvingTheUrlThrowsAURISyntaxException() throws Exception {
+
+        final URI catalogUri = new URI("file:/src/main/schema.json");
+
+        final String fileLocation = "some/path/to.json";
+        final Optional<String> baseLocation = of("this path is silly");
+
+        try {
+            schemaResolver.resolve(catalogUri, fileLocation, baseLocation);
+            fail();
+        } catch (final SchemaCatalogException expected) {
+            assertThat(expected.getCause(), is(instanceOf(URISyntaxException.class)));
+            assertThat(expected.getMessage(), is("Failed to resolve 'file:/src/main/schema.json', to file location 'some/path/to.json', with base location 'this path is silly'"));
+        }
+    }
 }