Don't mock MockContext. For some reason Android Mock is unable to do it. As it happens, we

don't really need to mock it anyway.
This commit is contained in:
Matthew Simmons
2011-03-11 16:07:34 -05:00
parent 74073b641f
commit 2d3c463bf3
@@ -18,19 +18,19 @@ package com.google.android.apps.mytracks.io.docs;
import com.google.android.apps.mytracks.content.Track; import com.google.android.apps.mytracks.content.Track;
import com.google.android.apps.mytracks.io.AuthManager; import com.google.android.apps.mytracks.io.AuthManager;
import com.google.android.apps.mytracks.stats.TripStatistics; import com.google.android.apps.mytracks.stats.TripStatistics;
import com.google.android.maps.mytracks.R;
import com.google.android.testing.mocking.AndroidMock; import com.google.android.testing.mocking.AndroidMock;
import com.google.android.testing.mocking.UsesMocks; import com.google.android.testing.mocking.UsesMocks;
import com.google.android.maps.mytracks.R;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.test.mock.MockContext; import android.test.mock.MockContext;
import android.test.mock.MockResources; import android.test.mock.MockResources;
import junit.framework.TestCase;
import java.io.IOException; import java.io.IOException;
import junit.framework.TestCase;
/** /**
* Tests for {@link DocsHelper#addTrackRow} * Tests for {@link DocsHelper#addTrackRow}
* *
@@ -105,12 +105,11 @@ public class DocsHelper_AddTrackRowTest extends TestCase {
"<gsx:distance><![CDATA[20.00]]></gsx:distance>")); "<gsx:distance><![CDATA[20.00]]></gsx:distance>"));
} }
@UsesMocks({AuthManager.class, MockContext.class, MockResources.class,
Track.class})
/** Adds a row to the spreadsheet, using the provided helper. */ /** Adds a row to the spreadsheet, using the provided helper. */
@UsesMocks({AuthManager.class, MockResources.class, Track.class})
private void addTrackRow(DocsHelper docsHelper, boolean useMetric) private void addTrackRow(DocsHelper docsHelper, boolean useMetric)
throws IOException { throws IOException {
Resources mockResources = AndroidMock.createMock(MockResources.class); final Resources mockResources = AndroidMock.createMock(MockResources.class);
if (useMetric) { if (useMetric) {
AndroidMock.expect(mockResources.getString(R.string.kilometer)) AndroidMock.expect(mockResources.getString(R.string.kilometer))
@@ -129,10 +128,12 @@ public class DocsHelper_AddTrackRowTest extends TestCase {
} }
AndroidMock.replay(mockResources); AndroidMock.replay(mockResources);
Context mockContext = AndroidMock.createMock(MockContext.class); Context mockContext = new MockContext() {
AndroidMock.expect(mockContext.getResources()) @Override
.andReturn(mockResources).anyTimes(); public Resources getResources() {
AndroidMock.replay(mockContext); return mockResources;
}
};
AuthManager mockAuthManager = AndroidMock.createMock(AuthManager.class); AuthManager mockAuthManager = AndroidMock.createMock(AuthManager.class);
AndroidMock.replay(mockAuthManager); AndroidMock.replay(mockAuthManager);