Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[#323] Fixed tests

  • Loading branch information...
commit be46d328b4ccdc2913794f245575c187ebe1160b 1 parent 87dce6a
@jroper jroper authored
View
2  framework/src/play/src/main/resources/play.plugins
@@ -5,5 +5,5 @@
500:play.api.db.evolutions.EvolutionsPlugin
600:play.api.cache.EhCachePlugin
1000:play.api.libs.concurrent.AkkaPlugin
-1100:play.libs.Json.JsonPlugin
+1100:play.libs.Json$JsonPlugin
10000:play.api.GlobalPlugin
View
13 framework/test/integrationtest-java/test/JsonTest.java
@@ -14,8 +14,6 @@
import play.test.*;
import java.io.IOException;
-import java.lang.Override;
-import java.lang.String;
import java.util.HashMap;
import java.util.Map;
@@ -42,7 +40,7 @@ public void run() {
public void inAppWithCustomObjectMapper() {
Map<String, String> config = new HashMap<String, String>();
config.put("json.objectMapperProvider", MockObjectMapperProvider.class.getName());
- running(fakeApplication(), new Runnable() {
+ running(fakeApplication(config), new Runnable() {
public void run() {
assertThat(Json.toJson(new MockObject()).getTextValue(), equalTo("mockobject"));
}
@@ -60,7 +58,7 @@ public String getModuleName() {
@Override
public Version version() {
- return null;
+ return new Version(1, 0, 0, "");
}
@Override
@@ -79,9 +77,14 @@ public void setupModule(SetupContext context) {
public void serialize(test.JsonTest.MockObject value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException {
jgen.writeString("mockobject");
}
+
+ @Override
+ public Class<test.JsonTest.MockObject> handledType() {
+ return MockObject.class;
+ }
}
public static class MockObject {
- public String foo;
+ public String foo = "bar";
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.