You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by se...@apache.org on 2006/06/23 05:27:27 UTC
svn commit: r416550 - in
/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src:
java/org/apache/turbine/util/BrowserDetector.java
test/org/apache/turbine/util/BrowserDetectorTest.java
Author: seade
Date: Thu Jun 22 20:27:26 2006
New Revision: 416550
URL: http://svn.apache.org/viewvc?rev=416550&view=rev
Log:
Sync 2_3 and trunk.
Added:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/util/BrowserDetectorTest.java
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/BrowserDetector.java
Modified: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/BrowserDetector.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/BrowserDetector.java?rev=416550&r1=416549&r2=416550&view=diff
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/BrowserDetector.java (original)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/BrowserDetector.java Thu Jun 22 20:27:26 2006
@@ -1,7 +1,7 @@
package org.apache.turbine.util;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -233,9 +233,14 @@
if (userAgentString.indexOf(OPERA) != -1)
{
//Ex: Mozilla/4.0 (Windows NT 4.0;US) Opera 3.61 [en]
+ // Ex: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; en) Opera 8.02
versionStartIndex = (userAgentString.indexOf(OPERA)
+ OPERA.length() + 1);
versionEndIndex = userAgentString.indexOf(" ", versionStartIndex);
+ if (versionEndIndex == -1)
+ {
+ versionEndIndex = userAgentString.length();
+ }
browserName = OPERA;
try
@@ -358,7 +363,7 @@
* @param s A String.
* @return The String converted to float.
*/
- private static float toFloat(String s)
+ private static final float toFloat(String s)
{
return Float.valueOf(s).floatValue();
}
Added: jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/util/BrowserDetectorTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/util/BrowserDetectorTest.java?rev=416550&view=auto
==============================================================================
--- jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/util/BrowserDetectorTest.java (added)
+++ jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/test/org/apache/turbine/util/BrowserDetectorTest.java Thu Jun 22 20:27:26 2006
@@ -0,0 +1,73 @@
+package org.apache.turbine.util;
+
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
+import org.apache.turbine.test.BaseTestCase;
+
+/**
+ * Testing of the BrowserDetector class.
+ *
+ * @author <a href="mailto:seade@backstagetech.com.au">Scott Eade</a>
+ * @version $Id$
+ */
+public class BrowserDetectorTest extends BaseTestCase
+{
+ public BrowserDetectorTest(String name) throws Exception
+ {
+ super(name);
+ }
+
+ public void testFirefox()
+ {
+ String userAgent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8) Gecko/20051111 Firefox/1.5";
+ BrowserDetector bd = new BrowserDetector(userAgent);
+ assertEquals(BrowserDetector.MOZILLA, bd.getBrowserName());
+ // Should this really be 5?
+ assertEquals(5f, bd.getBrowserVersion(), 0.0f);
+ assertEquals(BrowserDetector.WINDOWS, bd.getBrowserPlatform());
+ }
+
+ public void testOpera()
+ {
+ String userAgent = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; en) Opera 8.02";
+ BrowserDetector bd = new BrowserDetector(userAgent);
+ assertEquals(BrowserDetector.OPERA, bd.getBrowserName());
+ assertEquals(8.02f, bd.getBrowserVersion(), 0.0f);
+ assertEquals(BrowserDetector.WINDOWS, bd.getBrowserPlatform());
+
+ userAgent = "Opera/7.51 (Windows NT 5.1; U) [en]";
+ bd = new BrowserDetector(userAgent);
+ assertEquals(BrowserDetector.OPERA, bd.getBrowserName());
+ assertEquals(7.51f, bd.getBrowserVersion(), 0.0f);
+ assertEquals(BrowserDetector.WINDOWS, bd.getBrowserPlatform());
+ }
+
+ public void testIE()
+ {
+ String userAgent = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)";
+ BrowserDetector bd = new BrowserDetector(userAgent);
+ assertEquals(BrowserDetector.MSIE, bd.getBrowserName());
+ assertEquals(6.0f, bd.getBrowserVersion(), 0.0f);
+ assertEquals(BrowserDetector.WINDOWS, bd.getBrowserPlatform());
+
+ userAgent = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322)";
+ bd = new BrowserDetector(userAgent);
+ assertEquals(BrowserDetector.MSIE, bd.getBrowserName());
+ assertEquals(6.0f, bd.getBrowserVersion(), 0.0f);
+ assertEquals(BrowserDetector.WINDOWS, bd.getBrowserPlatform());
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org