From 940734d9cb1999a247cc4c60b96442c20e804413 Mon Sep 17 00:00:00 2001 From: Filippo Carone Date: Sat, 29 Mar 2008 00:37:54 +0100 Subject: [PATCH] unit tests update --- .../java/org/videolan/jvlc/MediaListTest.java | 2 +- .../jvlc/internal/LibVlcCoreTest.java | 2 +- .../internal/LibVlcMediaInstanceTest.java | 2 +- .../jvlc/internal/MediaDescriptorTest.java | 2 +- .../jvlc/internal/MediaListPlayerTest.java | 39 +++++++++++++------ .../videolan/jvlc/internal/MediaListTest.java | 2 +- 6 files changed, 33 insertions(+), 16 deletions(-) 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 d54650f780..e0817dbdaa 100644 --- 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 3d38696c2e..a3f122dfe1 100644 --- 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 2856381c62..d808a6770f 100644 --- 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 cef385220e..f2ce1669e7 100644 --- 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 853653ac3d..0deb832507 100644 --- 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 b34994a5b9..ebf5e36f28 100644 --- 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 -- 2.39.2