8294989: ResourceBundle naming convention issue in JdbcRowSetResourceBundle.java

test/jdk/javax/sql/testng/test/rowset/ValidateResourceBundleAccess.java

@@ -26,10 +26,9 @@
 import java.sql.SQLException;
 import javax.sql.rowset.RowSetProvider;
 import org.testng.annotations.Test;
-import util.BaseTest;
+import org.testng.annotations.BeforeClass;
 import static org.testng.Assert.*;
 
-
 /**
  * @test
  * @bug 8294989
@@ -43,11 +42,14 @@ public class ValidateResourceBundleAccess{
     // Expected JDBCResourceBundle message, crsreader.connecterr
     private static final String rsReaderError = "Internal Error in RowSetReader: no connection or command";
 
-    @Test
-    public void testResourceBundleAccess() throws SQLException {
-        // Checking against English messages, set to US Locale
+    // Checking against English messages, set to US Locale
+    @BeforeClass
+    public void setEnglishEnvironment() {
         Locale.setDefault(Locale.US);
+    }
 
+    @Test
+    public void testResourceBundleAccess() throws SQLException {
         var rsr = RowSetProvider.newFactory();
         var crs =rsr.createCachedRowSet();
         var jrs = rsr.createJdbcRowSet();
@@ -57,17 +59,17 @@ public void testResourceBundleAccess() throws SQLException {
         try {
             jrs.getMetaData();
             // Unexpected case where exception is not forced
-            var msg = "$$$ Error: SQLException was not caught!%n";
-            throw new RuntimeException(String.format(msg));
+            throw new RuntimeException(
+                    String.format("$$$ Error: SQLException was not caught!%n"));
         } catch (SQLException sqe) {
             assertTrue(sqe.getMessage().equals(invalidState));
         }
         // Now tests via CachedRowSet
         try {
             crs.execute();
             // Unexpected case where exception is not forced
-            var msg = "$$$ Error: SQLException was not caught!%n";
-            throw new RuntimeException(String.format(msg));
+            throw new RuntimeException(
+                    String.format("$$$ Error: SQLException was not caught!%n"));
         } catch (SQLException e) {
             assertTrue(e.getMessage().equals(rsReaderError));
         }