jvanzyl     02/03/14 11:01:43

  Modified:    src/test/java/org/apache/fulcrum/localization
                        LocaleTokenizerTest.java
  Log:
  Converted into a Junit test.
  
  Revision  Changes    Path
  1.2       +33 -21    
jakarta-turbine-fulcrum/src/test/java/org/apache/fulcrum/localization/LocaleTokenizerTest.java
  
  Index: LocaleTokenizerTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-fulcrum/src/test/java/org/apache/fulcrum/localization/LocaleTokenizerTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LocaleTokenizerTest.java  26 Sep 2001 00:54:14 -0000      1.1
  +++ LocaleTokenizerTest.java  14 Mar 2002 19:01:43 -0000      1.2
  @@ -56,39 +56,51 @@
   
   import java.util.Locale;
   
  +import junit.framework.Test;
  +import junit.framework.TestCase;
  +import junit.framework.TestSuite;
  +
   /**
  - * TODO: Turn into a JUnit test
  + * Test case for the locale tokenizer.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
  - * @version $Id: LocaleTokenizerTest.java,v 1.1 2001/09/26 00:54:14 dlr Exp $
  + * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
  + * @version $Id: LocaleTokenizerTest.java,v 1.2 2002/03/14 19:01:43 jvanzyl Exp $
    */
   public class LocaleTokenizerTest
  +    extends TestCase
   {
       private static final String HEADER = "en, es;q=0.8, zh-TW;q=0.1";
   
  -    public static void main(String[] argv)
  -        throws Exception
  +    public LocaleTokenizerTest(String name)
  +    {
  +        super(name);
  +    }        
  +    
  +    public static Test suite()
       {
  -        LocaleTokenizer tok = new LocaleTokenizer(HEADER);
  -        Locale locale = (Locale) tok.next();
  -        assertEquals("Either wrong language or order parsing: " + locale,
  -                     locale.getLanguage(), "en");
  -        locale = (Locale) tok.next();
  -        assertEquals("Either wrong language or order parsing: " + locale,
  -                     locale.getLanguage(), "es");
  -        locale = (Locale) tok.next();
  -        assertEquals("Either wrong country or order parsing: " + locale,
  -                     locale.getCountry(), "TW");
  -        System.out.println(locale.getClass().getName() + " test passed");
  +        return new TestSuite(LocaleTokenizerTest.class);
       }
  -
  -    private static void assertEquals(String msg, String value, String expected)
  -        throws Exception
  +                    
  +    public void testLocaleTokenizer()
       {
  -        if (!expected.equals(value))
  +        try
  +        {
  +            LocaleTokenizer tok = new LocaleTokenizer(HEADER);
  +            Locale locale = (Locale) tok.next();
  +            assertEquals("Either wrong language or order parsing: " + locale,
  +                         locale.getLanguage(), "en");
  +            locale = (Locale) tok.next();
  +            assertEquals("Either wrong language or order parsing: " + locale,
  +                         locale.getLanguage(), "es");
  +            locale = (Locale) tok.next();
  +            assertEquals("Either wrong country or order parsing: " + locale,
  +                         locale.getCountry(), "TW");
  +        }
  +        catch (Exception e)
           {
  -            throw new Exception("Assertion failure [" + value + " != " +
  -                                expected + "]: " + msg);
  +            e.printStackTrace();
  +            fail();
           }
       }
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to