From ba9ac235eea72de6b040166a098db183a5b04a6e Mon Sep 17 00:00:00 2001
From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Fri, 31 Mar 2023 09:26:45 +0200
Subject: [PATCH] Adjust expected error message in switch pattern tests after
 upstream typo fix

See:
https://github.com/eclipse-jdt/eclipse.jdt.core/issues/919
https://github.com/eclipse-jdt/eclipse.jdt.core/commit/b681dfb5
Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
---
 .../resources/org/aspectj/systemtest/ajc1919/ajc1919.xml  | 6 +++---
 .../resources/org/aspectj/systemtest/ajc1920/ajc1920.xml  | 8 ++++----
 .../resources/org/aspectj/systemtest/ajc198/ajc198.xml    | 2 +-
 .../resources/org/aspectj/systemtest/ajc199/ajc199.xml    | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc1919/ajc1919.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc1919/ajc1919.xml
index d31b35aa1..f8bccce64 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc1919/ajc1919.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc1919/ajc1919.xml
@@ -68,7 +68,7 @@
 	<ajc-test dir="features198/java17" vm="19" title="switch pattern matching error">
 		<compile files="SwitchPatternError.java" options="--enable-preview -19">
 			<!-- TODO: Add correct compiler error message, as soon as JDT Core supports it -->
-			<message kind="error" file="SwitchPatternError.java" text="This case label is dominated by one of the preceding case label"/>
+			<message kind="error" file="SwitchPatternError.java" text="This case label is dominated by one of the preceding case labels"/>
 		</compile>
 	</ajc-test>
 
@@ -76,7 +76,7 @@
 	<ajc-test dir="features1919/java19" vm="19" title="switch pattern matching preview 3 error 1">
 		<compile files="SwitchPatternPreview3Error1.java" options="--enable-preview -19">
 			<!-- TODO: Add correct compiler error message, as soon as JDT Core supports it -->
-			<message kind="error" file="SwitchPatternPreview3Error1.java" text="This case label is dominated by one of the preceding case label"/>
+			<message kind="error" file="SwitchPatternPreview3Error1.java" text="This case label is dominated by one of the preceding case labels"/>
 		</compile>
 	</ajc-test>
 
@@ -84,7 +84,7 @@
 	<ajc-test dir="features1919/java19" vm="19" title="switch pattern matching preview 3 error 2">
 		<compile files="SwitchPatternPreview3Error2.java" options="--enable-preview -19">
 			<!-- TODO: Add correct compiler error message, as soon as JDT Core supports it -->
-			<message kind="error" file="SwitchPatternPreview3Error2.java" text="This case label is dominated by one of the preceding case label"/>
+			<message kind="error" file="SwitchPatternPreview3Error2.java" text="This case label is dominated by one of the preceding case labels"/>
 		</compile>
 	</ajc-test>
 
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc1920/ajc1920.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc1920/ajc1920.xml
index 4d2df9f39..8f566b643 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc1920/ajc1920.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc1920/ajc1920.xml
@@ -42,7 +42,7 @@
 	<ajc-test dir="features1920/java20" vm="20" title="switch pattern matching preview 4 error">
 		<compile files="SwitchPatternPreview4Error.java" options="--enable-preview -20">
 			<!-- TODO: Add correct compiler error message, as soon as JDT Core supports it -->
-			<message kind="error" file="SwitchPatternPreview4Error.java" text="This case label is dominated by one of the preceding case label"/>
+			<message kind="error" file="SwitchPatternPreview4Error.java" text="This case label is dominated by one of the preceding case labels"/>
 		</compile>
 	</ajc-test>
 
@@ -77,7 +77,7 @@
 	<ajc-test dir="features198/java17" vm="20" title="switch pattern matching error">
 		<compile files="SwitchPatternError.java" options="--enable-preview -20">
 			<!-- TODO: Add correct compiler error message, as soon as JDT Core supports it -->
