You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2014/03/26 13:23:30 UTC
git commit: MARMOTTA-395: trying to fix the encoding issues in all
platforms when testing the artifacts
Repository: marmotta
Updated Branches:
refs/heads/develop 2e06adf7c -> de57f1fcc
MARMOTTA-395: trying to fix the encoding issues in all platforms when testing the artifacts
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/de57f1fc
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/de57f1fc
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/de57f1fc
Branch: refs/heads/develop
Commit: de57f1fcc99fbe86ad67b319d823ff2f29fa2cb7
Parents: 2e06adf
Author: Sergio Fernández <wi...@apache.org>
Authored: Wed Mar 26 13:23:16 2014 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Wed Mar 26 13:23:16 2014 +0100
----------------------------------------------------------------------
.../archetype-resources/src/test/java/services/MyServiceTest.java | 2 +-
.../src/test/java/webservices/MyWebServiceTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/de57f1fc/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/test/java/services/MyServiceTest.java
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/test/java/services/MyServiceTest.java b/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/test/java/services/MyServiceTest.java
index 77472a4..2dd7137 100644
--- a/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/test/java/services/MyServiceTest.java
+++ b/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/test/java/services/MyServiceTest.java
@@ -52,7 +52,7 @@ public class MyServiceTest {
Assert.assertEquals("Hello Steve", myService.helloWorld("Steve"));
Assert.assertEquals("Hello Tom", myService.helloWorld("Tom"));
Assert.assertEquals("Hello Ron", myService.helloWorld("Ron"));
- Assert.assertEquals("Hello Wüterich", myService.helloWorld("Wüterich"));
+ Assert.assertEquals("Hello Fernández", myService.helloWorld("Fernández"));
}
@AfterClass
http://git-wip-us.apache.org/repos/asf/marmotta/blob/de57f1fc/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/test/java/webservices/MyWebServiceTest.java
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/test/java/webservices/MyWebServiceTest.java b/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/test/java/webservices/MyWebServiceTest.java
index 715d218..c60c2ab 100644
--- a/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/test/java/webservices/MyWebServiceTest.java
+++ b/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/test/java/webservices/MyWebServiceTest.java
@@ -65,7 +65,7 @@ public class MyWebServiceTest {
.get("/${moduleKey}");
RestAssured.given()
- .contentType(ContentType.HTML)
+ .contentType(ContentType.HTML + "; charset=utf-8")
.param("name", "Jürgen")
.expect()
.content(containsString("Hello Jürgen"))