jvlc: download a sample file to run tests, if needed

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

diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaDescriptorTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaDescriptorTest.java
index f2ce1669e7530169b3e81bc20b2374134cb7a2f1..204201400c28e77da0089fcd4dd6081767b455d9 100644 (file)
--- a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaDescriptorTest.java
+++ b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaDescriptorTest.java
@@ -27,41 +27,19 @@ 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.libvlc_exception_t;
 
 
-public class MediaDescriptorTest
+public class MediaDescriptorTest extends AbstractVLCInternalTest
 {
     
-    private LibVlc libvlc = LibVlc.SYNC_INSTANCE;
-
-    private LibVlcInstance libvlcInstance;
-    
-    private String mrl = this.getClass().getResource("/raffa_voice.ogg").getPath();
-
-    @Before
-    public void testSetup()
-    {
-        libvlc_exception_t exception = new libvlc_exception_t();
-        libvlcInstance = libvlc.libvlc_new(0, new String[]{"-I","dummy","--aout=dummy","--vout=dummy"}, exception);
-    }
-
-    @After
-    public void tearDown()
-    {
-        libvlc.libvlc_release(libvlcInstance);
-    }
-
     @Test
     public void mediaDescriptorNew() throws Exception
     {
         libvlc_exception_t exception = new libvlc_exception_t();
-        LibVlcMediaDescriptor md = libvlc.libvlc_media_descriptor_new(libvlcInstance, mrl, exception);
+        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
         Assert.assertNotNull(md);
         Assert.assertEquals(0, exception.raised);
     }
@@ -70,8 +48,8 @@ public class MediaDescriptorTest
     public void mediaDescriptorGetMrl()
     {
         libvlc_exception_t exception = new libvlc_exception_t();
-        LibVlcMediaDescriptor md = libvlc.libvlc_media_descriptor_new(libvlcInstance, mrl, exception);
-        String mdMrl = libvlc.libvlc_media_descriptor_get_mrl(md);
+        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        String mdMrl = libvlc.libvlc_media_get_mrl(md);
         Assert.assertEquals(mrl, mdMrl);
     }