-			<message kind="error" file="SwitchPatternError.java" text="This case label is dominated by one of the preceding case label"/>
+			<message kind="error" file="SwitchPatternError.java" text="This case label is dominated by one of the preceding case labels"/>
 		</compile>
 	</ajc-test>
 
@@ -85,7 +85,7 @@
 	<ajc-test dir="features1919/java19" vm="20" title="switch pattern matching preview 3 error 1">
 		<compile files="SwitchPatternPreview3Error1.java" options="--enable-preview -20">
 			<!-- TODO: Add correct compiler error message, as soon as JDT Core supports it -->
-			<message kind="error" file="SwitchPatternPreview3Error1.java" text="This case label is dominated by one of the preceding case label"/>
+			<message kind="error" file="SwitchPatternPreview3Error1.java" text="This case label is dominated by one of the preceding case labels"/>
 		</compile>
 	</ajc-test>
 
@@ -93,7 +93,7 @@
 	<ajc-test dir="features1919/java19" vm="20" title="switch pattern matching preview 3 error 2">
 		<compile files="SwitchPatternPreview3Error2.java" options="--enable-preview -20">
 			<!-- TODO: Add correct compiler error message, as soon as JDT Core supports it -->
-			<message kind="error" file="SwitchPatternPreview3Error2.java" text="This case label is dominated by one of the preceding case label"/>
+			<message kind="error" file="SwitchPatternPreview3Error2.java" text="This case label is dominated by one of the preceding case labels"/>
 		</compile>
 	</ajc-test>
 
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml
index 85bd872b3..be4957134 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml
@@ -49,7 +49,7 @@
   <ajc-test dir="features198/java17" vm="17" title="switch pattern matching error">
     <compile files="SwitchPatternError.java" options="--enable-preview -17">
       <!-- TODO: Add correct compiler error message, as soon as JDT Core supports it -->
-      <message kind="error" file="SwitchPatternError.java" text="This case label is dominated by one of the preceding case label"/>
+      <message kind="error" file="SwitchPatternError.java" text="This case label is dominated by one of the preceding case labels"/>
     </compile>
   </ajc-test>
 
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc199/ajc199.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc199/ajc199.xml
index 5488671f5..d8868ca22 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc199/ajc199.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc199/ajc199.xml
@@ -7,7 +7,7 @@
 	<ajc-test dir="features198/java17" vm="18" title="switch pattern matching error">
 		<compile files="SwitchPatternError.java" options="--enable-preview -18">
 			<!-- TODO: Add correct compiler error message, as soon as JDT Core supports it -->
-			<message kind="error" file="SwitchPatternError.java" text="This case label is dominated by one of the preceding case label"/>
+			<message kind="error" file="SwitchPatternError.java" text="This case label is dominated by one of the preceding case labels"/>
 		</compile>
 	</ajc-test>
 
@@ -57,7 +57,7 @@
 	<ajc-test dir="features199/java18" vm="18" title="switch pattern matching preview 2 error 1">
 		<compile files="SwitchPatternPreview2Error1.java" options="--enable-preview -18">
 			<!-- TODO: Add correct compiler error message, as soon as JDT Core supports it -->
-			<message kind="error" file="SwitchPatternPreview2Error1.java" text="This case label is dominated by one of the preceding case label"/>
+			<message kind="error" file="SwitchPatternPreview2Error1.java" text="This case label is dominated by one of the preceding case labels"/>
 		</compile>
 	</ajc-test>
 
@@ -65,7 +65,7 @@
 	<ajc-test dir="features199/java18" vm="18" title="switch pattern matching preview 2 error 2">
 		<compile files="SwitchPatternPreview2Error2.java" options="--enable-preview -18">
 			<!-- TODO: Add correct compiler error message, as soon as JDT Core supports it -->
-			<message kind="error" file="SwitchPatternPreview2Error2.java" text="This case label is dominated by one of the preceding case label"/>
+			<message kind="error" file="SwitchPatternPreview2Error2.java" text="This case label is dominated by one of the preceding case labels"/>
 		</compile>
 	</ajc-test>
 
-- 
2.39.5