Changeset 940734d9cb1999a247cc4c60b96442c20e804413

Timestamp:

03/29/08 00:38:32 (3 months ago)

Author:

Filippo Carone <littlejohn@videolan.org>

git-committer:

Filippo Carone <littlejohn@videolan.org> 1206747512 +0100

git-parent:

[fea85dea108170c42f126e7937821c074384c8b5]

git-author:

Filippo Carone <littlejohn@videolan.org> 1206747474 +0100

Message:

unit tests update

Files:

• bindings/java/core/src/test/java/org/videolan/jvlc/MediaListTest.java (modified) (1 diff)
• bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcCoreTest.java (modified) (1 diff)
• bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaInstanceTest.java (modified) (1 diff)
• bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaDescriptorTest.java (modified) (1 diff)
• bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java (modified) (5 diffs)
• bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListTest.java (modified) (1 diff)

bindings/java/core/src/test/java/org/videolan/jvlc/MediaListTest.java

@@ -41 +41 @@
-    public void setup()
-    {
-
+"-vvv -I dummy --aout=dummy --vout=dummy"
-    }
-    

bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcCoreTest.java

@@ -41 +41 @@
-    {
-        libvlc_exception_t exception = new libvlc_exception_t();
-
+"-I","dummy","--aout=dummy","--vout=dummy"
-        Assert.assertNotNull(libvlcInstance);
-        Assert.assertEquals(0, exception.raised);

bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaInstanceTest.java

@@ -51 +51 @@
-    {
-        exception = new libvlc_exception_t();
-
+"-vvv","-I","dummy","-aout=dummy","-vout=dummy"
-        libvlc.libvlc_exception_clear(exception);
-    }

bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaDescriptorTest.java

@@ -49 +49 @@
-    {
-        libvlc_exception_t exception = new libvlc_exception_t();
-
+"-I","dummy","--aout=dummy","--vout=dummy"
-    }
-

bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java

@@ -25 +25 @@
-
-package org.videolan.jvlc.internal;
-
-import java.io.File;
-
-import junit.framework.Assert;
@@ -54 +52 @@
-    {
-        libvlc_exception_t exception = new libvlc_exception_t();
-A","file","--audiofile-file=" + File.createTempFile("jvlc", ".wav").getAbsolutePath()
+vvv","-I","dummy","--aout=dummy","--vout=dummy"
-        // use the following line to use your audio card.
-        // libvlcInstance = libvlc.libvlc_new(0, new String[]{}, exception);
@@ -182 +180 @@
-            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);
-    }
-
@@ -195 +206 @@
-        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);
@@ -213 +237 @@
-        Assert.assertEquals("Expected state: " + LibVlcState.libvlc_Paused +".\n", LibVlcState.libvlc_Paused.ordinal(), state);
-        libvlc.libvlc_media_list_player_stop(mediaListPlayer, exception);
-
-
-
-
-
-
-
-
-
-
+
+
+
-    
-    @Test

bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListTest.java

@@ -48 +48 @@
-    {
-        libvlc_exception_t exception = new libvlc_exception_t();
-
+"-I","dummy","--aout=dummy","--vout=dummy"
-    }
-