Skip to content

Commit

Permalink
Fix 'test' target and make test compilable.
Browse files Browse the repository at this point in the history 
See discussion on the JFreeChart forum:
 --> http://www.jfree.org/forum/viewtopic.php?f=3&t=109372
  • Loading branch information
@mkrauskopf
mkrauskopf committed Oct 5, 2011
1 parent 5a8d9db commit 7411022
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
8 changes: 4 additions & 4 deletions ant/build.xml
View file
Expand Up @@ -335,8 +335,8 @@
<classpath>
<path refid="build.classpath"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}.jar"/>
<pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}-experimental.jar"/>
<pathelement location="${basedir}/lib/${jfreechart.name}-${jfreechart.version}.jar"/>
<pathelement location="${basedir}/lib/${jfreechart.name}-${jfreechart.version}-experimental.jar"/>
<pathelement location="${basedir}/build-tests"/>
</classpath>
</javac>
Expand All @@ -362,8 +362,8 @@
<classpath>
<path refid="build.classpath"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}.jar"/>
<pathelement location="${basedir}/${jfreechart.name}-${jfreechart.version}-experimental.jar"/>
<pathelement location="${basedir}/lib/${jfreechart.name}-${jfreechart.version}.jar"/>
<pathelement location="${basedir}/lib/${jfreechart.name}-${jfreechart.version}-experimental.jar"/>
<pathelement location="${basedir}/build-tests"/>
</classpath>
<batchtest todir="${basedir}/build-tests-reports">
Expand Down
16 changes: 8 additions & 8 deletions tests/org/jfree/chart/renderer/xy/junit/XYShapeRendererTests.java
View file
Expand Up @@ -164,36 +164,36 @@ public void testSerialization() {
}

/**
* Check if finding the bounds in z-dimension of an XYZDataset works.
* Check if finding the bounds in z-dimension of an XYZDataset works.
*/
public void testFindZBounds() {
XYShapeRenderer r = new XYShapeRenderer();
assertNull(r.findZBounds(null));

DefaultXYZDataset dataset = new DefaultXYZDataset();
Range range;

double data1[][] = { {1,1,1}, {1,1,1}, {1,2,3} };
dataset.addSeries("series1", data1);
range = r.findZBounds(dataset);
assertNotNull(range);
assertEquals(1d, range.getLowerBound());
assertEquals(3d, range.getUpperBound());
assertEquals(1d, range.getLowerBound(), 1e-3);
assertEquals(3d, range.getUpperBound(), 1e-3);

double data2[][] = { {1,1,1}, {1,1,1}, {-1,-2,-3} };
dataset.removeSeries("series1");
dataset.addSeries("series2", data2);
range = r.findZBounds(dataset);
assertNotNull(range);
assertEquals(-3d, range.getLowerBound());
assertEquals(-1d, range.getUpperBound());
assertEquals(-3d, range.getLowerBound(), 1e-3);
assertEquals(-1d, range.getUpperBound(), 1e-3);

double data3[][] = { {1,1,1}, {1,1,1}, {-1.2,2.9,3.8} };
dataset.removeSeries("series2");
dataset.addSeries("series3", data3);
range = r.findZBounds(dataset);
assertNotNull(range);
assertEquals(-1.2d, range.getLowerBound());
assertEquals(3.8d, range.getUpperBound());
assertEquals(-1.2d, range.getLowerBound(), 1e-3);
assertEquals(3.8d, range.getUpperBound(), 1e-3);
}
}
14 changes: 7 additions & 7 deletions tests/org/jfree/data/general/junit/DatasetUtilitiesTests.java
View file
Expand Up @@ -41,7 +41,7 @@
* 03-Feb-2005 : Added testFindStackedRangeBounds2() method (DG);
* 26-Sep-2007 : Added testIsEmptyOrNullXYDataset() method (DG);
* 28-Mar-2008 : Added and renamed various tests (DG);
* 08-Oct-2008 : New tests to support patch 2131001 and related
* 08-Oct-2008 : New tests to support patch 2131001 and related
* changes (DG);
* 25-Mar-2009 : Added tests for new iterateToFindRangeBounds() method (DG);
* 16-May-2009 : Added
Expand Down Expand Up @@ -1038,7 +1038,7 @@ public void testIterateToFindRangeBounds1_XYDataset() {
pass = true;
}
assertTrue(pass);

