Fix failing tests

sarxos · Jul 24, 2012 · 94cb0e3 · 94cb0e3
1 parent 2227be3
commit 94cb0e3
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 24 deletions.
diff --git a/webcam-capture/src/main/java/com/github/sarxos/webcam/Webcam.java b/webcam-capture/src/main/java/com/github/sarxos/webcam/Webcam.java
@@ -323,6 +323,10 @@ public static void setDriver(Class<? extends WebcamDriver> driverClass) {
 		Webcam.driver = driver;
 	}
 
+	protected static void clearDriver() {
+		driver = null;
+	}
+
 	/**
 	 * Register new webcam video driver.
 	 * 

diff --git a/webcam-capture/src/test/java/com/github/sarxos/webcam/WebcamTest.java b/webcam-capture/src/test/java/com/github/sarxos/webcam/WebcamTest.java
@@ -6,6 +6,7 @@
 
 import junit.framework.Assert;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import com.github.sarxos.webcam.ds.test.DummyDriver;
@@ -18,29 +19,9 @@
  */
 public class WebcamTest {
 
-	@Test
-	public void test_registerDriver() {
-
+	@BeforeClass
+	public static void setUp() {
 		Webcam.registerDriver(DummyDriver.class);
-		Webcam.clearWebcams();
-		Webcam.getWebcams();
-		WebcamDriver driver = Webcam.getDriver();
-
-		Assert.assertSame(DummyDriver.class, driver.getClass());
-	}
-
-	@Test
-	public void test_setDriver() throws InstantiationException {
-
-		Webcam.setDriver(DummyDriver2.class);
-		WebcamDriver driver2 = Webcam.getDriver();
-
-		Assert.assertSame(DummyDriver2.class, driver2.getClass());
-
-		WebcamDriver driver3 = new DummyDriver3();
-		Webcam.setDriver(driver3);
-
-		Assert.assertSame(driver3, Webcam.getDriver());
 	}
 
 	@Test
@@ -128,4 +109,29 @@ public void test_setSize() {
 		Assert.assertSame(sizes[0], webcam.getViewSize());
 	}
 
+	@Test
+	public void test_setDriver() throws InstantiationException {
+
+		Webcam.setDriver(DummyDriver2.class);
+		WebcamDriver driver2 = Webcam.getDriver();
+
+		Assert.assertSame(DummyDriver2.class, driver2.getClass());
+
+		WebcamDriver driver3 = new DummyDriver3();
+		Webcam.setDriver(driver3);
+
+		Assert.assertSame(driver3, Webcam.getDriver());
+	}
+
+	@Test
+	public void test_registerDriver() {
+
+		Webcam.registerDriver(DummyDriver.class);
+		Webcam.clearDriver();
+		Webcam.clearWebcams();
+		Webcam.getWebcams();
+		WebcamDriver driver = Webcam.getDriver();
+
+		Assert.assertSame(DummyDriver.class, driver.getClass());
+	}
 }
diff --git a/webcam-capture/src/test/java/com/github/sarxos/webcam/ds/test/DummyDriver.java b/webcam-capture/src/test/java/com/github/sarxos/webcam/ds/test/DummyDriver.java
@@ -22,8 +22,6 @@ public class DummyDriver implements WebcamDriver {
 	public DummyDriver() throws InstantiationException {
 		if (instance == null) {
 			instance = this;
-		} else {
-			throw new InstantiationException("Cannot be constructed twice");
 		}
 	}