Fixing stats screen registration.

MyTracksTest/src/com/google/android/apps/mytracks/DialogManagerTest.java

@@ -69,13 +69,4 @@ public class DialogManagerTest
     assertNotNull(d);
     assertTrue(d instanceof SendDialog);
   }
-
-  public void test_onCreateWriteProgress() {
-    Dialog d =
-        getActivity().onCreateDialog(
-            DialogManager.DIALOG_WRITE_PROGRESS, null);
-    assertNotNull(d);
-    assertTrue(d instanceof ProgressDialog);
-  }
-
 }

MyTracksTest/src/com/google/android/apps/mytracks/WriteProgressControllerTest.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.android.apps.mytracks;
+
+import com.google.android.apps.mytracks.io.file.MockTrackWriter;
+import com.google.android.apps.mytracks.io.file.TrackWriter;
+
+import android.app.ProgressDialog;
+import android.test.ActivityInstrumentationTestCase2;
+
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * Tests {@link WriteProgressController}.
+ *
+ * @author Matthew Simmons
+ */
+public class WriteProgressControllerTest extends ActivityInstrumentationTestCase2<MyTracks> {
+  public WriteProgressControllerTest() {
+    super(MyTracks.class);
+  }
+
+  private static void assertProgress(ProgressDialog dialog, int expectedProgress,
+      int expectedMax) {
+    assertEquals(expectedProgress, dialog.getProgress());
+    assertEquals(expectedMax, dialog.getMax());
+  }
+
+  public void testSimple() throws Exception {
+    final AtomicReference<ProgressDialog> dialogRef = new AtomicReference<ProgressDialog>();
+    final AtomicReference<Boolean> controllerDoneRef = new AtomicReference<Boolean>();
+    final Semaphore writerDone = new Semaphore(0);
+
+    TrackWriter mockWriter = new MockTrackWriter() {
+      @Override
+      public void writeTrackAsync() {
+        onWriteListener.onWrite(1000, 10000);
+        assertProgress(dialogRef.get(), 1000, 10000);
+
+        onCompletionListener.onComplete();
+        writerDone.release();
+      }
+    };
+
+    WriteProgressController controller = new WriteProgressController(
+        getActivity(), mockWriter);
+    controller.setOnCompletionListener(new WriteProgressController.OnCompletionListener() {
+      @Override
+      public void onComplete(TrackWriter writer) {
+        controllerDoneRef.set(true);
+      }
+    });
+
+    dialogRef.set(controller.getDialog());
+
+    controller.startWrite();
+
+    // wait for the writer to finish
+    writerDone.acquire();
+
+    assertFalse(dialogRef.get().isShowing());
+    assertTrue(controllerDoneRef.get());
+  }
+}

MyTracksTest/src/com/google/android/apps/mytracks/io/file/MockTrackWriter.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.android.apps.mytracks.io.file;
+
+import java.io.File;
+
+/**
+ * A simple, fake {@link TrackWriter} subclass with all methods mocked out.
+ * Tests are expected to override {@link #writeTrack} and/or
+ * {@link #writeTrackAsync}, at the very least.
+ *
+ * @author Matthew Simmons
+ *
+ */
+public class MockTrackWriter implements TrackWriter {
+  public OnCompletionListener onCompletionListener;
+  public OnWriteListener onWriteListener;
+
+  @Override
+  public void setOnCompletionListener(OnCompletionListener onCompletionListener) {
+    this.onCompletionListener = onCompletionListener;
+  }
+
+  @Override
+  public void setOnWriteListener(OnWriteListener onWriteListener) {
+    this.onWriteListener = onWriteListener;
+  }
+
+  @Override
+  public void setDirectory(File directory) {
+    throw new UnsupportedOperationException("not implemented");
+  }
+
+  @Override
+  public String getAbsolutePath() {
+    throw new UnsupportedOperationException("not implemented");
+  }
+
+  @Override
+  public void writeTrackAsync() {
+    throw new UnsupportedOperationException("not implemented");
+  }
+
+  @Override
+  public void writeTrack() {
+    throw new UnsupportedOperationException("not implemented");
+  }
+
+  @Override
+  public boolean wasSuccess() {
+    return false;
+  }
+
+  @Override
+  public int getErrorMessage() {
+    return 0;
+  }
+}

MyTracksTest/src/com/google/android/apps/mytracks/io/file/TrackWriterTest.java

