[vlc-devel] commit: jvlc: minor changes on unit tests (Filippo Carone )
git version control
git at videolan.org
Thu Jul 31 19:40:47 CEST 2008
vlc | branch: master | Filippo Carone <littlejohn at videolan.org> | Thu Jul 31 19:42:23 2008 +0200| [e91b6fac50039e215c5d587e1aeca79d4b2dd9f5]
jvlc: minor changes on unit tests
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e91b6fac50039e215c5d587e1aeca79d4b2dd9f5
---
.../java/org/videolan/jvlc/AbstractJVLCTest.java | 3 +-
.../jvlc/internal/AbstractVLCInternalTest.java | 11 +++++++--
.../jvlc/internal/MediaListPlayerTest.java | 22 +++----------------
3 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/AbstractJVLCTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/AbstractJVLCTest.java
index 9468e85..86d6b27 100644
--- a/bindings/java/core/src/test/java/org/videolan/jvlc/AbstractJVLCTest.java
+++ b/bindings/java/core/src/test/java/org/videolan/jvlc/AbstractJVLCTest.java
@@ -57,7 +57,8 @@ public abstract class AbstractJVLCTest
@Before
public void testSetup()
{
- jvlc = new JVLC("-vvv --ignore-config --no-media-library -I dummy --aout=dummy --vout=dummy --rtsp-host 127.0.0.1:5554");
+ jvlc = new JVLC("-vvv --ignore-config --no-media-library -I dummy -A dummy -V dummy --rtsp-host 127.0.0.1:5554");
+ jvlc.setLogVerbosity(LoggerVerbosityLevel.DEBUG);
downloadSample();
}
diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/AbstractVLCInternalTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/AbstractVLCInternalTest.java
index e7c540c..efdcbcb 100644
--- a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/AbstractVLCInternalTest.java
+++ b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/AbstractVLCInternalTest.java
@@ -65,15 +65,20 @@ public abstract class AbstractVLCInternalTest
public void testSetup()
{
exception = new libvlc_exception_t();
- libvlcInstance = libvlc.libvlc_new(0, new String[]{
+ String[] args = new String[]{
"-vvv",
"--ignore-config",
+ "--reset-plugins-cache",
"--no-media-library",
"-I",
"dummy",
- "--aout=dummy",
- "--vout=dummy" }, exception);
+ "-A",
+ "dummy",
+ "-V",
+ "dummy" };
+ libvlcInstance = libvlc.libvlc_new(args.length, args, exception);
libvlc.libvlc_exception_clear(exception);
+
downloadSample();
}
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 e79aee4..8a6b0f3 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
@@ -37,6 +37,7 @@ import org.videolan.jvlc.internal.LibVlc.libvlc_exception_t;
public class MediaListPlayerTest extends AbstractVLCInternalTest
{
+
@Test
public void mediaListPlayerNewTest()
{
@@ -97,7 +98,7 @@ public class MediaListPlayerTest extends AbstractVLCInternalTest
/**
* this fails: see https://trac.videolan.org/vlc/ticket/1527
*/
- // @Test
+ @Test
public void mediaListPlayerPlay()
{
libvlc_exception_t exception = new libvlc_exception_t();
@@ -166,9 +167,7 @@ public class MediaListPlayerTest extends AbstractVLCInternalTest
}
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);
+ Thread.sleep(400);
libvlc.libvlc_media_list_player_stop(mediaListPlayer, exception);
libvlc.libvlc_media_list_release(mediaList);
libvlc.libvlc_media_list_player_release(mediaListPlayer);
@@ -208,20 +207,7 @@ public class MediaListPlayerTest extends AbstractVLCInternalTest
Thread.sleep(150);
}
libvlc.libvlc_media_list_player_pause(mediaListPlayer, exception);
- Assert.assertEquals(exception.message, 0, exception.raised);
- 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 == 0)
- {
- break;
- }
- Thread.sleep(150);
- }
+
int state = libvlc.libvlc_media_list_player_get_state(mediaListPlayer, exception);
Assert.assertEquals(exception.message, 0, exception.raised);
Assert.assertEquals(
More information about the vlc-devel
mailing list