Author: sebb
Date: Wed Aug 10 18:32:29 2011
New Revision: 1156300
URL: http://svn.apache.org/viewvc?rev=1156300&view=rev
Log:
Check that properties files only use Ascii (not strictly necessary, but helps
prevent packaging problems)
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java?rev=1156300&r1=1156299&r2=1156300&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
Wed Aug 10 18:32:29 2011
@@ -22,6 +22,8 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -61,6 +63,13 @@ public class PackageTest extends TestCas
private static PropertyResourceBundle defaultPRB;
+ private static final CharsetEncoder ASCII_ENCODER =
+ Charset.forName("US-ASCII").newEncoder(); // Ensure properties files
don't use special characters
+
+ private static boolean isPureAscii(String v) {
+ return ASCII_ENCODER.canEncode(v);
+ }
+
// Read resource into ResourceBundle and store in List
private PropertyResourceBundle getRAS(String res) throws Exception {
InputStream ras = this.getClass().getResourceAsStream(res);
@@ -117,6 +126,10 @@ public class PackageTest extends TestCas
}
}
+ if (!isPureAscii(val)) {
+ fails++;
+ System.out.println("Incorrect char value in: "+s);
+ }
}
}
return fails;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
