|
20 | 20 | import android.graphics.*; |
21 | 21 | import com.androidplot.exception.PlotRenderException; |
22 | 22 | import com.androidplot.ui.RenderStack; |
23 | | -import com.androidplot.ui.SeriesAndFormatterPair; |
| 23 | +import com.androidplot.ui.SeriesAndFormatter; |
24 | 24 | import com.androidplot.ui.SeriesRenderer; |
25 | 25 | import com.androidplot.ui.Formatter; |
26 | 26 | import com.androidplot.util.Configurator; |
@@ -181,7 +181,7 @@ public void testAddSeries() throws Exception { |
181 | 181 |
|
182 | 182 | plot.addSeries(m1, new MockFormatter1()); |
183 | 183 |
|
184 | | - ArrayList<SeriesAndFormatterPair<MockSeries, MockFormatter1>> registry = |
| 184 | + ArrayList<SeriesAndFormatter<MockSeries, MockFormatter1>> registry = |
185 | 185 | Deencapsulation.getField(plot, "seriesRegistry"); |
186 | 186 | assertEquals(1, registry.size()); |
187 | 187 | //assertEquals(1, registry.get(cl).size()); |
@@ -217,7 +217,7 @@ public void testRemoveSeries() throws Exception { |
217 | 217 |
|
218 | 218 | //Context context = Mockit.setUpMock(new MockContext()); |
219 | 219 | Plot plot = new MockPlot("MockPlot"); |
220 | | - ArrayList<SeriesAndFormatterPair<MockSeries, MockFormatter1>> registry = |
| 220 | + ArrayList<SeriesAndFormatter<MockSeries, MockFormatter1>> registry = |
221 | 221 | Deencapsulation.getField(plot, "seriesRegistry"); |
222 | 222 |
|
223 | 223 | MockSeries m1 = new MockSeries(); |
@@ -300,7 +300,7 @@ public void testRemoveSeries() throws Exception { |
300 | 300 | public void testGetFormatter() throws Exception { |
301 | 301 | //Context context = Mockit.setUpMock(new MockContext()); |
302 | 302 | Plot plot = new MockPlot("MockPlot"); |
303 | | - ArrayList<SeriesAndFormatterPair<MockSeries, MockFormatter1>> registry = |
| 303 | + ArrayList<SeriesAndFormatter<MockSeries, MockFormatter1>> registry = |
304 | 304 | Deencapsulation.getField(plot, "seriesRegistry"); |
305 | 305 |
|
306 | 306 | MockSeries m1 = new MockSeries(); |
|
0 commit comments