sebb 2005/06/11 05:28:00
Modified: src/core/org/apache/jmeter/testbeans/gui PackageTest.java
Log:
Use Locales, not languages. Add zh_TW, disable no and de (not present yet)
Revision Changes Path
1.11 +24 -16
jakarta-jmeter/src/core/org/apache/jmeter/testbeans/gui/PackageTest.java
Index: PackageTest.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testbeans/gui/PackageTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PackageTest.java 11 Jun 2005 11:18:42 -0000 1.10
+++ PackageTest.java 11 Jun 2005 12:28:00 -0000 1.11
@@ -54,14 +54,27 @@
private Class testBeanClass;
- private String language;
+ //ResourceBundle i18nEdit=
ResourceBundle.getBundle("org.apache.jmeter.resources.i18nedit");
+ private static final Locale defaultLocale= new Locale("en");
//i18nEdit.getString("locale.default");
+ // TODO: find a clean way to get these from i18nedit.properties
+
+ private static final Locale[] locales = new Locale[] {
+ //new Locale("de"), // No resources yet
+ new Locale("ja"),
+ //new Locale("no"), // No resources yet
+ //new Locale("fr"), // No resources yet
+ //new Locale("zh","CN"), //No resources yet
+ new Locale("zh","TW")
+ };
+ private Locale testLocale;
+
private PackageTest(
- Class testBeanClass, String language, ResourceBundle
defaultBundle)
+ Class testBeanClass, Locale locale, ResourceBundle
defaultBundle)
{
- super(testBeanClass.getName()+" - "+language);
+ super(testBeanClass.getName()+" - "+locale.getLanguage()+" -
"+locale.getCountry());
this.testBeanClass= testBeanClass;
- this.language= language;
+ this.testLocale = locale;
this.defaultBundle= defaultBundle;
}
@@ -70,7 +83,7 @@
public void setUp()
{
- JMeterUtils.setLocale(new Locale(language,""));
+ JMeterUtils.setLocale(testLocale);
Introspector.flushFromCaches(testBeanClass);
try
{
@@ -151,11 +164,6 @@
{
TestSuite suite = new TestSuite("Bean Resource Test Suite");
- //ResourceBundle i18nEdit=
ResourceBundle.getBundle("org.apache.jmeter.resources.i18nedit");
- String[] languages= new String[] { "de", "ja", "no" };
- String defaultLanguage= "en";
//i18nEdit.getString("locale.default");
- // TODO: find a clean way to get these from
i18nedit.properties
-
Iterator iter =
ClassFinder
.findClassesThatExtend(
@@ -167,7 +175,7 @@
{
String className = (String)iter.next();
Class testBeanClass= Class.forName(className);
- JMeterUtils.setLocale(new Locale(defaultLanguage,""));
+ JMeterUtils.setLocale(defaultLocale);
ResourceBundle defaultBundle;
try
{
@@ -193,11 +201,11 @@
throw new Error("No default bundle for class "
+ className);
}
- suite.addTest(new PackageTest(testBeanClass,
defaultLanguage, defaultBundle));
+ suite.addTest(new PackageTest(testBeanClass,
defaultLocale, defaultBundle));
- for (int i=0; i<languages.length; i++)
+ for (int i=0; i<locales.length; i++)
{
- suite.addTest(new PackageTest(testBeanClass,
languages[i], defaultBundle));
+ suite.addTest(new PackageTest(testBeanClass,
locales[i], defaultBundle));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
