Author: fschumacher
Date: Sat Mar 19 12:55:00 2016
New Revision: 1735767
URL: http://svn.apache.org/viewvc?rev=1735767&view=rev
Log:
Use Double#compare instead of reimplementing it in NumberProperty
Bugzilla Id: 59021
Added:
jmeter/trunk/test/src/org/apache/jmeter/testelement/TestNumberProperty.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NumberProperty.java
jmeter/trunk/xdocs/changes.xml
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NumberProperty.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NumberProperty.java?rev=1735767&r1=1735766&r2=1735767&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NumberProperty.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NumberProperty.java
Sat Mar 19 12:55:00 2016
@@ -67,14 +67,6 @@ public abstract class NumberProperty ext
*/
@Override
public int compareTo(JMeterProperty arg0) {
- double compareValue = getDoubleValue() - arg0.getDoubleValue();
-
- if (compareValue < 0) {
- return -1;
- } else if (compareValue == 0) {
- return 0;
- } else {
- return 1;
- }
+ return Double.compare(getDoubleValue(), arg0.getDoubleValue());
}
}
Added:
jmeter/trunk/test/src/org/apache/jmeter/testelement/TestNumberProperty.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/testelement/TestNumberProperty.java?rev=1735767&view=auto
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/testelement/TestNumberProperty.java
(added)
+++ jmeter/trunk/test/src/org/apache/jmeter/testelement/TestNumberProperty.java
Sat Mar 19 12:55:00 2016
@@ -0,0 +1,47 @@
+package org.apache.jmeter.testelement;
+
+import static org.junit.Assert.*;
+
+import org.apache.jmeter.testelement.property.DoubleProperty;
+import org.apache.jmeter.testelement.property.IntegerProperty;
+import org.apache.jmeter.testelement.property.NumberProperty;
+import org.junit.Test;
+
+public class TestNumberProperty {
+
+ @Test
+ public void testDZeroCompareToDZero() {
+ NumberProperty n1 = new DoubleProperty("n1", 0.0);
+ NumberProperty n2 = new DoubleProperty("n2", 0.0);
+ assertTrue(n1.compareTo(n2) == 0);
+ }
+
+ @Test
+ public void testIZeroCompareToDZero() {
+ NumberProperty n1 = new IntegerProperty("n1", 0);
+ NumberProperty n2 = new DoubleProperty("n2", 0.0);
+ assertTrue(n1.compareTo(n2) == 0);
+ }
+
+ @Test
+ public void testCompareToPositive() {
+ NumberProperty n1 = new DoubleProperty("n1", 1.0);
+ NumberProperty n2 = new DoubleProperty("n2", 0.0);
+ assertTrue(n1.compareTo(n2) > 0);
+ }
+
+ @Test
+ public void testCompareToNegative() {
+ NumberProperty n1 = new DoubleProperty("n1", -1.0);
+ NumberProperty n2 = new DoubleProperty("n2", 0.0);
+ assertTrue(n1.compareTo(n2) < 0);
+ }
+
+ @Test
+ public void testCompareToMinMax() {
+ NumberProperty n1 = new DoubleProperty("n1", Double.MIN_VALUE);
+ NumberProperty n2 = new DoubleProperty("n2", Double.MAX_VALUE);
+ assertTrue(n1.compareTo(n2) < 0);
+ }
+
+}
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1735767&r1=1735766&r2=1735767&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sat Mar 19 12:55:00 2016
@@ -309,6 +309,7 @@ Summary
<li><bug>59003</bug>ClutilTestCase testSingleArg8 and testSingleArg9 are
identical</li>
<li><bug>59064</bug>Remove OldSaveService which supported very old Avalon
format JTL (result) files</li>
<li><bug>59165</bug>RSyntaxTextArea not compatible with headless testing</li>
+<li><bug>59021</bug>Use Double#compare instead of reimplementing it in
NumberProperty#compareTo</li>
</ul>
<!-- =================== Bug fixes =================== -->
