tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject svn commit: r1441837 - /tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtilTest.java
Date Sat, 02 Feb 2013 23:38:56 GMT
Author: jboynes
Date: Sat Feb  2 23:38:56 2013
New Revision: 1441837

URL: http://svn.apache.org/viewvc?rev=1441837&view=rev
Log:
add tests for SetLocaleSupport parseLocale function prior to refactor

Added:
    tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtilTest.java
  (with props)

Added: tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtilTest.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtilTest.java?rev=1441837&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtilTest.java
(added)
+++ tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtilTest.java
Sat Feb  2 23:38:56 2013
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.taglibs.standard.tag.common.fmt;
+
+import junit.framework.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.util.Locale;
+
+public class LocaleUtilTest {
+
+    private static final Locale DEFAULT = Locale.getDefault();
+
+    @Test
+    @Ignore("original causes NPE")
+    public void testUsesDefaultIfNull() {
+        Assert.assertEquals(DEFAULT, SetLocaleSupport.parseLocale(null, null));
+    }
+
+    @Test
+    @Ignore("original results in IllegalArgumentException")
+    public void testUsesDefaultIfEmpty() {
+        Assert.assertEquals(DEFAULT, SetLocaleSupport.parseLocale("", null));
+    }
+
+    @Test
+    public void testLocaleWithLanguage() {
+        Assert.assertEquals(new Locale("fr"), SetLocaleSupport.parseLocale("fr", null));
+    }
+
+    @Test
+    public void testLocaleUsingHyphen() {
+        Assert.assertEquals(new Locale("en", "DE"), SetLocaleSupport.parseLocale("en-DE",
null));
+    }
+
+    @Test
+    public void testLocaleUsingUnderscore() {
+        Assert.assertEquals(new Locale("en", "IE"), SetLocaleSupport.parseLocale("en_IE",
null));
+    }
+
+    @Test
+    public void testLocaleWithLanguageVariant() {
+        Assert.assertEquals(new Locale("fr", "", "xxx"), SetLocaleSupport.parseLocale("fr",
"xxx"));
+    }
+
+    @Test
+    public void testLocaleWithLanguageCountryVariant() {
+        Assert.assertEquals(new Locale("en", "GB", "cockney"), SetLocaleSupport.parseLocale("en-GB",
"cockney"));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testEmptyLanguageIsInvalid() {
+        SetLocaleSupport.parseLocale("-GB", null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testEmptyCountryIsInvalid() {
+        SetLocaleSupport.parseLocale("en-", null);
+    }
+}

Propchange: tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/fmt/LocaleUtilTest.java
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message