@@ -6,9 +6,9 @@ import static org.easymock.EasyMock.expect;
 
 import com.google.android.apps.mytracks.content.MyTracksProvider;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
+import com.google.android.apps.mytracks.content.MyTracksProviderUtils.Factory;
 import com.google.android.apps.mytracks.content.Track;
 import com.google.android.apps.mytracks.content.Waypoint;
-import com.google.android.apps.mytracks.content.MyTracksProviderUtils.Factory;
 import com.google.android.apps.mytracks.io.file.TrackFormatWriter;
 import com.google.android.apps.mytracks.io.file.TrackWriterImpl;
 import com.google.android.apps.mytracks.services.TrackRecordingServiceTest.MockContext;
@@ -146,7 +146,7 @@ public class TrackWriterTest extends AndroidTestCase {
     setContext(context);
     providerUtils = MyTracksProviderUtils.Factory.get(context);
     oldProviderUtilsFactory = TestingProviderUtilsFactory.installWithInstance(providerUtils);
-    
+
     mocksControl = EasyMock.createStrictControl();
     formatWriter = mocksControl.createMock(TrackFormatWriter.class);
     expect(formatWriter.getExtension()).andStubReturn(EXTENSION);
@@ -166,12 +166,13 @@ public class TrackWriterTest extends AndroidTestCase {
     writer = new WriteTracksTrackWriter(getContext(), providerUtils, track,
         formatWriter, true);
 
-    // Expect the completion callback to be run
-    Runnable completionCallback = mocksControl.createMock(Runnable.class);
-    completionCallback.run();
+    // Expect the completion listener to be run
+    TrackWriter.OnCompletionListener completionListener
+        = mocksControl.createMock(TrackWriter.OnCompletionListener.class);
+    completionListener.onComplete();
 
     mocksControl.replay();
-    writer.setOnCompletion(completionCallback);
+    writer.setOnCompletionListener(completionListener);
     writer.writeTrack();
 
     assertEquals(1, writeDocumentCalls);
@@ -183,19 +184,20 @@ public class TrackWriterTest extends AndroidTestCase {
     writer = new WriteTracksTrackWriter(getContext(), providerUtils, track,
         formatWriter, false);
 
-    // Expect the completion callback to be run
-    Runnable completionCallback = mocksControl.createMock(Runnable.class);
-    completionCallback.run();
+    // Expect the completion listener to be run
+    TrackWriter.OnCompletionListener completionListener
+        = mocksControl.createMock(TrackWriter.OnCompletionListener.class);
+    completionListener.onComplete();
 
     mocksControl.replay();
-    writer.setOnCompletion(completionCallback);
+    writer.setOnCompletionListener(completionListener);
     writer.writeTrack();
 
     assertEquals(0, writeDocumentCalls);
     assertEquals(1, openFileCalls);
     mocksControl.verify();
   }
-  
+
   public void testOpenFile() {
     final ByteArrayOutputStream stream = new ByteArrayOutputStream();
     writer = new OpenFileTrackWriter(
@@ -260,7 +262,7 @@ public class TrackWriterTest extends AndroidTestCase {
 
     // Make location 3 invalid
     locs[2].setLatitude(100);
-    
+
     assertEquals(locs.length, providerUtils.bulkInsertTrackPoints(locs, locs.length, TRACK_ID));
     for (int i = 0;  i < wps.length; ++i) {
       Waypoint wpt = wps[i];
@@ -315,7 +317,7 @@ public class TrackWriterTest extends AndroidTestCase {
 
         return wpt.getId() == wpt2.getId();
       }
-      
+
       @Override
       public void appendTo(StringBuffer buffer) {
         buffer.append("wptEq(");
@@ -325,7 +327,7 @@ public class TrackWriterTest extends AndroidTestCase {
     });
     return null;
   }
-  
+
   private static Location locEq(final Location loc) {
     EasyMock.reportMatcher(new IArgumentMatcher() {
       @Override
@@ -345,7 +347,7 @@ public class TrackWriterTest extends AndroidTestCase {
             && loc.getLongitude() == loc2.getLongitude()
             && loc.getTime() == loc2.getTime();
       }
-      
+
       @Override
       public void appendTo(StringBuffer buffer) {
         buffer.append("locEq(");
@@ -355,7 +357,7 @@ public class TrackWriterTest extends AndroidTestCase {
     });
     return null;
   }
-   
+
   private void fillLocations(Location... locs) {
     assertTrue(locs.length < 90);
     for (int i = 0; i < locs.length; i++) {