fix more tests

Signed-off-by: Jade Abraham <[email protected]>
chapel-lang · Aug 28, 2024 · a782428 · a782428
1 parent 358d20f
commit a782428
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 10 deletions.
diff --git a/test/library/packages/Search/correctness.chpl b/test/library/packages/Search/correctness.chpl
@@ -2,7 +2,7 @@
  *  Check correctness of search functions
  */
 
-use Search;
+use Search; use Sort only relativeComparator;
 
 proc main() {
 

diff --git a/test/library/standard/Sort/errors/error-multiple-interfaces.1.good b/test/library/standard/Sort/errors/error-multiple-interfaces.1.good
@@ -1 +1 @@
-error-multiple-interfaces.chpl:16: error: The comparator R1 should only implement one sort comparator interface.
+error-multiple-interfaces.chpl:32: error: The comparator R1 should only implement one sort comparator interface.
diff --git a/test/library/standard/Sort/errors/error-multiple-interfaces.2-0.good b/test/library/standard/Sort/errors/error-multiple-interfaces.2-0.good
diff --git a/test/library/standard/Sort/errors/error-multiple-interfaces.2.good b/test/library/standard/Sort/errors/error-multiple-interfaces.2.good
diff --git a/test/library/standard/Sort/errors/error-multiple-interfaces.3-0.good b/test/library/standard/Sort/errors/error-multiple-interfaces.3-0.good
diff --git a/test/library/standard/Sort/errors/error-multiple-interfaces.3.good b/test/library/standard/Sort/errors/error-multiple-interfaces.3.good
diff --git a/test/library/standard/Sort/errors/error-multiple-interfaces.4.good b/test/library/standard/Sort/errors/error-multiple-interfaces.4.good
@@ -1 +1 @@
-error-multiple-interfaces.chpl:16: error: The comparator R4 should only implement one sort comparator interface.
+error-multiple-interfaces.chpl:32: error: The comparator R4 should only implement one sort comparator interface.
diff --git a/test/library/standard/Sort/errors/error-multiple-interfaces.chpl b/test/library/standard/Sort/errors/error-multiple-interfaces.chpl
@@ -8,9 +8,25 @@ interface keyComparator { }
 
 var A = [1,2,3,4];
 
-record R1: keyPartComparator, relativeComparator { }
-record R2: keyPartComparator, keyComparator { }
-record R3: relativeComparator, keyComparator { }
-record R4: keyComparator, keyPartComparator, relativeComparator { }
+record R1: keyPartComparator, relativeComparator {
+  proc compare(a: int, b: int) {
+    return a - b;
+  }
+}
+record R2: keyPartComparator, keyComparator {
+  proc key(a: int) {
+    return a;
+  }
+}
+record R3: relativeComparator, keyComparator {
+  proc key(a: int) {
+    return a;
+  }
+}
+record R4: keyComparator, keyPartComparator, relativeComparator {
+  proc key(a: int) {
+    return a;
+  }
+}
 
 sort(A, comparator=new comparator());
diff --git a/test/library/standard/Sort/errors/error-multiple-interfaces.compopts b/test/library/standard/Sort/errors/error-multiple-interfaces.compopts
@@ -1,4 +1,4 @@
 -scomparator=R1
 -scomparator=R2
 -scomparator=R3
--scomparator=R4 
+-scomparator=R4
diff --git a/test/library/standard/Sort/errors/errors-compare.compopts b/test/library/standard/Sort/errors/errors-compare.compopts
@@ -1,3 +1,4 @@
 -scomparator=boolean # errors-compare.boolean.good
 -scomparator=rec     # errors-compare.rec.good
 -scomparator=str     # errors-compare.str.good
+-scomparator=noKeyPart # errors-compare.noKeyPart.good
diff --git a/test/library/standard/Sort/errors/errors-compare.noKeyPart.good b/test/library/standard/Sort/errors/errors-compare.noKeyPart.good
@@ -0,0 +1,2 @@
+errors-compare.chpl:9: In function 'main':
+errors-compare.chpl:17: error: The comparator noKeyPart implements the keyPartComparator interface, but the keyPart method is not implemented
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		error-multiple-interfaces.chpl:16: error: The comparator R1 should only implement one sort comparator interface.
		error-multiple-interfaces.chpl:32: error: The comparator R1 should only implement one sort comparator interface.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		errors-compare.chpl:9: In function 'main':
		errors-compare.chpl:17: error: The comparator noKeyPart implements the keyPartComparator interface, but the keyPart method is not implemented