Fixed functionaljava#49 - show null for null parameter in show

mperry · mperry · commit 255beaa4980a · 2014-07-03T17:08:41.000+10:00
diff --git a/core/src/main/java/fj/Show.java b/core/src/main/java/fj/Show.java
@@ -179,7 +179,7 @@ public Stream<Character> f(final A a) {
   public static <A> Show<A> anyShow() {
     return new Show<A>(new F<A, Stream<Character>>() {
       public Stream<Character> f(final A a) {
-        return Stream.fromString(a.toString());
+        return Stream.fromString((a == null) ? "null" : a.toString());
       }
     });
   }
diff --git a/core/src/test/java/fj/data/test/TestNull.java b/core/src/test/java/fj/data/test/TestNull.java
@@ -0,0 +1,33 @@
+package fj.data.test;
+
+import fj.F2;
+import fj.F3;
+import fj.data.List;
+import fj.test.Arbitrary;
+import fj.test.CheckResult;
+import fj.test.Gen;
+import fj.test.Property;
+import org.junit.Test;
+
+import static fj.Function.compose;
+import static fj.test.Arbitrary.*;
+import static fj.test.Arbitrary.arbLong;
+import static fj.test.Coarbitrary.coarbInteger;
+import static fj.test.Coarbitrary.coarbLong;
+import static fj.test.Property.prop;
+import static fj.test.Property.property;
+
+/**
+ * Created by MarkPerry on 3/07/2014.
+ */
+public class TestNull {
+
+	@Test
+	public void testShowNullParameters() {
+		Property p = property(arbitrary(Gen.<Integer>value(null)), (Integer i) -> {
+				return prop(i != null);
+		});
+		CheckResult.summary.println(p.check());
+	}
+
+}

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ public Stream<Character> f(final A a) {`
`179`	`179`	`public static <A> Show<A> anyShow() {`
`180`	`180`	`return new Show<A>(new F<A, Stream<Character>>() {`
`181`	`181`	`public Stream<Character> f(final A a) {`
`182`		`- return Stream.fromString(a.toString());`
	`182`	`+ return Stream.fromString((a == null) ? "null" : a.toString());`
`183`	`183`	`}`
`184`	`184`	`});`
`185`	`185`	`}`