fixup! Add the Test.assertError() helper function

onflow · Aug 7, 2023 · 600ed65 · 600ed65
1 parent aee08f0
commit 600ed65
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/runtime/stdlib/contracts/test.cdc b/runtime/stdlib/contracts/test.cdc
@@ -451,23 +451,24 @@ pub contract Test {
     /// scripts & transactions, has errored and the error message
     /// contains the given sub-string.
     ///
-    pub fun assertError(_ result: {Result}, substr: String) {
+    pub fun assertError(_ result: {Result}, errorMessage: String) {
         pre {
             result.status == ResultStatus.failed: "no error was found"
         }
 
-        var found: Bool = false
+        var found = false
         let msg = result.error!.message
-        let msgLength = msg.length - substr.length + 1
+        let msgLength = msg.length - errorMessage.length + 1
         var i = 0
         while i < msgLength {
-            if msg[i] == substr[0] && msg.slice(from: i, upTo: i + substr.length) == substr {
+            if msg.slice(from: i, upTo: i + errorMessage.length) == errorMessage {
                 found = true
+                break
             }
             i = i + 1
         }
 
-        assert(found, message: "the error message did not contain the given substring")
+        assert(found, message: "the error message did not contain the given sub-string")
     }
 
 }
diff --git a/runtime/stdlib/test_test.go b/runtime/stdlib/test_test.go
@@ -1171,7 +1171,7 @@ func TestTestAssertErrorMatcher(t *testing.T) {
                     error: Test.Error("computation exceeding limit")
                 )
 
-                Test.assertError(result, substr: "exceeding limit")
+                Test.assertError(result, errorMessage: "exceeding limit")
             }
 
             pub fun testNoMatch() {
@@ -1181,7 +1181,7 @@ func TestTestAssertErrorMatcher(t *testing.T) {
                     error: Test.Error("computation exceeding memory")
                 )
 
-                Test.assertError(result, substr: "exceeding limit")
+                Test.assertError(result, errorMessage: "exceeding limit")
             }
 
             pub fun testNoError() {
@@ -1191,7 +1191,7 @@ func TestTestAssertErrorMatcher(t *testing.T) {
                     error: nil
                 )
 
-                Test.assertError(result, substr: "exceeding limit")
+                Test.assertError(result, errorMessage: "exceeding limit")
             }
 		`
 
@@ -1203,7 +1203,7 @@ func TestTestAssertErrorMatcher(t *testing.T) {
 
 		_, err = inter.Invoke("testNoMatch")
 		require.Error(t, err)
-		assert.ErrorContains(t, err, "the error message did not contain the given substring")
+		assert.ErrorContains(t, err, "the error message did not contain the given sub-string")
 
 		_, err = inter.Invoke("testNoError")
 		require.Error(t, err)
@@ -1222,7 +1222,7 @@ func TestTestAssertErrorMatcher(t *testing.T) {
                     error: Test.Error("computation exceeding limit")
                 )
 
-                Test.assertError(result, substr: "exceeding limit")
+                Test.assertError(result, errorMessage: "exceeding limit")
             }
 
             pub fun testNoMatch() {
@@ -1231,7 +1231,7 @@ func TestTestAssertErrorMatcher(t *testing.T) {
                     error: Test.Error("computation exceeding memory")
                 )
 
-                Test.assertError(result, substr: "exceeding limit")
+                Test.assertError(result, errorMessage: "exceeding limit")
             }
 
             pub fun testNoError() {
@@ -1240,7 +1240,7 @@ func TestTestAssertErrorMatcher(t *testing.T) {
                     error: nil
                 )
 
-                Test.assertError(result, substr: "exceeding limit")
+                Test.assertError(result, errorMessage: "exceeding limit")
             }
 		`
 
@@ -1252,7 +1252,7 @@ func TestTestAssertErrorMatcher(t *testing.T) {
 
 		_, err = inter.Invoke("testNoMatch")
 		require.Error(t, err)
-		assert.ErrorContains(t, err, "the error message did not contain the given substring")
+		assert.ErrorContains(t, err, "the error message did not contain the given sub-string")
 
 		_, err = inter.Invoke("testNoError")
 		require.Error(t, err)