Commits

Michael Heemskerk  committed 9fa8b6c

NONE: fixed test that was failing because Maven didn't like resource files in the src/test directory

  • Participants
  • Parent commits 8909478

Comments (0)

Files changed (5)

File processutils/.classpath

 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>

File processutils/src/test/java/com/atlassian/utils/process/CallEcho.java

      */
     public static void main(String[] args) throws IOException, InterruptedException {
         Properties testStrings = new Properties();
-        testStrings.load(CallEcho.class.getResourceAsStream("echostrings.properties"));
+        testStrings.load(CallEcho.class.getResourceAsStream("/echostrings.properties"));
         
         StringBuilder echoString = new StringBuilder();
         String separator = "";

File processutils/src/test/java/com/atlassian/utils/process/ExternalProcessTest.java

     }
     
     protected void assertNotEquals(String message, String value1, String value2) {
-        assertFalse(message, (value1 == null && value2 == null) || (value1 != null && value1.equals(value2)));
+        assertFalse(message + "; result was : " + value1, (value1 == null && value2 == null) || (value1 != null && value1.equals(value2)));
     }
     
     protected boolean isWindows() {

File processutils/src/test/java/com/atlassian/utils/process/echostrings.properties

-# see http://www.iana.org/assignments/character-sets for canonical charsets
-
-# collection of iso-8859-1 unicode chars, see http://en.wikipedia.org/wiki/ISO/IEC_8859-1: �����������������������
-iso-8859-1=\u00C0\u00C1\u00C2\u00C3\u00C4\u00C5\u00C6\u00C7\u00C8\u00C9\u00CA\u00CB\u00CC\u00CD\u00CE\u00CF\u00E0\u00E1\u00E2\u00E3\u00E4\u00E5\u00E6
-
-# latin-extended-A
-latin-ext-A=\u0153\u0144\u0133
-latin-ext-B=\u0190\u0191\u0192\u0195
-
-#windows cp 437  (OEM-US) 129 130 131 which map to different unicode code points than UTF-8 or ISO-8859-1 
-win-437=\u00fc\u00f9\u00E2
-
-# collection of windows code page 1252 characters that have no corresponding counterpart in iso-8859-1
-win-1252-not-in-iso-8859-1=\u20AC\u201A\u0192\u0161\u0153\u0178
-
-unicode-chinese=\u4ea0\u4ea1\u4ea2\u4ea3\u4ea4\u4ea5\u4ea6\u5100\u5101\u5102\u5103

File processutils/src/test/resources/echostrings.properties

+# see http://www.iana.org/assignments/character-sets for canonical charsets
+
+# collection of iso-8859-1 unicode chars, see http://en.wikipedia.org/wiki/ISO/IEC_8859-1: �����������������������
+iso-8859-1=\u00C0\u00C1\u00C2\u00C3\u00C4\u00C5\u00C6\u00C7\u00C8\u00C9\u00CA\u00CB\u00CC\u00CD\u00CE\u00CF\u00E0\u00E1\u00E2\u00E3\u00E4\u00E5\u00E6
+
+# latin-extended-A
+latin-ext-A=\u0153\u0144\u0133
+latin-ext-B=\u0190\u0191\u0192\u0195
+
+#windows cp 437  (OEM-US) 129 130 131 which map to different unicode code points than UTF-8 or ISO-8859-1 
+win-437=\u00fc\u00f9\u00E2
+
+# collection of windows code page 1252 characters that have no corresponding counterpart in iso-8859-1
+win-1252-not-in-iso-8859-1=\u20AC\u201A\u0192\u0161\u0153\u0178
+
+unicode-chinese=\u4ea0\u4ea1\u4ea2\u4ea3\u4ea4\u4ea5\u4ea6\u5100\u5101\u5102\u5103