From c6bfb2599758611f2afd6b44804d8b269f0fb361 Mon Sep 17 00:00:00 2001
From: Stephen Colebourne <scolebourne@apache.org>
Date: Thu, 31 Jul 2003 22:31:12 +0000
Subject: [PATCH] Extra tests suggested by Clover

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/lang/trunk@137540 13f79535-47bb-0310-9956-ffa450edef68
---
 src/test/org/apache/commons/lang/ArrayUtilsTest.java   | 5 +++--
 src/test/org/apache/commons/lang/CharSetUtilsTest.java | 4 +++-
 src/test/org/apache/commons/lang/SystemUtilsTest.java  | 7 ++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/test/org/apache/commons/lang/ArrayUtilsTest.java b/src/test/org/apache/commons/lang/ArrayUtilsTest.java
index 7fea3f95c..19ba41fbe 100644
--- a/src/test/org/apache/commons/lang/ArrayUtilsTest.java
+++ b/src/test/org/apache/commons/lang/ArrayUtilsTest.java
@@ -70,7 +70,7 @@
  * @author Moritz Petersen
  * @author Nikolay Metchev
  * @author Matthew Hawthorne
- * @version $Id: ArrayUtilsTest.java,v 1.10 2003/07/30 22:21:39 scolebourne Exp $
+ * @version $Id: ArrayUtilsTest.java,v 1.11 2003/07/31 22:31:12 scolebourne Exp $
  */
 public class ArrayUtilsTest extends TestCase {
 
@@ -684,7 +684,8 @@ public void testIndexOfWithStartIndex() {
         assertEquals(-1, ArrayUtils.indexOf(array, "notInArray", 2));
         
         assertEquals(4, ArrayUtils.indexOf(array, null, -1));
-        assertEquals(-1, ArrayUtils.indexOf(array, "0", 6));
+        assertEquals(-1, ArrayUtils.indexOf(array, null, 8));
+        assertEquals(-1, ArrayUtils.indexOf(array, "0", 8));
     }
 
     public void testLastIndexOf() {
diff --git a/src/test/org/apache/commons/lang/CharSetUtilsTest.java b/src/test/org/apache/commons/lang/CharSetUtilsTest.java
index c7d5de5ad..439ce8b26 100644
--- a/src/test/org/apache/commons/lang/CharSetUtilsTest.java
+++ b/src/test/org/apache/commons/lang/CharSetUtilsTest.java
@@ -67,7 +67,7 @@
  * @author <a href="mailto:bayard@generationjava.com">Henri Yandell</a>
  * @author <a href="mailto:ridesmet@users.sourceforge.net">Ringo De Smet</a>
  * @author Stephen Colebourne
- * @version $Id: CharSetUtilsTest.java,v 1.11 2003/07/31 21:32:47 scolebourne Exp $
+ * @version $Id: CharSetUtilsTest.java,v 1.12 2003/07/31 22:31:12 scolebourne Exp $
  */
 public class CharSetUtilsTest extends TestCase {
     
@@ -130,6 +130,8 @@ public void testSqueeze_StringString() {
         assertEquals("hello", CharSetUtils.squeeze("hello", ""));
         assertEquals("hello", CharSetUtils.squeeze("hello", "a-e"));
         assertEquals("helo", CharSetUtils.squeeze("hello", "l-p"));
+        assertEquals("heloo", CharSetUtils.squeeze("helloo", "l"));
+        assertEquals("hello", CharSetUtils.squeeze("helloo", "^l"));
     }
     
     public void testSqueeze_StringStringarray() {
diff --git a/src/test/org/apache/commons/lang/SystemUtilsTest.java b/src/test/org/apache/commons/lang/SystemUtilsTest.java
index 1bdb7978b..5c045baec 100644
--- a/src/test/org/apache/commons/lang/SystemUtilsTest.java
+++ b/src/test/org/apache/commons/lang/SystemUtilsTest.java
@@ -68,7 +68,7 @@
  *
  * @author Stephen Colebourne
  * @author Tetsuya Kaneuchi
- * @version $Id: SystemUtilsTest.java,v 1.4 2003/07/30 22:21:39 scolebourne Exp $
+ * @version $Id: SystemUtilsTest.java,v 1.5 2003/07/31 22:31:12 scolebourne Exp $
  */
 public class SystemUtilsTest extends TestCase {
 
@@ -204,6 +204,11 @@ private boolean getOSMatches(String osNamePrefix, String osVersionPrefix) {
         return OS_NAME.startsWith(osNamePrefix) && OS_VERSION.startsWith(osVersionPrefix);
     }    
 
+    //-----------------------------------------------------------------------
+    public void testJavaVersion() {
+        assertEquals(SystemUtils.JAVA_VERSION_FLOAT, SystemUtils.getJavaVersion(), 0f);
+    }
+    
     //-----------------------------------------------------------------------
     public void testJavaVersionMatches() {
         JAVA_VERSION = null;