Commit 940734d9 authored by Filippo Carone's avatar Filippo Carone

unit tests update

parent fea85dea
...@@ -40,7 +40,7 @@ public class MediaListTest ...@@ -40,7 +40,7 @@ public class MediaListTest
@Before @Before
public void setup() public void setup()
{ {
jvlc = new JVLC(); jvlc = new JVLC("-vvv -I dummy --aout=dummy --vout=dummy");
} }
@Test @Test
......
...@@ -40,7 +40,7 @@ public class LibVlcCoreTest ...@@ -40,7 +40,7 @@ public class LibVlcCoreTest
public void testNew() throws Exception public void testNew() throws Exception
{ {
libvlc_exception_t exception = new libvlc_exception_t(); 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.assertNotNull(libvlcInstance);
Assert.assertEquals(0, exception.raised); Assert.assertEquals(0, exception.raised);
} }
......
...@@ -50,7 +50,7 @@ public class LibVlcMediaInstanceTest ...@@ -50,7 +50,7 @@ public class LibVlcMediaInstanceTest
public void testSetup() public void testSetup()
{ {
exception = new libvlc_exception_t(); 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); libvlc.libvlc_exception_clear(exception);
} }
......
...@@ -48,7 +48,7 @@ public class MediaDescriptorTest ...@@ -48,7 +48,7 @@ public class MediaDescriptorTest
public void testSetup() public void testSetup()
{ {
libvlc_exception_t exception = new libvlc_exception_t(); 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 @After
......
...@@ -25,8 +25,6 @@ ...@@ -25,8 +25,6 @@
package org.videolan.jvlc.internal; package org.videolan.jvlc.internal;
import java.io.File;
import junit.framework.Assert; import junit.framework.Assert;
import org.junit.After; import org.junit.After;
...@@ -53,7 +51,7 @@ public class MediaListPlayerTest ...@@ -53,7 +51,7 @@ public class MediaListPlayerTest
public void testSetup() throws Exception public void testSetup() throws Exception
{ {
libvlc_exception_t exception = new libvlc_exception_t(); 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. // use the following line to use your audio card.
// libvlcInstance = libvlc.libvlc_new(0, new String[]{}, exception); // libvlcInstance = libvlc.libvlc_new(0, new String[]{}, exception);
} }
...@@ -181,7 +179,20 @@ public class MediaListPlayerTest ...@@ -181,7 +179,20 @@ public class MediaListPlayerTest
} }
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
// 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_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 @Test
...@@ -194,6 +205,19 @@ public class MediaListPlayerTest ...@@ -194,6 +205,19 @@ public class MediaListPlayerTest
libvlc.libvlc_media_list_add_media_descriptor(mediaList, mediaDescriptor, exception); 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_set_media_list(mediaListPlayer, mediaList, exception);
libvlc.libvlc_media_list_player_play_item(mediaListPlayer, mediaDescriptor, 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); libvlc.libvlc_media_list_player_pause(mediaListPlayer, exception);
Assert.assertEquals(0, exception.raised); Assert.assertEquals(0, exception.raised);
while (true) while (true)
...@@ -212,16 +236,9 @@ public class MediaListPlayerTest ...@@ -212,16 +236,9 @@ public class MediaListPlayerTest
int state = libvlc.libvlc_media_list_player_get_state(mediaListPlayer, exception); int state = libvlc.libvlc_media_list_player_get_state(mediaListPlayer, exception);
Assert.assertEquals("Expected state: " + LibVlcState.libvlc_Paused +".\n", LibVlcState.libvlc_Paused.ordinal(), state); 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_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 @Test
public void mediaListPlayerSetMediaInstance() public void mediaListPlayerSetMediaInstance()
......
...@@ -47,7 +47,7 @@ public class MediaListTest ...@@ -47,7 +47,7 @@ public class MediaListTest
public void testSetup() public void testSetup()
{ {
libvlc_exception_t exception = new libvlc_exception_t(); 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 @After
......
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