Fix failing test

sarxos · Jul 24, 2012 · 2227be3 · 2227be3
1 parent 64b8522
commit 2227be3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/webcam-capture/.classpath b/webcam-capture/.classpath
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="src" path="src/example/java"/>
 	<classpathentry kind="src" path="src/example/resources"/>
-	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>

diff --git a/webcam-capture/pom.xml b/webcam-capture/pom.xml
@@ -323,13 +323,7 @@
 						<Bundle-Version>${project.version}</Bundle-Version>
 						<Bundle-DocURL>${project.url}</Bundle-DocURL>
 						<Bundle-Activator>com.github.sarxos.webcam.WebcamActivator</Bundle-Activator>
-						<Export-Package>
-							com.github.sarxos.webcam,
-							com.github.sarxos.webcam.log
-						</Export-Package>
-						<Private-Package>
-							com.github.sarxos.webcam.ds.*,
-						</Private-Package>
+						<Export-Package>com.github.sarxos.*</Export-Package>
 					</instructions>
 				</configuration>
 			</plugin>

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
@@ -237,6 +237,10 @@ public static List<Webcam> getWebcams() {
 		return Collections.unmodifiableList(webcams);
 	}
 
+	protected static void clearWebcams() {
+		webcams = null;
+	}
+
 	/**
 	 * @return Default webcam (first from the list)
 	 */

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
@@ -22,6 +22,7 @@ public class WebcamTest {
 	public void test_registerDriver() {
 
 		Webcam.registerDriver(DummyDriver.class);
+		Webcam.clearWebcams();
 		Webcam.getWebcams();
 		WebcamDriver driver = Webcam.getDriver();