* Re: testlet conflict (under Windows)
2005-09-14 19:11 ` David Gilbert
@ 2005-09-14 20:18 ` David Gilbert
0 siblings, 0 replies; 4+ messages in thread
From: David Gilbert @ 2005-09-14 20:18 UTC (permalink / raw)
To: David Gilbert; +Cc: fduminy, mauve-discuss
[-- Attachment #1: Type: text/plain, Size: 882 bytes --]
David Gilbert wrote:
> Fabien DUMINY wrote:
>
>> Hi all,
>> gnu.testlet.java.text.DecimalFormat.toPattern.java is conflicting
>> with gnu.testlet.java.text.DecimalFormat.topattern.java are
>> conflicting under Windows
>> They seems to test the same thing : the DecimalFormat.toPattern method.
>>
>> Could the writer(s) of this 2 tests merge the 2 testlets ? Thanks.
>>
>> Fabien
>>
> Hi Fabien,
>
> I wrote the toPattern variant - I'll take a look at merging the two.
>
> Regards,
>
> Dave Gilbert
I committed this patch:
2005-09-14 David Gilbert <david.gilbert@object-refinery.com>
* gnu/testlet/java/text/DecimalFormat/toPattern.java
(test): now calls test1() and test2(),
(test1): new method, copied code from topattern.java,
(test2): new method, code from original test() method,
* gnu/testlet/java/text/DecimalFormat/topattern.java.
Regards,
Dave
[-- Attachment #2: diff.txt --]
[-- Type: text/plain, Size: 6462 bytes --]
Index: gnu/testlet/java/text/DecimalFormat/toPattern.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/text/DecimalFormat/toPattern.java,v
retrieving revision 1.1
diff -u -r1.1 toPattern.java
--- gnu/testlet/java/text/DecimalFormat/toPattern.java 13 Mar 2005 20:42:07 -0000 1.1
+++ gnu/testlet/java/text/DecimalFormat/toPattern.java 14 Sep 2005 20:10:56 -0000
@@ -1,5 +1,7 @@
// Tags: JDK1.2
+// Copyright (c) 1999 Cygnus Solutions
+// Written by Tom Tromey <tromey@cygnus.com>
// Copyright (C) 2005 David Gilbert <david.gilbert@object-refinery.com>
// This file is part of Mauve.
@@ -17,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with Mauve; see the file COPYING. If not, write to
// the Free Software Foundation, 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA. */
+// Boston, MA 02111-1307, USA.
package gnu.testlet.java.text.DecimalFormat;
@@ -25,6 +27,8 @@
import gnu.testlet.Testlet;
import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
/**
* Some checks for the toPattern() method in the {@link DecimalFormat} class.
@@ -39,6 +43,68 @@
*/
public void test(TestHarness harness)
{
+ // we have two test methods now, following the merge of
+ // topattern.java into this file
+ test1(harness);
+ test2(harness);
+ }
+
+ /**
+ * This test was formerly in the file topattern.java.
+ *
+ * @param harness the test harness.
+ */
+ public void test1(TestHarness harness)
+ {
+ // Just to be explicit: we're only testing the US locale here.
+ Locale loc = Locale.US;
+ Locale.setDefault (loc);
+
+ // There aren't really many tests we can do, since it doesn't
+ // seem like any canonical output format is documented.
+
+ DecimalFormat df = new DecimalFormat ("0.##");
+ harness.check (df.toPattern (), "0.##");
+ harness.check (df.toLocalizedPattern (), "0.##");
+
+ DecimalFormatSymbols dfs = df.getDecimalFormatSymbols ();
+ dfs.setDecimalSeparator (',');
+ dfs.setZeroDigit ('1');
+ dfs.setDigit ('X');
+ dfs.setGroupingSeparator ('!');
+ df.setDecimalFormatSymbols(dfs); // dfs is only a copy of the internal
+ // symbols so pass symbols back to df
+ harness.check (df.toLocalizedPattern (), "1,XX");
+
+ df.applyPattern ("Fr #,##0.##");
+ String x1 = df.toPattern ();
+ String x2 = df.toLocalizedPattern ();
+ harness.check (x1.length (), x2.length ());
+ boolean ok = x1.length () == x2.length ();
+ for (int i = 0; i < x1.length (); ++i)
+ {
+ char c = x1.charAt(i);
+ if (c == '0')
+ c = '1';
+ else if (c == '#')
+ c = 'X';
+ else if (c == '.')
+ c = ',';
+ else if (c == ',')
+ c = '!';
+ if (c != x2.charAt (i))
+ {
+ ok = false;
+ harness.debug ("failure at char " + i);
+ harness.debug ("x1 = " + x1 + "\nx2 = " + x2);
+ break;
+ }
+ }
+ harness.check (ok);
+ }
+
+ public void test2(TestHarness harness)
+ {
DecimalFormat f1 = new DecimalFormat("#0.00;(#0.00)");
harness.check(f1.toPattern(), "#0.00;(#0.00)");
}
Index: gnu/testlet/java/text/DecimalFormat/topattern.java
===================================================================
RCS file: gnu/testlet/java/text/DecimalFormat/topattern.java
diff -N gnu/testlet/java/text/DecimalFormat/topattern.java
--- gnu/testlet/java/text/DecimalFormat/topattern.java 13 Mar 2005 20:42:07 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,84 +0,0 @@
-// Test DecimalFormat.toPattern.
-
-// Copyright (c) 1999 Cygnus Solutions
-// Written by Tom Tromey <tromey@cygnus.com>
-
-// This file is part of Mauve.
-
-// Mauve is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// Mauve is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Mauve; see the file COPYING. If not, write to
-// the Free Software Foundation, 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-// Tags: JDK1.1
-
-package gnu.testlet.java.text.DecimalFormat;
-
-import gnu.testlet.Testlet;
-import gnu.testlet.TestHarness;
-
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.util.Locale;
-
-public class topattern implements Testlet
-{
- public void test (TestHarness harness)
- {
- // Just to be explicit: we're only testing the US locale here.
- Locale loc = Locale.US;
- Locale.setDefault (loc);
-
- // There aren't really many tests we can do, since it doesn't
- // seem like any canonical output format is documented.
-
- DecimalFormat df = new DecimalFormat ("0.##");
- harness.check (df.toPattern (), "0.##");
- harness.check (df.toLocalizedPattern (), "0.##");
-
- DecimalFormatSymbols dfs = df.getDecimalFormatSymbols ();
- dfs.setDecimalSeparator (',');
- dfs.setZeroDigit ('1');
- dfs.setDigit ('X');
- dfs.setGroupingSeparator ('!');
- df.setDecimalFormatSymbols(dfs); // dfs is only a copy of the internal
- // symbols so pass symbols back to df
- harness.check (df.toLocalizedPattern (), "1,XX");
-
- df.applyPattern ("Fr #,##0.##");
- String x1 = df.toPattern ();
- String x2 = df.toLocalizedPattern ();
- harness.check (x1.length (), x2.length ());
- boolean ok = x1.length () == x2.length ();
- for (int i = 0; i < x1.length (); ++i)
- {
- char c = x1.charAt(i);
- if (c == '0')
- c = '1';
- else if (c == '#')
- c = 'X';
- else if (c == '.')
- c = ',';
- else if (c == ',')
- c = '!';
- if (c != x2.charAt (i))
- {
- ok = false;
- harness.debug ("failure at char " + i);
- harness.debug ("x1 = " + x1 + "\nx2 = " + x2);
- break;
- }
- }
- harness.check (ok);
- }
-}
^ permalink raw reply [flat|nested] 4+ messages in thread