Commit e91b6fac authored by Filippo Carone's avatar Filippo Carone

jvlc: minor changes on unit tests

parent 5eab7541
...@@ -57,7 +57,8 @@ public abstract class AbstractJVLCTest ...@@ -57,7 +57,8 @@ public abstract class AbstractJVLCTest
@Before @Before
public void testSetup() 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(); downloadSample();
} }
......
...@@ -65,15 +65,20 @@ public abstract class AbstractVLCInternalTest ...@@ -65,15 +65,20 @@ public abstract class AbstractVLCInternalTest
public void testSetup() public void testSetup()
{ {
exception = new libvlc_exception_t(); exception = new libvlc_exception_t();
libvlcInstance = libvlc.libvlc_new(0, new String[]{ String[] args = new String[]{
"-vvv", "-vvv",
"--ignore-config", "--ignore-config",
"--reset-plugins-cache",
"--no-media-library", "--no-media-library",
"-I", "-I",
"dummy", "dummy",
"--aout=dummy", "-A",
"--vout=dummy" }, exception); "dummy",
"-V",
"dummy" };
libvlcInstance = libvlc.libvlc_new(args.length, args, exception);
libvlc.libvlc_exception_clear(exception); libvlc.libvlc_exception_clear(exception);
downloadSample(); downloadSample();
} }
......
...@@ -37,6 +37,7 @@ import org.videolan.jvlc.internal.LibVlc.libvlc_exception_t; ...@@ -37,6 +37,7 @@ import org.videolan.jvlc.internal.LibVlc.libvlc_exception_t;
public class MediaListPlayerTest extends AbstractVLCInternalTest public class MediaListPlayerTest extends AbstractVLCInternalTest
{ {
@Test @Test
public void mediaListPlayerNewTest() public void mediaListPlayerNewTest()
{ {
...@@ -97,7 +98,7 @@ public class MediaListPlayerTest extends AbstractVLCInternalTest ...@@ -97,7 +98,7 @@ public class MediaListPlayerTest extends AbstractVLCInternalTest
/** /**
* this fails: see https://trac.videolan.org/vlc/ticket/1527 * this fails: see https://trac.videolan.org/vlc/ticket/1527
*/ */
// @Test @Test
public void mediaListPlayerPlay() public void mediaListPlayerPlay()
{ {
libvlc_exception_t exception = new libvlc_exception_t(); libvlc_exception_t exception = new libvlc_exception_t();
...@@ -166,9 +167,7 @@ public class MediaListPlayerTest extends AbstractVLCInternalTest ...@@ -166,9 +167,7 @@ public class MediaListPlayerTest extends AbstractVLCInternalTest
} }
Thread.sleep(150); Thread.sleep(150);
} }
// FIXME give stats the time to run... there's probably a race condition in misc/stats.c:259 that Thread.sleep(400);
// needs to be fixed
// Thread.sleep(400);
libvlc.libvlc_media_list_player_stop(mediaListPlayer, exception); libvlc.libvlc_media_list_player_stop(mediaListPlayer, exception);
libvlc.libvlc_media_list_release(mediaList); libvlc.libvlc_media_list_release(mediaList);
libvlc.libvlc_media_list_player_release(mediaListPlayer); libvlc.libvlc_media_list_player_release(mediaListPlayer);
...@@ -208,20 +207,7 @@ public class MediaListPlayerTest extends AbstractVLCInternalTest ...@@ -208,20 +207,7 @@ public class MediaListPlayerTest extends AbstractVLCInternalTest
Thread.sleep(150); Thread.sleep(150);
} }
libvlc.libvlc_media_list_player_pause(mediaListPlayer, exception); 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); int state = libvlc.libvlc_media_list_player_get_state(mediaListPlayer, exception);
Assert.assertEquals(exception.message, 0, exception.raised); Assert.assertEquals(exception.message, 0, exception.raised);
Assert.assertEquals( Assert.assertEquals(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment