svn commit: r1635991 - in /oodt/trunk: CHANGES.txt pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java

[ma...@apache.org]

Author: mattmann
Date: Sat Nov  1 16:57:19 2014
New Revision: 1635991

URL: http://svn.apache.org/r1635991
Log:
Fix for OODT-776: Test fix: log messages can be different for different locales this closes #5.

Modified:
    oodt/trunk/CHANGES.txt
    oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
    oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java

Modified: oodt/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1635991&r1=1635990&r2=1635991&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Sat Nov  1 16:57:19 2014
@@ -3,6 +3,8 @@ Apache OODT Change Log
 
 Release 0.8 - Current Development
 
+* OODT-776 Test fix: log messages can be different for different locales (Tom Tung via mattmann)
+
 * OODT-701 Adding in stream product structure for filemanager. Add in check for valid product structures, and fixed tests breaking from that check.
 
 * OODT-699 Adding in cluster managment scripts for mesos.

Modified: oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java?rev=1635991&r1=1635990&r2=1635991&view=diff
==============================================================================
--- oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java (original)
+++ oodt/trunk/pge/src/main/java/org/apache/oodt/cas/pge/PGETaskInstance.java Sat Nov  1 16:57:19 2014
@@ -170,6 +170,7 @@ public class PGETaskInstance implements 
             + "." + workflowInstId);
       FileHandler handler = new FileHandler(
             new File(logDir, createLogFileName()).getAbsolutePath());
+      handler.setEncoding("UTF-8");
       handler.setFormatter(new SimpleFormatter());
       logger.addHandler(handler);
       return logger;

Modified: oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java
URL: http://svn.apache.org/viewvc/oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java?rev=1635991&r1=1635990&r2=1635991&view=diff
==============================================================================
--- oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java (original)
+++ oodt/trunk/pge/src/test/java/org/apache/oodt/cas/pge/TestPGETaskInstance.java Sat Nov  1 16:57:19 2014
@@ -202,9 +202,9 @@ public class TestPGETaskInstance extends
                return pathname.getName().endsWith(".log");
             }
          })[0], "UTF-8");
-      assertEquals("INFO: pge1 message1", messages.get(1));
-      assertEquals("INFO: pge1 message2", messages.get(3));
-      assertEquals("INFO: pge1 message3", messages.get(5));
+      assertEquals(Level.INFO.getLocalizedName() + ": pge1 message1", messages.get(1));
+      assertEquals(Level.INFO.getLocalizedName() + ": pge1 message2", messages.get(3));
+      assertEquals(Level.INFO.getLocalizedName() + ": pge1 message3", messages.get(5));
       logDir = new File(pgeTask2.pgeConfig.getExeDir() + "/logs");
       assertTrue(logDir.exists());
       messages = FileUtils.readLines(logDir.listFiles(
@@ -214,7 +214,7 @@ public class TestPGETaskInstance extends
                return pathname.getName().endsWith(".log");
             }
          })[0], "UTF-8");
-      assertEquals("SEVERE: pge2 message1", messages.get(1));
+      assertEquals(Level.SEVERE.getLocalizedName() + ": pge2 message1", messages.get(1));
    }
 
    public void testUpdateStatus() throws Exception {