From e91b6fac50039e215c5d587e1aeca79d4b2dd9f5 Mon Sep 17 00:00:00 2001
From: Filippo Carone <littlejohn@videolan.org>
Date: Thu, 31 Jul 2008 19:42:23 +0200
Subject: [PATCH] jvlc: minor changes on unit tests

---
 .../org/videolan/jvlc/AbstractJVLCTest.java   |  3 ++-
 .../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 9468e85dc9..86d6b27544 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 e7c540cf93..efdcbcb621 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 e79aee422d..8a6b0f3330 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(
-- 
2.39.2