Merge pull request robolectric#166 from zoodles/master

Enhancements to ShadowConfiguration, ShadowVideoView, and ShadowCountDownTimer
edu-zamora · Dec 9, 2011 · d743325 · d743325
2 parents 61229a6 + 2b51f8d
commit d743325
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 2 deletions.
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowConfiguration.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowConfiguration.java
@@ -1,6 +1,9 @@
 package com.xtremelabs.robolectric.shadows;
 
+import java.util.Locale;
+
 import android.content.res.Configuration;
+
 import com.xtremelabs.robolectric.internal.Implementation;
 import com.xtremelabs.robolectric.internal.Implements;
 import com.xtremelabs.robolectric.internal.RealObject;
@@ -14,10 +17,14 @@ public class ShadowConfiguration {
     public int screenLayout;
     public int touchscreen;
     public int orientation;
-    
+
     @Implementation
     public void setToDefaults() {
         realConfiguration.screenLayout = Configuration.SCREENLAYOUT_LONG_NO |
                 Configuration.SCREENLAYOUT_SIZE_NORMAL;
     }
+
+    public void setLocale( Locale l ) {
+    	realConfiguration.locale = l;
+    }
 }
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCountDownTimer.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowCountDownTimer.java
@@ -50,4 +50,12 @@ public void invokeFinish() {
     public boolean hasStarted() {
         return started;
     }
+
+    public long getCountDownInterval() {
+    	return countDownInterval;
+    }
+
+    public long getMillisInFuture() {
+    	return millisInFuture;
+    }
 }
diff --git a/src/main/java/com/xtremelabs/robolectric/shadows/ShadowVideoView.java b/src/main/java/com/xtremelabs/robolectric/shadows/ShadowVideoView.java
@@ -17,6 +17,7 @@ public class ShadowVideoView extends ShadowSurfaceView {
 	private MediaPlayer.OnPreparedListener preparedListener;
 
 	private Uri uri;
+	private String path;
 
 	public static final int STOP = 0;
 	public static final int START = 1;
@@ -42,6 +43,11 @@ public void setOnCompletionListener(MediaPlayer.OnCompletionListener l) {
 		completionListner = l;
 	}
 
+	@Implementation
+	public void setVideoPath(String path) {
+		this.path = path;
+	}
+
 	@Implementation
 	public void setVideoURI(Uri uri) {
 		this.uri = uri;
@@ -112,12 +118,20 @@ public MediaPlayer.OnCompletionListener getOnCompletionListener() {
 		return completionListner; 
 	}
 
+	/**
+	 * Non-Android accessor.
+	 * @return
+	 */
+	public String getVideoPath() {
+		return path;
+	}
+
 	/**
 	 * Non-Android accessor.
 	 * @return
 	 */
 	public String getVideoURIString() {
-		return uri.toString();
+		return uri == null ? null : uri.toString();
 	}
 
 	/**

diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/ConfigurationTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/ConfigurationTest.java
@@ -1,7 +1,11 @@
 package com.xtremelabs.robolectric.shadows;
 
 
+import java.util.Locale;
+
 import android.content.res.Configuration;
+
+import com.xtremelabs.robolectric.Robolectric;
 import com.xtremelabs.robolectric.WithTestDefaultsRunner;
 import org.junit.Before;
 import org.junit.Test;
@@ -14,16 +18,27 @@
 public class ConfigurationTest {
 
     private Configuration configuration;
+    private ShadowConfiguration shConfiguration;
 
     @Before
     public void setUp() throws Exception {
         configuration = new Configuration();
+        shConfiguration = Robolectric.shadowOf( configuration );
     }
 
     @Test
     public void testSetToDefaults() throws Exception {
         configuration.setToDefaults();
         assertThat(configuration.screenLayout, equalTo(Configuration.SCREENLAYOUT_LONG_NO | Configuration.SCREENLAYOUT_SIZE_NORMAL));
     }
+
+    @Test
+    public void testSetLocale() {
+    	shConfiguration.setLocale( Locale.US );
+    	assertThat( configuration.locale, equalTo( Locale.US ) );
+
+    	shConfiguration.setLocale( Locale.FRANCE);
+    	assertThat( configuration.locale, equalTo( Locale.FRANCE ) );
+}
 
 }
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/CountDownTimerTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/CountDownTimerTest.java
@@ -73,4 +73,10 @@ public void testCancel() {
 		shadowCountDownTimer.cancel();
 		assertThat(shadowCountDownTimer.hasStarted(), equalTo(false));			
 	}
+
+	@Test
+	public void testAccessors() {
+		assertThat(shadowCountDownTimer.getCountDownInterval(), equalTo(countDownInterval));
+		assertThat(shadowCountDownTimer.getMillisInFuture(), equalTo(millisInFuture));
+	}
 }
diff --git a/src/test/java/com/xtremelabs/robolectric/shadows/VideoViewTest.java b/src/test/java/com/xtremelabs/robolectric/shadows/VideoViewTest.java
@@ -2,6 +2,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.junit.Before;
@@ -48,11 +49,22 @@ public void shouldSetOnCompletionListener() throws Exception {
     	assertThat((TestCompletionListener)(shadowVideoView.getOnCompletionListener()), sameInstance(l));
     }
 
+    @Test
+    public void shouldSetVideoPath() throws Exception {
+    	view.setVideoPath("video.mp4");
+    	ShadowVideoView shadowVideoView = Robolectric.shadowOf(view);
+    	assertThat(shadowVideoView.getVideoPath(), equalTo("video.mp4"));
+    	view.setVideoPath(null);
+    	assertThat(shadowVideoView.getVideoPath(), nullValue());
+    }
+
     @Test
     public void shouldSetVideoURI() throws Exception {
     	view.setVideoURI(Uri.parse("video.mp4"));
     	ShadowVideoView shadowVideoView = Robolectric.shadowOf(view);
     	assertThat(shadowVideoView.getVideoURIString(), equalTo("video.mp4"));
+    	view.setVideoURI(null);
+    	assertThat(shadowVideoView.getVideoURIString(), nullValue());
     }
 
     @Test