Simplified checking of expected exception

microsoft · Jan 15, 2025 · 001bfd2 · 001bfd2
1 parent 85f525d
commit 001bfd2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java b/src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java
@@ -216,6 +216,5 @@ protected Object[][] getContents() {
             {"R_expectedClassDoesNotMatchActualClass",
                     "Expected column class {0} does not match actual column class {1} for column {2}."},
             {"R_loginFailedMI", "Login failed for user '<token-identified principal>'"},
-            {"R_MInotAvailable", "Managed Identity authentication is not available"},
-            {"R_featureNotSupported", "{0} is not supported."},};
+            {"R_MInotAvailable", "Managed Identity authentication is not available"},};
 }
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/unit/SavepointTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/unit/SavepointTest.java
@@ -23,6 +23,7 @@
 import com.microsoft.sqlserver.jdbc.RandomUtil;
 import com.microsoft.sqlserver.jdbc.SQLServerSavepoint;
 import com.microsoft.sqlserver.jdbc.TestResource;
+import com.microsoft.sqlserver.jdbc.TestUtils;
 import com.microsoft.sqlserver.testframework.AbstractTest;
 import com.microsoft.sqlserver.testframework.Constants;
 
@@ -151,11 +152,7 @@ public void testReleaseSavepoint() throws SQLException {
             } catch (SQLException e) {
                 assertEquals(e.getClass(), SQLFeatureNotSupportedException.class, "Expected exception type " + SQLFeatureNotSupportedException.class.getName() + ", but received " + e.getClass().getName());
 
-                MessageFormat form = new MessageFormat(TestResource.getResource("R_featureNotSupported"));
-                Object[] msgArgs = {"releaseSavepoint"};
-                String expectedExceptionMsg = form.format(msgArgs);
-                String receivedExceptionMsg = e.getMessage();
-                assertEquals(expectedExceptionMsg, receivedExceptionMsg, "Expected exception message " + expectedExceptionMsg + ", but received " + receivedExceptionMsg);;
+                assertTrue(e.getMessage().matches(TestUtils.formatErrorMsg("R_featureNotSupported")));
             }
         }
     }