unit tests update

diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/MediaListTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/MediaListTest.java
index d54650f780c72d9e37c687ac7861b23ddc0b19b4..e0817dbdaa7c898f022923d15f7b62bc888b3474 100644 (file)
--- a/bindings/java/core/src/test/java/org/videolan/jvlc/MediaListTest.java
+++ b/bindings/java/core/src/test/java/org/videolan/jvlc/MediaListTest.java
@@ -40,7 +40,7 @@ public class MediaListTest
     @Before
     public void setup()
     {
-        jvlc = new JVLC();
+        jvlc = new JVLC("-vvv -I dummy --aout=dummy --vout=dummy");
     }
     
     @Test

diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcCoreTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcCoreTest.java
index 3d38696c2e9872a2b217c0d1e02f76ec58903a0a..a3f122dfe125c4e4f9ef7cb2df36de784c9315d4 100644 (file)
--- a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcCoreTest.java
+++ b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcCoreTest.java
@@ -40,7 +40,7 @@ public class LibVlcCoreTest
     public void testNew() throws Exception
     {
         libvlc_exception_t exception = new libvlc_exception_t();
-        LibVlcInstance libvlcInstance = instance.libvlc_new(0, new String[] {}, exception);
+        LibVlcInstance libvlcInstance = instance.libvlc_new(0, new String[] {"-I","dummy","--aout=dummy","--vout=dummy"}, exception);
         Assert.assertNotNull(libvlcInstance);
         Assert.assertEquals(0, exception.raised);
     }

diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaInstanceTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaInstanceTest.java
index 2856381c62a21dccd4b2542639fa913bbd25516c..d808a6770fd8e6304591f7a840671a665cf3d598 100644 (file)
--- a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaInstanceTest.java
+++ b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaInstanceTest.java
@@ -50,7 +50,7 @@ public class LibVlcMediaInstanceTest
     public void testSetup()
     {
         exception = new libvlc_exception_t();
-        libvlcInstance = libvlc.libvlc_new(0, new String[]{}, exception);
+        libvlcInstance = libvlc.libvlc_new(0, new String[]{"-vvv","-I","dummy","-aout=dummy","-vout=dummy"}, exception);
         libvlc.libvlc_exception_clear(exception);
     }
     

diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaDescriptorTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaDescriptorTest.java
index cef385220e4aa18747c66c6844dcc3b2463e3e5c..f2ce1669e7530169b3e81bc20b2374134cb7a2f1 100644 (file)
--- a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaDescriptorTest.java
+++ b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaDescriptorTest.java
@@ -48,7 +48,7 @@ public class MediaDescriptorTest
     public void testSetup()
     {
         libvlc_exception_t exception = new libvlc_exception_t();
-        libvlcInstance = libvlc.libvlc_new(0, new String[]{}, exception);
+        libvlcInstance = libvlc.libvlc_new(0, new String[]{"-I","dummy","--aout=dummy","--vout=dummy"}, exception);
     }
 
     @After

diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java
index 853653ac3d85f36c80be240af6fca5eb310c17f4..0deb832507b29a3e88afb2e3d6b89b67f6c2aa35 100644 (file)
--- a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java
+++ b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java
@@ -25,8 +25,6 @@
 
 package org.videolan.jvlc.internal;
 
-import java.io.File;
-
 import junit.framework.Assert;
 
 import org.junit.After;
@@ -53,7 +51,7 @@ public class MediaListPlayerTest
     public void testSetup() throws Exception
     {
         libvlc_exception_t exception = new libvlc_exception_t();
-        libvlcInstance = libvlc.libvlc_new(0, new String[]{"-A","file","--audiofile-file=" + File.createTempFile("jvlc", ".wav").getAbsolutePath()}, exception);
+        libvlcInstance = libvlc.libvlc_new(0, new String[]{"-vvv","-I","dummy","--aout=dummy","--vout=dummy"}, exception);
         // use the following line to use your audio card.
         // libvlcInstance = libvlc.libvlc_new(0, new String[]{}, exception);
     }
@@ -181,7 +179,20 @@ public class MediaListPlayerTest
             }
             Thread.sleep(150);
         }
+        // FIXME give stats the time to run... there's probably a race condition in misc/stats.c:259 that
+        // needs to be fixed
+        Thread.sleep(400);
         libvlc.libvlc_media_list_player_stop(mediaListPlayer, exception);
+        libvlc.libvlc_media_list_player_release(mediaListPlayer);
+    }
+
+    @Test
+    public void mediaListPlayerGetStateStopped()
+    {
+        libvlc_exception_t exception = new libvlc_exception_t();
+        LibVlcMediaListPlayer mediaListPlayer = libvlc.libvlc_media_list_player_new(libvlcInstance, exception);
+        int state = libvlc.libvlc_media_list_player_get_state(mediaListPlayer, exception);
+        Assert.assertEquals(LibVlcState.libvlc_Stopped.ordinal(), state);
     }
 
     @Test
@@ -194,6 +205,19 @@ public class MediaListPlayerTest
         libvlc.libvlc_media_list_add_media_descriptor(mediaList, mediaDescriptor, exception);
         libvlc.libvlc_media_list_player_set_media_list(mediaListPlayer, mediaList, exception);
         libvlc.libvlc_media_list_player_play_item(mediaListPlayer, mediaDescriptor, exception);
+        while (true)
+        {
+            int playing = libvlc.libvlc_media_list_player_is_playing(mediaListPlayer, exception);
+            if (exception.raised == 1)
+            {
+                throw new RuntimeException("Native exception thrown");
+            }            
+            if (playing == 1)
+            {
+                break;
+            }
+            Thread.sleep(150);
+        }
         libvlc.libvlc_media_list_player_pause(mediaListPlayer, exception);
         Assert.assertEquals(0, exception.raised);
         while (true)
@@ -212,16 +236,9 @@ public class MediaListPlayerTest
         int state = libvlc.libvlc_media_list_player_get_state(mediaListPlayer, exception);
         Assert.assertEquals("Expected state: " + LibVlcState.libvlc_Paused +".\n", LibVlcState.libvlc_Paused.ordinal(), state);
         libvlc.libvlc_media_list_player_stop(mediaListPlayer, exception);
+        libvlc.libvlc_media_list_player_release(mediaListPlayer);
     }
 
-    @Test
-    public void mediaListPlayerGetStateStopped()
-    {
-        libvlc_exception_t exception = new libvlc_exception_t();
-        LibVlcMediaListPlayer mediaListPlayer = libvlc.libvlc_media_list_player_new(libvlcInstance, exception);
-        int state = libvlc.libvlc_media_list_player_get_state(mediaListPlayer, exception);
-        Assert.assertEquals(LibVlcState.libvlc_Stopped.ordinal(), state);
-    }
     
     @Test
     public void mediaListPlayerSetMediaInstance()

diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListTest.java
index b34994a5b91e499e202d9b564d18f765e48a6d64..ebf5e36f289db5528f49054b2e4d05a32538fb56 100644 (file)
--- a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListTest.java
+++ b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListTest.java
@@ -47,7 +47,7 @@ public class MediaListTest
     public void testSetup()
     {
         libvlc_exception_t exception = new libvlc_exception_t();
-        libvlcInstance = libvlc.libvlc_new(0, new String[]{}, exception);
+        libvlcInstance = libvlc.libvlc_new(0, new String[]{"-I","dummy","--aout=dummy","--vout=dummy"}, exception);
     }
 
     @After