From c9d9c065a2def836b80be9c2222e986c0c3ba6c7 Mon Sep 17 00:00:00 2001 From: ase69s Date: Fri, 23 Sep 2011 17:54:58 +0200 Subject: [PATCH] Finally solved instanceof class test. Its ready to merge? --- .../apps/mytracks/maps/TrackPathPainterFactoryTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java index 3a4dc98b7..83482b26b 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/maps/TrackPathPainterFactoryTest.java @@ -15,8 +15,6 @@ */ package com.google.android.apps.mytracks.maps; -import static com.google.android.testing.mocking.AndroidMock.expect; - import com.google.android.apps.mytracks.Constants; import com.google.android.apps.mytracks.MockPath; import com.google.android.maps.mytracks.R; @@ -58,7 +56,7 @@ public class TrackPathPainterFactoryTest extends TrackPathPainterTestCase { } private void testTrackPathPainterFactorySpecific(Context context, SharedPreferences prefs, - int track_color_mode, Class classtested) { + int track_color_mode, Class c) { prefs.edit().putString(context.getString(track_color_mode), context.getString(R.string.track_color_mode_key)).commit(); @@ -68,7 +66,7 @@ public class TrackPathPainterFactoryTest extends TrackPathPainterTestCase { TrackPathPainter painter = TrackPathPainterFactory.getTrackPathPainter(context); assertNotNull(painter); - expect(classtested.isInstance(painter)); + assertTrue(c.isInstance(painter)); painter.updatePath(myTracksOverlay.getMapProjection(mockView), myTracksOverlay.getMapViewRect(mockView), startLocationIdx, alwaysVisible,