Add trace

Examples/ErrorReporting/Cleanup2.kt

@@ -4,7 +4,6 @@ import atomictest.eq
 
 fun main(args: Array<String>) {
   localFile("Cleanup2.kt").useLines {
-    it.filter { "//" in it }.first() eq // [1]
-    "// ErrorReporting/Cleanup2.kt"
-  }
+    it.filter { "//" in it }.first() // [1]
+  } eq "// ErrorReporting/Cleanup2.kt"
 }

Examples/FromKotlin/NullableJavaTool.java

@@ -0,0 +1,9 @@
+// FromKotlin/NullableJavaTool.java
+package FromKotlin;
+
+public class NullableJavaTool {
+  public static NullableJavaTool get() {
+    return null;
+  }
+  public void method() {}
+}

Examples/FromKotlin/UseNullableJavaTool.kt

@@ -0,0 +1,17 @@
+// FromKotlin/UseNullableJavaTool.kt
+import FromKotlin.NullableJavaTool
+import atomictest.*
+
+fun main(args: Array<String>) {
+  val a = NullableJavaTool.get()
+  capture {
+    val b: NullableJavaTool =
+      NullableJavaTool.get()
+  } eq "IllegalStateException"
+  val c: NullableJavaTool? =
+    NullableJavaTool.get()
+  capture {
+    a.method()
+  } eq "NullPointerException"
+  c?.method() eq null
+}

Examples/constructors/Coffee.kt

@@ -1,5 +1,5 @@
 // Constructors/Coffee.kt
-import atomictest.eq
+import atomictest.*
 
 class Coffee(
   val shots: Int = 2,
@@ -9,7 +9,7 @@ class Coffee(
   val syrup: String = "") {
   var result = ""
   init {
-    println(listOf(
+    trace(listOf(
       shots, decaf, milk, toGo, syrup))
     getCup()
     pourShots()
@@ -42,4 +42,8 @@ fun main(args: Array<String>) {
     toGo = true, syrup = "Chocolate")
   mocha.result eq
     "ToGoCup decaf shot decaf shot Chocolate"
+  trace eq """
+[2, false, false, false, ]
+[2, true, false, true, Chocolate]
+"""
 }

Examples/secondaryConstructors/GardenGnome.kt

@@ -1,10 +1,10 @@
 // SecondaryConstructors/GardenGnome.kt
-import atomictest.eq
+import atomictest.*
 
 class GardenGnome(val height: Double,
   val weight: Double, var happy: Boolean) {
   init {
-    println("In primary constructor")
+    trace("In primary constructor")
   }
   var painted = true
   fun magic(level: Int) = "Poof! $level"
@@ -22,4 +22,9 @@ fun main(args: Array<String>) {
     "20.0 110.0 false true"
   GardenGnome(happy=true).show() eq
     "15.0 100.0 true true"
+  trace eq
+"""
+In primary constructor
+In primary constructor
+"""
 }

Examples/whenExpressions/WhenAsStatement.kt

@@ -1,9 +1,16 @@
 // WhenExpressions/WhenAsStatement.kt
+import atomictest.*
 
 fun checkColor(color: String) {
-  when (color) {
-    "red" -> println("RED")
-    "blue" -> println("BLUE")
-    "green" -> println("GREEN")
+  when(color) {
+    "red" -> trace("RED")
+    "blue" -> trace("BLUE")
+    "green" -> trace("GREEN")
   }
 }
+
+fun main(args: Array<String>) {
+  checkColor("white")
+  checkColor("blue")
+  trace eq "BLUE"
+}

Examples/whenExpressions/WhenExpressions.kt

@@ -2,7 +2,7 @@
 import atomictest.eq
 
 fun matchColor(color: String) =
-  when (color) {                    // [1]
+  when(color) {                    // [1]
     "red" -> "RED"                  // [2]
     "blue" -> "BLUE"
     "green" -> "GREEN"

Experiments/JHelper.java

@@ -0,0 +1,5 @@
+//package jhelper;
+public class JHelper {
+  public static JHelper jF() { return null; }
+  public void M() {}
+}

Experiments/UseJHelper.kt

@@ -0,0 +1,5 @@
+import jhelper.*
+fun main(args: Array<String>) {
+  val a = JHelper.jF()
+  a.M()  //Oops!
+}

gradle/tasks.gradle

@@ -1513,6 +1513,11 @@ task UseBeanClass(type: JavaExec) {
     main = 'UseBeanClassKt'
 }
 
+task UseNullableJavaTool(type: JavaExec) {
+    classpath kotlinClassPath
+    main = 'UseNullableJavaToolKt'
+}
+
 task UsingAtomicTest(type: JavaExec) {
     classpath kotlinClassPath
     main = 'UsingAtomicTestKt'
@@ -1578,6 +1583,11 @@ task WhenAndSmartCasts(type: JavaExec) {
     main = 'smartcasts.WhenAndSmartCastsKt'
 }
 
+task WhenAsStatement(type: JavaExec) {
+    classpath kotlinClassPath
+    main = 'WhenAsStatementKt'
+}
+
 task WhenExpressions(type: JavaExec) {
     classpath kotlinClassPath
     main = 'WhenExpressionsKt'
@@ -1915,6 +1925,7 @@ task run (dependsOn: [
     'UnpredictableHashing',
     'UseALibrary',
     'UseBeanClass',
+    'UseNullableJavaTool',
     'UsingAtomicTest',
     'UsingDataClass',
     'UsingKotlinClass',
@@ -1928,6 +1939,7 @@ task run (dependsOn: [
     'Vars',
     'VisibleClassArgs',
     'WhenAndSmartCasts',
+    'WhenAsStatement',
     'WhenExpressions',
     'WhileLoop',
     'WhyFlatMap',