SHL-187: Build and Test fail on Windows

This closes #91
This commit is contained in:
Aditya
2016-02-15 21:59:32 -08:00
parent ec9e3d49f8
commit d304f74217
2 changed files with 4 additions and 1 deletions

View File

@@ -38,6 +38,8 @@ if (project.hasProperty('platformVersion')) {
[compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:-serial", "-Xlint:unchecked", "-Xlint:rawtypes"]
[compileJava, compileTestJava]*.options*.encoding = "UTF-8"
dependencies {
compile "org.springframework:spring-core:$springVersion"
compile "org.springframework:spring-context-support:$springVersion"
@@ -62,6 +64,7 @@ javadoc {
ext.tmpDir = file("${buildDir}/api-work")
configure(options) {
encoding = "UTF-8"
stylesheetFile = file("${srcDir}/spring-javadoc.css")
overview = "${srcDir}/overview.html"
docFilesSubDirs = true

View File

@@ -42,7 +42,7 @@ public class AbstractTestWithSample {
this.getClass().getSimpleName(), testName.getMethodName());
InputStream stream = TableTest.class.getResourceAsStream(sampleName);
Assert.notNull(stream, "Can't find expected rendering result at " + sampleName);
return FileCopyUtils.copyToString(new InputStreamReader(stream)).replace("&", "");
return FileCopyUtils.copyToString(new InputStreamReader(stream, "UTF-8")).replace("&", "");
}
/**