// null range throws IllegalArgumentException
pass = false;
try {
Expand Down Expand Up @@ -1224,7 +1224,7 @@ public void testIterateRangeBounds_IntervalCategoryDataset() {
DatasetUtilities.iterateRangeBounds(d));

d = new TestIntervalCategoryDataset();
d.addItem(null, 2.0, 3.0, "R1", "C1");
d.addItem(null, new Double(2.0), new Double(3.0), "R1", "C1");
assertEquals(new Range(2.0, 3.0),
DatasetUtilities.iterateRangeBounds(d));

Expand All @@ -1234,17 +1234,17 @@ public void testIterateRangeBounds_IntervalCategoryDataset() {
assertNull(DatasetUtilities.iterateRangeBounds(d));

d = new TestIntervalCategoryDataset();
d.addItem(1.0, null, null, "R1", "C1");
d.addItem(new Double(1.0), null, null, "R1", "C1");
assertEquals(new Range(1.0, 1.0),
DatasetUtilities.iterateRangeBounds(d));

d = new TestIntervalCategoryDataset();
d.addItem(null, 1.0, null, "R1", "C1");
d.addItem(null, new Double(1.0), null, "R1", "C1");
assertEquals(new Range(1.0, 1.0),
DatasetUtilities.iterateRangeBounds(d));

d = new TestIntervalCategoryDataset();
d.addItem(null, null, 1.0, "R1", "C1");
d.addItem(null, null, new Double(1.0), "R1", "C1");
assertEquals(new Range(1.0, 1.0),
DatasetUtilities.iterateRangeBounds(d));
}
Expand All @@ -1255,7 +1255,7 @@ public void testIterateRangeBounds_IntervalCategoryDataset() {
public void testBug2849731() {
TestIntervalCategoryDataset d = new TestIntervalCategoryDataset();
d.addItem(2.5, 2.0, 3.0, "R1", "C1");
d.addItem(4.0, null, null, "R2", "C1");
d.addItem(new Double(4.0), null, null, "R2", "C1");
assertEquals(new Range(2.0, 4.0),
DatasetUtilities.iterateRangeBounds(d));
}
Expand Down
8 changes: 4 additions & 4 deletions tests/org/jfree/data/time/junit/TimeSeriesTests.java
View file
Expand Up @@ -49,7 +49,7 @@
* 26-May-2009 : Added various tests for min/maxY values (DG);
* 09-Jun-2009 : Added testAdd_TimeSeriesDataItem (DG);
* 31-Aug-2009 : Added new test for createCopy() method (DG);
*
*
*/

package org.jfree.data.time.junit;
Expand Down Expand Up @@ -609,7 +609,7 @@ public void testCreateCopy3() throws CloneNotSupportedException {
s1.add(new Year(2011), 102.0);
assertEquals(100.0, s1.getMinY(), EPSILON);
assertEquals(102.0, s1.getMaxY(), EPSILON);

TimeSeries s2 = s1.createCopy(0, 1);
assertEquals(100.0, s2.getMinY(), EPSILON);
assertEquals(101.0, s2.getMaxY(), EPSILON);
Expand Down Expand Up @@ -1097,9 +1097,9 @@ public void testUpdate_RegularTimePeriod() {
s1.add(new Year(2010), 1.1);
s1.add(new Year(2011), 2.2);
s1.add(new Year(2012), 3.3);
s1.update(new Year(2012), 4.4);
s1.update(new Year(2012), new Double(4.4));
assertEquals(4.4, s1.getMaxY(), EPSILON);
s1.update(new Year(2010), 0.5);
s1.update(new Year(2010), new Double(0.5));
assertEquals(0.5, s1.getMinY(), EPSILON);
s1.update(new Year(2012), null);
assertEquals(2.2, s1.getMaxY(), EPSILON);
Expand Down

0 comments on commit 7411022

Please sign in to comment.