1 files changed, 75 insertions, 29 deletions
diff --git a/ethutil/natspec/natspec_test.go b/ethutil/natspec/natspec_test.go
index 48a9cb25c..498f8d78e 100644
--- a/ethutil/natspec/natspec_test.go
+++ b/ethutil/natspec/natspec_test.go
@@ -6,41 +6,48 @@ import (
 
 func TestNotice(t *testing.T) {
 
-	ns, err := NewNATSpec(`
+	tx := `
 	{
-            "jsonrpc": "2.0",
-            "method": "eth_call",
-            "params": [{
-                "to": "0x8521742d3f456bd237e312d6e30724960f72517a",
-                "data": "0xc6888fa1000000000000000000000000000000000000000000000000000000000000007a"
-            }],
-            "id": 6
-        }
-	`)
+    "jsonrpc": "2.0",
+    "method": "eth_call",
+    "params": [{
+        "to": "0x8521742d3f456bd237e312d6e30724960f72517a",
+        "data": "0xc6888fa1000000000000000000000000000000000000000000000000000000000000007a"
+    }],
+    "id": 6
+  }
+	`
 
+	abi := `
+	[{
+    "name": "multiply",
+    "constant": false,
+    "type": "function",
+    "inputs": [{
+      "name": "a",
+      "type": "uint256"
+    }],
+    "outputs": [{
+      "name": "d",
+      "type": "uint256"
+    }]
+  }]
+	`
+
+	desc := "Will multiply `a` by 7 and return `a * 7`."
+
+	method := "multiply"
+
+	ns, err := New()
 	if err != nil {
 		t.Errorf("NewNATSpec error %v", err)
 	}
 
-	ns.SetABI(`
-	[{
-            "name": "multiply",
-            "constant": false,
-            "type": "function",
-            "inputs": [{
-                "name": "a",
-                "type": "uint256"
-            }],
-            "outputs": [{
-                "name": "d",
-                "type": "uint256"
-            }]
-        }]
-	`)
-	ns.SetDescription("Will multiply `a` by 7 and return `a * 7`.")
-	ns.SetMethod("multiply")
-
-	notice := ns.Parse()
+	notice, err := ns.Notice(tx, abi, method, desc)
+
+	if err != nil {
+		t.Errorf("expected no error got %v", err)
+	}
 
 	expected := "Will multiply 122 by 7 and return 854."
 	if notice != expected {
@@ -48,4 +55,43 @@ func TestNotice(t *testing.T) {
 	} else {
 		t.Logf("returned notice \"%v\"", notice)
 	}
+
+	notice, err = ns.Notice(tx, abi, method, "Will multiply 122 by \"7\" and return 854.")
+
+	expected = "natspec.js error setting expression: (anonymous): Line 1:41 Unexpected number"
+
+	if err == nil {
+		t.Errorf("expected error, got nothing (notice: '%v')", err, notice)
+	} else {
+		if err.Error() != expected {
+			t.Errorf("expected error '%s' got '%v' (notice: '%v')", expected, err, notice)
+		}
+	}
+
+	// https://github.com/ethereum/natspec.js/issues/1
+	// badDesc := "Will multiply `e` by 7 and return `a * 7`."
+	// notice, err = ns.Notice(tx, abi, method, badDesc)
+
+	// expected = "natspec.js error evaluating expression: wrong input param in expression ''"
+
+	// if err == nil {
+	// 	t.Errorf("expected error, got nothing (notice: '%v')", notice)
+	// } else {
+	// 	if err.Error() != expected {
+	// 		t.Errorf("expected error '%s' got '%v' (notice: '%v')", expected, err, notice)
+	// 	}
+	// }
+
+	notice, err = ns.Notice(tx, abi, "missing_method", desc)
+
+	expected = "natspec.js error evaluating expression: wrong input params in expression 'Will multiply `a` by 7 and return `a * 7`.'"
+
+	if err == nil {
+		t.Errorf("expected error, got nothing (notice: '%v')", notice)
+	} else {
+		if err.Error() != expected {
+			t.Errorf("expected error '%s' got '%v' (notice: '%v')", expected, err, notice)
+		}
+	}
+
 }