Merge pull request #1085 from michelle192837/eval

Fix string comparison for custom statuses.
GoogleCloudPlatform · Nov 23, 2022 · 40491bc · 40491bc
2 parents 0052319 + 9a975e8
commit 40491bc
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 4 deletions.
diff --git a/pkg/updater/eval.go b/pkg/updater/eval.go
@@ -58,7 +58,7 @@ func strStartsWith(a, b string) bool {
 }
 
 func strContains(a, b string) bool {
-	return strings.Contains(b, a)
+	return strings.Contains(a, b)
 }
 
 func numEQ(a, b float64) bool {

diff --git a/pkg/updater/eval_test.go b/pkg/updater/eval_test.go
@@ -138,6 +138,30 @@ func TestCustomStatus(t *testing.T) {
 
 			want: &timedOut,
 		},
+		{
+			name: "wrong string value",
+			rules: []*evalpb.Rule{
+				{
+					ComputedStatus: tspb.TestStatus_TIMED_OUT,
+					TestResultComparisons: []*evalpb.TestResultComparison{
+						{
+							TestResultInfo: &evalpb.TestResultComparison_PropertyKey{
+								PropertyKey: "foo",
+							},
+							Comparison: &evalpb.Comparison{
+								Op: evalpb.Comparison_OP_EQ,
+								ComparisonValue: &evalpb.Comparison_StringValue{
+									StringValue: "goal",
+								},
+							},
+						},
+					},
+				},
+			},
+			tr: makeResult(map[string][]string{
+				"foo": {"wrong-value"},
+			}),
+		},
 		{
 			name: "not equal, string",
 			rules: []*evalpb.Rule{
@@ -164,7 +188,7 @@ func TestCustomStatus(t *testing.T) {
 			want: &timedOut,
 		},
 		{
-			name: "wrong string value",
+			name: "not equal, string, is equal",
 			rules: []*evalpb.Rule{
 				{
 					ComputedStatus: tspb.TestStatus_TIMED_OUT,
@@ -174,7 +198,7 @@ func TestCustomStatus(t *testing.T) {
 								PropertyKey: "foo",
 							},
 							Comparison: &evalpb.Comparison{
-								Op: evalpb.Comparison_OP_EQ,
+								Op: evalpb.Comparison_OP_NE,
 								ComparisonValue: &evalpb.Comparison_StringValue{
 									StringValue: "goal",
 								},
@@ -184,7 +208,56 @@ func TestCustomStatus(t *testing.T) {
 				},
 			},
 			tr: makeResult(map[string][]string{
-				"foo": {"wrong-value"},
+				"foo": {"goal"},
+			}),
+		},
+		{
+			name: "string contains",
+			rules: []*evalpb.Rule{
+				{
+					ComputedStatus: tspb.TestStatus_TIMED_OUT,
+					TestResultComparisons: []*evalpb.TestResultComparison{
+						{
+							TestResultInfo: &evalpb.TestResultComparison_PropertyKey{
+								PropertyKey: "foo",
+							},
+							Comparison: &evalpb.Comparison{
+								Op: evalpb.Comparison_OP_CONTAINS,
+								ComparisonValue: &evalpb.Comparison_StringValue{
+									StringValue: "goal",
+								},
+							},
+						},
+					},
+				},
+			},
+			tr: makeResult(map[string][]string{
+				"foo": {"this is the goal"},
+			}),
+			want: &timedOut,
+		},
+		{
+			name: "string does not contains",
+			rules: []*evalpb.Rule{
+				{
+					ComputedStatus: tspb.TestStatus_TIMED_OUT,
+					TestResultComparisons: []*evalpb.TestResultComparison{
+						{
+							TestResultInfo: &evalpb.TestResultComparison_PropertyKey{
+								PropertyKey: "foo",
+							},
+							Comparison: &evalpb.Comparison{
+								Op: evalpb.Comparison_OP_CONTAINS,
+								ComparisonValue: &evalpb.Comparison_StringValue{
+									StringValue: "goal",
+								},
+							},
+						},
+					},
+				},
+			},
+			tr: makeResult(map[string][]string{
+				"foo": {"i am not a matching message"},
 			}),
 		},
 		{