jvlc: remove MediaInstace

[vlc] / bindings / java / core / src / test / java / org / videolan / jvlc / internal / MediaListTest.java

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 5fec3e277f8ec1d3b356dd715fbc33ba442a9070..b40aceac84c09d1ea41e8f524221a9882562e182 100644 (file)
--- 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
@@ -71,11 +71,11 @@ public class MediaListTest
         libvlc_exception_t exception = new libvlc_exception_t();
         LibVlcMediaList mediaList = libvlc.libvlc_media_list_new(libvlcInstance, exception);
         String mrl = this.getClass().getResource("/raffa_voice.ogg").getPath();
-        LibVlcMediaDescriptor libvlc_media_descriptor = libvlc.libvlc_media_descriptor_new(
+        LibVlcMediaDescriptor libvlc_media = libvlc.libvlc_media_new(
             libvlcInstance,
             mrl,
             exception);
-        libvlc.libvlc_media_list_add_media_descriptor(mediaList, libvlc_media_descriptor, exception);
+        libvlc.libvlc_media_list_add_media(mediaList, libvlc_media, exception);
         Assert.assertEquals(0, exception.raised);
     }
 
@@ -85,16 +85,16 @@ public class MediaListTest
         libvlc_exception_t exception = new libvlc_exception_t();
         LibVlcMediaList mediaList = libvlc.libvlc_media_list_new(libvlcInstance, exception);
         String mrl = this.getClass().getResource("/raffa_voice.ogg").getPath();
-        LibVlcMediaDescriptor libvlc_media_descriptor = libvlc.libvlc_media_descriptor_new(
+        LibVlcMediaDescriptor libvlc_media = libvlc.libvlc_media_new(
             libvlcInstance,
             mrl,
             exception);
-        libvlc.libvlc_media_list_add_media_descriptor(mediaList, libvlc_media_descriptor, exception);
+        libvlc.libvlc_media_list_add_media(mediaList, libvlc_media, exception);
         int result = libvlc.libvlc_media_list_count(mediaList, exception);
         Assert.assertEquals(1, result);
         Assert.assertEquals(0, exception.raised);
 
-        libvlc.libvlc_media_list_add_media_descriptor(mediaList, libvlc_media_descriptor, exception);
+        libvlc.libvlc_media_list_add_media(mediaList, libvlc_media, exception);
         result = libvlc.libvlc_media_list_count(mediaList, exception);
         Assert.assertEquals(2, result);
         Assert.assertEquals(0, exception.raised);
@@ -115,14 +115,51 @@ public class MediaListTest
         libvlc_exception_t exception = new libvlc_exception_t();
         LibVlcMediaList mediaList = libvlc.libvlc_media_list_new(libvlcInstance, exception);
         String mrl = this.getClass().getResource("/raffa_voice.ogg").getPath();
-        LibVlcMediaDescriptor libvlc_media_descriptor = libvlc.libvlc_media_descriptor_new(
+        LibVlcMediaDescriptor libvlc_media = libvlc.libvlc_media_new(
             libvlcInstance,
             mrl,
             exception);
-        libvlc.libvlc_media_list_add_media_descriptor(mediaList, libvlc_media_descriptor, exception);
-        int index = libvlc.libvlc_media_list_index_of_item(mediaList, libvlc_media_descriptor, exception);
+        libvlc.libvlc_media_list_add_media(mediaList, libvlc_media, exception);
+        int index = libvlc.libvlc_media_list_index_of_item(mediaList, libvlc_media, exception);
         Assert.assertEquals(0, index);
         Assert.assertEquals(0, exception.raised);
     }
 
+    @Test
+    public void mediaListRemoveIndexTest()
+    {
+        libvlc_exception_t exception = new libvlc_exception_t();
+        LibVlcMediaList mediaList = libvlc.libvlc_media_list_new(libvlcInstance, exception);
+        String mrl = this.getClass().getResource("/raffa_voice.ogg").getPath();
+        LibVlcMediaDescriptor libvlc_media = libvlc.libvlc_media_new(
+            libvlcInstance,
+            mrl,
+            exception);
+        libvlc.libvlc_media_list_add_media(mediaList, libvlc_media, exception);
+        libvlc.libvlc_media_list_remove_index(mediaList, 0, exception);
+        Assert.assertEquals(0, exception.raised);
+    }
+
+    @Test
+    public void mediaListRemoveIndexTest2()
+    {
+        libvlc_exception_t exception = new libvlc_exception_t();
+        LibVlcMediaList mediaList = libvlc.libvlc_media_list_new(libvlcInstance, exception);
+        String mrl = this.getClass().getResource("/raffa_voice.ogg").getPath();
+        LibVlcMediaDescriptor libvlc_media = libvlc.libvlc_media_new(
+            libvlcInstance,
+            mrl,
+            exception);
+        libvlc.libvlc_media_list_add_media(mediaList, libvlc_media, exception);
+        libvlc.libvlc_media_list_remove_index(mediaList, 0, exception);
+        Assert.assertEquals(0, exception.raised);
+
+        libvlc_media = libvlc.libvlc_media_new(
+            libvlcInstance,
+            mrl,
+            exception);
+        libvlc.libvlc_media_list_add_media(mediaList, libvlc_media, exception);
+        libvlc.libvlc_media_list_remove_index(mediaList, 0, exception);
+    }   
+    
 }