You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2010/02/24 06:41:49 UTC
svn commit: r915682 - in /ofbiz/trunk/framework/base: build.xml
src/org/ofbiz/base/test/BaseUnitTests.java
src/org/ofbiz/base/util/test/ComparableRangeTests.java testdef/basetests.xml
Author: doogie
Date: Wed Feb 24 05:41:49 2010
New Revision: 915682
URL: http://svn.apache.org/viewvc?rev=915682&view=rev
Log:
Move ComparableRange tests to a separate class.
Added:
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/ComparableRangeTests.java
Modified:
ofbiz/trunk/framework/base/build.xml
ofbiz/trunk/framework/base/src/org/ofbiz/base/test/BaseUnitTests.java
ofbiz/trunk/framework/base/testdef/basetests.xml
Modified: ofbiz/trunk/framework/base/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/build.xml?rev=915682&r1=915681&r2=915682&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/build.xml (original)
+++ ofbiz/trunk/framework/base/build.xml Wed Feb 24 05:41:49 2010
@@ -38,6 +38,7 @@
</path>
<filelist id="test.classes" dir="${src.dir}">
+ <file name="org/ofbiz/base/util/test/ComparableRangeTests.java"/>
<file name="org/ofbiz/base/util/test/IndentingWriterTests.java"/>
<file name="org/ofbiz/base/util/test/UtilObjectTests.java"/>
<file name="org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java"/>
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/test/BaseUnitTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/test/BaseUnitTests.java?rev=915682&r1=915681&r2=915682&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/test/BaseUnitTests.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/test/BaseUnitTests.java Wed Feb 24 05:41:49 2010
@@ -20,7 +20,6 @@
import junit.framework.TestCase;
-import org.ofbiz.base.util.ComparableRange;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.StringUtil;
import org.ofbiz.base.util.UtilFormatOut;
@@ -73,36 +72,6 @@
assertTrue(UtilValidate.isFloat("10.000", true, true, 3, 3));
}
- public void testComparableRange() {
- ComparableRange<Integer> pointTest = new ComparableRange<Integer>(1, 1);
- assertTrue("isPoint", pointTest.isPoint());
- assertTrue("equality", pointTest.equals(new ComparableRange<Integer>(1, 1)));
- ComparableRange<Integer> range1 = new ComparableRange<Integer>(3, 1);
- ComparableRange<Integer> range2 = new ComparableRange<Integer>(4, 6);
- assertTrue("after range", range2.after(range1));
- assertTrue("before range", range1.before(range2));
- assertFalse("excludes value", range1.includes(0));
- assertTrue("includes value", range1.includes(1));
- assertTrue("includes value", range1.includes(2));
- assertTrue("includes value", range1.includes(3));
- assertFalse("excludes value", range1.includes(4));
- assertTrue("includes range", range1.includes(pointTest));
- assertFalse("excludes range", range1.includes(range2));
- ComparableRange<Integer> overlapTest = new ComparableRange<Integer>(2, 5);
- assertTrue("overlaps range", range1.overlaps(overlapTest));
- assertTrue("overlaps range", range2.overlaps(overlapTest));
- assertFalse("does not overlap range", range1.overlaps(range2));
- IllegalArgumentException caught = null;
- try {
- @SuppressWarnings("unused")
- ComparableRange<java.util.Date> range3 = new ComparableRange<java.util.Date>(new java.util.Date(), new java.sql.Timestamp(System.currentTimeMillis()));
- } catch (IllegalArgumentException e) {
- caught = e;
- } finally {
- assertNotNull("expected exception", caught);
- }
- }
-
public void testStringUtil() {
byte[] testArray = {-1};
byte[] result = StringUtil.fromHexString(StringUtil.toHexString(testArray));
Added: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/ComparableRangeTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/ComparableRangeTests.java?rev=915682&view=auto
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/ComparableRangeTests.java (added)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/ComparableRangeTests.java Wed Feb 24 05:41:49 2010
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * 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.ofbiz.base.util.test;
+
+import junit.framework.TestCase;
+
+import org.ofbiz.base.util.ComparableRange;
+
+public class ComparableRangeTests extends TestCase {
+
+ public ComparableRangeTests(String name) {
+ super(name);
+ }
+
+ public void testComparableRange() {
+ ComparableRange<Integer> pointTest = new ComparableRange<Integer>(1, 1);
+ assertTrue("isPoint", pointTest.isPoint());
+ assertTrue("equality", pointTest.equals(new ComparableRange<Integer>(1, 1)));
+ ComparableRange<Integer> range1 = new ComparableRange<Integer>(3, 1);
+ ComparableRange<Integer> range2 = new ComparableRange<Integer>(4, 6);
+ assertTrue("after range", range2.after(range1));
+ assertTrue("before range", range1.before(range2));
+ assertFalse("excludes value", range1.includes(0));
+ assertTrue("includes value", range1.includes(1));
+ assertTrue("includes value", range1.includes(2));
+ assertTrue("includes value", range1.includes(3));
+ assertFalse("excludes value", range1.includes(4));
+ assertTrue("includes range", range1.includes(pointTest));
+ assertFalse("excludes range", range1.includes(range2));
+ ComparableRange<Integer> overlapTest = new ComparableRange<Integer>(2, 5);
+ assertTrue("overlaps range", range1.overlaps(overlapTest));
+ assertTrue("overlaps range", range2.overlaps(overlapTest));
+ assertFalse("does not overlap range", range1.overlaps(range2));
+ IllegalArgumentException caught = null;
+ try {
+ @SuppressWarnings("unused")
+ ComparableRange<java.util.Date> range3 = new ComparableRange<java.util.Date>(new java.util.Date(), new java.sql.Timestamp(System.currentTimeMillis()));
+ } catch (IllegalArgumentException e) {
+ caught = e;
+ } finally {
+ assertNotNull("expected exception", caught);
+ }
+ }
+}
Modified: ofbiz/trunk/framework/base/testdef/basetests.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/testdef/basetests.xml?rev=915682&r1=915681&r2=915682&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/testdef/basetests.xml (original)
+++ ofbiz/trunk/framework/base/testdef/basetests.xml Wed Feb 24 05:41:49 2010
@@ -21,6 +21,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
<test-case case-name="basetests">
+ <junit-test-suite class-name="org.ofbiz.base.util.test.ComparableRangeTests"/>
<junit-test-suite class-name="org.ofbiz.base.util.test.IndentingWriterTests"/>
<junit-test-suite class-name="org.ofbiz.base.util.test.UtilObjectTests"/>
<junit-test-suite class-name="org.ofbiz.base.util.string.test.FlexibleStringExpanderTests"/>