@@ -14,14 +14,12 @@ public class FluentIterableTest extends ModuleTestBase
14
14
{
15
15
private final ObjectMapper MAPPER = mapperWithModule ();
16
16
17
- FluentIterable <Integer > createFluentIterable () {
18
- return new FluentIterable <Integer >() {
19
- private final Iterable <Integer > _iterable = Sets .newHashSet (1 , 2 , 3 );
20
- @ Override
21
- public Iterator <Integer > iterator () {
22
- return _iterable .iterator ();
23
- }
24
- };
17
+ public static class FluentHolder {
18
+ public final Iterable <Integer > value = createFluentIterable ();
19
+ }
20
+
21
+ static FluentIterable <Integer > createFluentIterable () {
22
+ return FluentIterable .from (Sets .newHashSet (1 , 2 , 3 ));
25
23
}
26
24
27
25
/**
@@ -31,15 +29,15 @@ public Iterator<Integer> iterator() {
31
29
*/
32
30
public void testSerializationWithoutModule () throws Exception {
33
31
ObjectMapper mapper = new ObjectMapper ();
34
- Iterable < Integer > fluentIterable = createFluentIterable ();
35
- String json = mapper .writeValueAsString (fluentIterable );
36
- assertEquals ("{\" empty\" :false}" , json );
32
+ FluentHolder holder = new FluentHolder ();
33
+ String json = mapper .writeValueAsString (holder );
34
+ assertEquals ("{\" value \" :{ \" empty\" :false} }" , json );
37
35
}
38
36
39
37
public void testSerialization () throws Exception {
40
- Iterable < Integer > fluentIterable = createFluentIterable ();
41
- String json = MAPPER .writeValueAsString (fluentIterable );
42
- assertEquals ("[1,2,3]" , json );
38
+ FluentHolder holder = new FluentHolder ();
39
+ String json = MAPPER .writeValueAsString (holder );
40
+ assertEquals ("{ \" value \" : [1,2,3]} " , json );
43
41
}
44
42
45
43
}
0 commit comments