Skip to content

Commit 8714435

Browse files
halfhphalfhp
committed
Fixed a bug in XYPlot framing, updated unit tests.
1 parent 45417fd commit 8714435

3 files changed

Lines changed: 11 additions & 83 deletions

File tree

‎androidplot-core/src/main/java/com/androidplot/util/SeriesUtils.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@
2828
*/
2929
public class SeriesUtils {
3030

31+
public static XYBounds minMax(List<XYSeries> seriesList) {
32+
return minMax(null, seriesList);
33+
}
34+
35+
public static XYBounds minMax(XYSeries... seriesList) {
36+
return minMax(null, seriesList);
37+
}
38+
3139
/**
3240
* @param constraints may be null.
3341
* @param seriesList

‎androidplot-core/src/main/java/com/androidplot/xy/XYPlot.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ public void calculateMinMaxVals() {
460460
"Domain Framing Model not yet supported: " + constraints.getDomainFramingModel());
461461
}
462462

463-
switch (constraints.getDomainFramingModel()) {
463+
switch (constraints.getRangeFramingModel()) {
464464
case ORIGIN:
465465
updateRangeMinMaxForOriginModel();
466466
break;

‎androidplot-core/src/test/java/com/androidplot/PlotTest.java‎

Lines changed: 2 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -169,28 +169,17 @@ public void tearDown() throws Exception {
169169

170170
@Test
171171
public void testAddSeries() throws Exception {
172-
//Context context = Mockit.setUpMock(new MockContext());
173-
//Plot plot = Mockit.setUpMock(Plot.class, new MockPlot(context, "MockPlot"));
174-
//Plot plot = Mockit.setUpMock(new MockPlot());
175172
Plot plot = new MockPlot("MockPlot");
176173

177174
MockSeries m1 = new MockSeries();
178175
Class cl = MockRenderer1.class;
179176

180-
181-
182177
plot.addSeries(m1, new MockFormatter1());
178+
assertEquals(1, plot.getSeriesRegistry().size());
183179

184-
ArrayList<SeriesAndFormatter<MockSeries, MockFormatter1>> registry =
185-
Deencapsulation.getField(plot, "seriesRegistry");
186-
assertEquals(1, registry.size());
187-
//assertEquals(1, registry.get(cl).size());
188-
180+
// duplicate Renderer added, registry size should not grow:
189181
plot.addSeries(m1, new MockFormatter1());
190182

191-
// duplicate Renderer added, registry size should not grow:
192-
//assertEquals(1, registry.size());
193-
//assertEquals(1, registry.get(cl).size());
194183
assertEquals(1, plot.getRenderers().size());
195184
assertEquals(1, plot.getRenderer(cl).getSeriesList().size());
196185

@@ -202,7 +191,6 @@ public void testAddSeries() throws Exception {
202191
assertEquals(1, plot.getRendererList().size());
203192

204193
// we added a new instance of cl to the renderer so there should be 2 in the subregistry:
205-
//assertEquals(2, registry.get(cl).size());
206194
assertEquals(2, plot.getRenderer(cl).getSeriesList().size());
207195

208196

@@ -215,10 +203,7 @@ public void testAddSeries() throws Exception {
215203
@Test
216204
public void testRemoveSeries() throws Exception {
217205

218-
//Context context = Mockit.setUpMock(new MockContext());
219206
Plot plot = new MockPlot("MockPlot");
220-
ArrayList<SeriesAndFormatter<MockSeries, MockFormatter1>> registry =
221-
Deencapsulation.getField(plot, "seriesRegistry");
222207

223208
MockSeries m1 = new MockSeries();
224209
MockSeries m2 = new MockSeries();
@@ -235,31 +220,20 @@ public void testRemoveSeries() throws Exception {
235220

236221
// a quick sanity check:
237222
assertEquals(2, plot.getRendererList().size());
238-
//assertEquals(3, registry.get(MockRenderer1.class).size());
239223
assertEquals(3, plot.getRenderer(MockRenderer1.class).getSeriesList().size());
240-
//assertEquals(3, registry.get(MockRenderer2.class).size());
241224
assertEquals(3, plot.getRenderer(MockRenderer2.class).getSeriesList().size());
242225

243226
plot.removeSeries(m1, MockRenderer1.class);
244-
//assertEquals(2, registry.get(MockRenderer1.class).size());
245227
assertEquals(2, plot.getRenderer(MockRenderer1.class).getSeriesList().size());
246228

247229
plot.removeSeries(m2, MockRenderer1.class);
248-
//assertEquals(1, registry.get(MockRenderer1.class).size());
249230
assertEquals(1, plot.getRenderer(MockRenderer1.class).getSeriesList().size());
250231

251232
plot.removeSeries(m2, MockRenderer1.class);
252-
//assertEquals(1, registry.get(MockRenderer1.class).size());
253233
assertEquals(1, plot.getRenderer(MockRenderer1.class).getSeriesList().size());
254234

255235
plot.removeSeries(m3, MockRenderer1.class);
256236

257-
// all the elements should be gone from MockRenderer1, thus the renderer should
258-
// also be gone:
259-
//assertNull(registry.get(MockRenderer1.class));
260-
//assertNull(plot.getRenderer(MockRenderer1.class));
261-
262-
263237
// add em all back
264238
plot.addSeries(m1, new MockFormatter1());
265239
plot.addSeries(m2, new MockFormatter1());
@@ -272,36 +246,23 @@ public void testRemoveSeries() throws Exception {
272246

273247
// a quick sanity check:
274248
assertEquals(2, plot.getRendererList().size());
275-
//assertEquals(3, registry.get(MockRenderer1.class).size());
276249
assertEquals(3, plot.getRenderer(MockRenderer1.class).getSeriesList().size());
277-
//assertEquals(3, registry.get(MockRenderer2.class).size());
278250
assertEquals(3, plot.getRenderer(MockRenderer2.class).getSeriesList().size());
279251

280252
// now lets try removing a series from all renderers:
281253
plot.removeSeries(m1);
282-
//assertEquals(2, registry.get(MockRenderer1.class).size());
283254
assertEquals(2, plot.getRenderer(MockRenderer1.class).getSeriesList().size());
284-
//assertEquals(2, registry.get(MockRenderer2.class).size());
285255
assertEquals(2, plot.getRenderer(MockRenderer2.class).getSeriesList().size());
286256

287257
// and now lets remove the remaining series:
288258
plot.removeSeries(m2);
289259
plot.removeSeries(m3);
290-
291-
// nothing should be left:
292-
//assertNull(registry.get(MockRenderer1.class));
293-
//assertNull(plot.getRenderer(MockRenderer1.class));
294-
//assertNull(registry.get(MockRenderer2.class));
295-
//assertNull(plot.getRenderer(MockRenderer2.class));
296260
}
297261

298262

299263
@Test
300264
public void testGetFormatter() throws Exception {
301-
//Context context = Mockit.setUpMock(new MockContext());
302265
Plot plot = new MockPlot("MockPlot");
303-
ArrayList<SeriesAndFormatter<MockSeries, MockFormatter1>> registry =
304-
Deencapsulation.getField(plot, "seriesRegistry");
305266

306267
MockSeries m1 = new MockSeries();
307268
MockSeries m2 = new MockSeries();
@@ -319,25 +280,18 @@ public void testGetFormatter() throws Exception {
319280
plot.addSeries(m2, f3);
320281
plot.addSeries(m3, new MockFormatter1());
321282

322-
323-
//assertEquals(registry.get(MockRenderer1.class).getFormatter(m1), f1);
324283
assertEquals(plot.getRenderer(MockRenderer1.class).getFormatter(m1), f1);
325-
//assertEquals(registry.get(MockRenderer1.class).getFormatter(m2), f2);
326284
assertEquals(plot.getRenderer(MockRenderer1.class).getFormatter(m2), f2);
327-
//assertEquals(registry.get(MockRenderer2.class).getFormatter(m2), f3);
328285
assertEquals(plot.getRenderer(MockRenderer2.class).getFormatter(m2), f3);
329286

330-
//assertNotSame(registry.get(MockRenderer2.class).getFormatter(m2), f1);
331287
assertNotSame(plot.getRenderer(MockRenderer2.class).getFormatter(m2), f1);
332288

333289
}
334290

335291
@Test
336292
public void testGetRendererList() throws Exception {
337293

338-
//Context context = Mockit.setUpMock(new MockContext());
339294
Plot plot = new MockPlot("MockPlot");
340-
//LinkedHashMap<Class<SeriesRenderer>, SeriesAndFormatterList<MockSeries,MockFormatter1>> registry = Deencapsulation.getField(plot, "seriesRegistry");
341295

342296
MockSeries m1 = new MockSeries();
343297
MockSeries m2 = new MockSeries();
@@ -353,17 +307,12 @@ public void testGetRendererList() throws Exception {
353307

354308
List<SeriesRenderer> rList = plot.getRendererList();
355309
assertEquals(2, rList.size());
356-
357-
//assertEquals(MockRenderer1.class, rList.get(0).getClass());
358-
//assertEquals(MockRenderer2.class, rList.get(1).getClass());
359310
}
360311

361312
@Test
362313
public void testAddListener() throws Exception {
363-
//Context context = Mockit.setUpMock(new MockContext());
364314
Plot plot = new MockPlot("MockPlot");
365315
ArrayList<PlotListener> listeners = Deencapsulation.getField(plot, "listeners");
366-
//LinkedHashMap<Class<SeriesRenderer>, SeriesAndFormatterList<MockSeries,MockFormatter1>> registry = Deencapsulation.getField(plot, "seriesRegistry");
367316

368317
assertEquals(0, listeners.size());
369318

@@ -388,10 +337,8 @@ public void testAddListener() throws Exception {
388337

389338
@Test
390339
public void testRemoveListener() throws Exception {
391-
//Context context = Mockit.setUpMock(new MockContext());
392340
Plot plot = new MockPlot("MockPlot");
393341
ArrayList<PlotListener> listeners = Deencapsulation.getField(plot, "listeners");
394-
//LinkedHashMap<Class<SeriesRenderer>, SeriesAndFormatterList<MockSeries,MockFormatter1>> registry = Deencapsulation.getField(plot, "seriesRegistry");
395342

396343
assertEquals(0, listeners.size());
397344

@@ -420,45 +367,18 @@ public void testRemoveListener() throws Exception {
420367

421368
}
422369

423-
/*@Test
424-
public void testGuessGetterName() throws Exception {
425-
Context context = Mockit.setUpMock(new MockContext());
426-
Plot plot = new MockPlot(context, "MockPlot");
427-
428-
Method m = Plot.class.getDeclaredMethod("guessGetterMethod", Object.class, String.class);
429-
assertNotNull(m);
430-
}
431-
432-
@Test
433-
public void testGuessSetterName() throws Exception {
434-
Context context = Mockit.setUpMock(new MockContext());
435-
Plot plot = new MockPlot(context, "MockPlot");
436-
437-
Method m = Plot.class.getDeclaredMethod("guessSetterMethod", Object.class, String.class, Class.class);
438-
assertNotNull(m);
439-
}*/
440-
441-
442-
443370
@Test
444371
public void testConfigure() throws Exception {
445-
//Context context = Mockit.setUpMock(new MockContext.MockContext2());
446-
//Context context = new MockContext.MockContext2();
447372
Plot plot = new MockPlot("MockPlot");
448373

449374
HashMap<String, String> params = new HashMap<String, String>();
450375
String param1 = "this is a test.";
451-
//String param2 = Plot.RenderMode.USE_BACKGROUND_THREAD.toString();
452376
String param2 = "use_background_thread";
453377
String param3 = "#FF0000";
454378
params.put("title", param1);
455379
params.put("renderMode", param2);
456380
params.put("backgroundPaint.color", param3);
457381

458-
459-
//Method m = Plot.class.getDeclaredMethod("configure", params.getClass());
460-
//m.setAccessible(true);
461-
//m.invoke(plot, params);
462382
Configurator.configure(RuntimeEnvironment.application, plot, params);
463383

464384
assertEquals(param1, plot.getTitle());

0 commit comments

Comments
 (0)