import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import java.io.IOException;
import java.io.InputStream;
/**
* Load the Widget type mappings (resource).
- *
+ *
* @throws IOException
* if the configuration file is not loaded
*/
for (Artifact artifact : toscaFiles) {
String fileName = artifact.getName().replaceFirst("Definitions/", "ymlFiles/");
- String expectedYaml = ymlMap.get(fileName);
+ String expectedYaml = ymlMap.get(fileName).replaceAll("\\r\\n?", "\n");
assertThat("Missing expected content for " + fileName, expectedYaml, is(not(nullValue())));
assertThat("The content of " + fileName + " must match the expected content",
convertToString(artifact.getPayload()).replaceAll("\\r\\n?", "\n"), is(equalTo(expectedYaml)));
}
public String loadResourceAsString(String resourceName) throws IOException {
- return IOUtils.toString(getResource(resourceName), Charset.defaultCharset());
+ try {
+ return IOUtils.toString(getResource(resourceName), Charset.defaultCharset());
+ } catch (NullPointerException e) {
+ throw new IllegalArgumentException("No such resource " + resourceName);
+ }
}
public String getRequestJson(String resource) throws IOException {
/**
* Create Properties from the content of the named resource (e.g. a file on the classpath).
- *
+ *
* @param resourceName
* the resource name
* @return Properties loaded from the named resource