From 56f01452414bca8e2c1bf1d15108d9f0b13bf4c7 Mon Sep 17 00:00:00 2001
From: Tyler Steele <tyler.steele@ibm.com>
Date: Fri, 18 Feb 2022 11:45:03 -0700
Subject: [PATCH] Changes FileEncodingTest to include hardcoded value for AIX

---
 test/jdk/java/lang/System/FileEncodingTest.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/jdk/java/lang/System/FileEncodingTest.java b/test/jdk/java/lang/System/FileEncodingTest.java
index 5e5d600bf2bd2..9f9aea57bd656 100644
--- a/test/jdk/java/lang/System/FileEncodingTest.java
+++ b/test/jdk/java/lang/System/FileEncodingTest.java
@@ -40,7 +40,7 @@
 import org.testng.annotations.Test;
 
 public class FileEncodingTest {
-    private static final boolean IS_WINDOWS = System.getProperty("os.name").startsWith("Windows");
+    private static final String OS_NAME = System.getProperty("os.name");
 
     @DataProvider
     public Object[][] fileEncodingToDefault() {
@@ -56,7 +56,7 @@ public Object[][] fileEncodingToDefault() {
     @Test(dataProvider = "fileEncodingToDefault")
     public void testFileEncodingToDefault(String fileEncoding, String expected) throws Exception {
         if (fileEncoding.equals("COMPAT")) {
-            if (IS_WINDOWS) {
+            if (OS_NAME.startsWith("Windows")) {
                 // Only tests on English locales
                 if (Locale.getDefault().getLanguage().equals("en")) {
                     expected = "windows-1252";
@@ -64,6 +64,8 @@ public void testFileEncodingToDefault(String fileEncoding, String expected) thro
                     System.out.println("Tests only run on Windows with English locales");
                     return;
                 }
+            } else if (OS_NAME.startsWith("AIX")) {
+                expected = "ISO-8859-1";
             } else {
                 expected = "US-ASCII";
             }