X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bindings%2Fjava%2Fcore%2Fsrc%2Ftest%2Fjava%2Forg%2Fvideolan%2Fjvlc%2Finternal%2FMediaListTest.java;h=c9acec01809963676a7acba9774c6f85a7fbb002;hb=b774d66a9a2a48e42fc20c54a16e12ae840d1a83;hp=b34994a5b91e499e202d9b564d18f765e48a6d64;hpb=5f584e4c451865ea350cd54e28a4d1417d50e9c6;p=vlc

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 b34994a5b9..c9acec0180 100644
--- 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
@@ -27,35 +27,15 @@ package org.videolan.jvlc.internal;
 
 import junit.framework.Assert;
 
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
-import org.videolan.jvlc.internal.LibVlc.LibVlcInstance;
 import org.videolan.jvlc.internal.LibVlc.LibVlcMediaDescriptor;
 import org.videolan.jvlc.internal.LibVlc.LibVlcMediaList;
 import org.videolan.jvlc.internal.LibVlc.libvlc_exception_t;
 
 
-public class MediaListTest
+public class MediaListTest extends AbstractVLCInternalTest
 {
 
-    private LibVlc libvlc = LibVlc.SYNC_INSTANCE;
-
-    private LibVlcInstance libvlcInstance;
-
-    @Before
-    public void testSetup()
-    {
-        libvlc_exception_t exception = new libvlc_exception_t();
-        libvlcInstance = libvlc.libvlc_new(0, new String[]{}, exception);
-    }
-
-    @After
-    public void tearDown()
-    {
-        libvlc.libvlc_release(libvlcInstance);
-    }
-
     @Test
     public void mediaListNew()
     {
@@ -71,11 +51,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 +65,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,12 +95,12 @@ 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);
     }
@@ -131,11 +111,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);
         libvlc.libvlc_media_list_remove_index(mediaList, 0, exception);
         Assert.assertEquals(0, exception.raised);
     }
@@ -146,19 +126,19 @@ 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);
         libvlc.libvlc_media_list_remove_index(mediaList, 0, exception);
         Assert.assertEquals(0, exception.raised);
 
-        libvlc_media_descriptor = libvlc.libvlc_media_descriptor_new(
+        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);
         libvlc.libvlc_media_list_remove_index(mediaList, 0, exception);
     }