jvlc tests: avoid a libvlc_media_player race condition
authorFilippo Carone <littlejohn@videolan.org>
Sun, 20 Jul 2008 09:24:33 +0000 (11:24 +0200)
committerFilippo Carone <littlejohn@videolan.org>
Sun, 20 Jul 2008 09:28:14 +0000 (11:28 +0200)
bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaInstanceTest.java [deleted file]
bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaPlayerTest.java [new file with mode: 0644]

diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaInstanceTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaInstanceTest.java
deleted file mode 100644 (file)
index 3b97110..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-/*****************************************************************************
- * LibVlcMediaInstanceTest.java: VLC Java Bindings
- *****************************************************************************
- * Copyright (C) 1998-2008 the VideoLAN team
- *
- * Authors: Filippo Carone <filippo@carone.org>
- *
- *
- * $Id $
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
- *****************************************************************************/
-
-package org.videolan.jvlc.internal;
-
-import org.junit.After;
-import org.junit.Assert;
-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.LibVlcMediaInstance;
-import org.videolan.jvlc.internal.LibVlc.libvlc_exception_t;
-
-
-public class LibVlcMediaInstanceTest
-{
-    
-    private LibVlc libvlc = LibVlc.SYNC_INSTANCE;
-
-    private LibVlcInstance libvlcInstance;
-
-    private String mrl = this.getClass().getResource("/raffa_voice.ogg").getPath();
-
-    private libvlc_exception_t exception;
-
-    @Before
-    public void testSetup()
-    {
-        exception = new libvlc_exception_t();
-        libvlcInstance = libvlc.libvlc_new(0, new String[]{"-vvv","-I","dummy","-aout=dummy","-vout=dummy"}, exception);
-        libvlc.libvlc_exception_clear(exception);
-    }
-    
-    @After
-    public void tearDown()
-    {
-        libvlc.libvlc_release(libvlcInstance);
-        libvlc.libvlc_exception_clear(exception);
-    }
-    
-    @Test
-    public void mediaInstanceNew()
-    {
-        LibVlcMediaInstance instance = libvlc.libvlc_media_player_new(libvlcInstance, exception);
-        Assert.assertNotNull(instance);
-        Assert.assertEquals(0, exception.raised);
-    }
-    
-    @Test
-    public void mediaInstancePlayBad()
-    {
-        LibVlcMediaInstance instance = libvlc.libvlc_media_player_new(libvlcInstance, exception);
-        libvlc.libvlc_media_player_play(instance, exception);
-        Assert.assertEquals(1, exception.raised); // no associated media descriptor
-    }
-    
-    @Test
-    public void mediaInstancePlay()
-    {
-        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
-        LibVlcMediaInstance mi = libvlc.libvlc_media_player_new_from_media(md, exception);
-        libvlc.libvlc_media_player_play(mi, exception);
-        Assert.assertEquals(0, exception.raised);
-    }
-    
-    @Test
-    public void mediaInstancePauseBad()
-    {
-        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
-        LibVlcMediaInstance mi = libvlc.libvlc_media_player_new_from_media(md, exception);
-        libvlc.libvlc_media_player_pause(mi, exception);
-        Assert.assertEquals(1, exception.raised);
-    }
-    
-    @Test
-    public void mediaInstancePause()
-    {
-        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
-        LibVlcMediaInstance mi = libvlc.libvlc_media_player_new_from_media(md, exception);
-        libvlc.libvlc_media_player_play(mi, exception);
-        libvlc.libvlc_media_player_pause(mi, exception);
-        Assert.assertEquals(0, exception.raised);
-    }
-    
-    @Test
-    public void mediaInstanceSetPosition()
-    {
-        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
-        LibVlcMediaInstance mi = libvlc.libvlc_media_player_new_from_media(md, exception);
-        libvlc.libvlc_media_player_play(mi, exception);
-        libvlc.libvlc_media_player_set_position(mi, 0.5f, exception);
-        Assert.assertEquals(0, exception.raised);
-        float position = libvlc.libvlc_media_player_get_position(mi, exception);
-        Assert.assertTrue("Position is: " + position, position >= 0.5f);
-    }
-    
-    @Test
-    public void mediaInstanceStop()
-    {
-        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
-        LibVlcMediaInstance mi = libvlc.libvlc_media_player_new_from_media(md, exception);
-        libvlc.libvlc_media_player_stop(mi, exception);
-        Assert.assertEquals(0, exception.raised);
-    }
-    
-    @Test
-    public void mediaInstanceStop2()
-    {
-        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
-        LibVlcMediaInstance mi = libvlc.libvlc_media_player_new_from_media(md, exception);
-        libvlc.libvlc_media_player_play(mi, exception);
-        libvlc.libvlc_media_player_stop(mi, exception);
-        Assert.assertEquals(0, exception.raised);
-    }
-    
-}
diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaPlayerTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaPlayerTest.java
new file mode 100644 (file)
index 0000000..e421e23
--- /dev/null
@@ -0,0 +1,140 @@
+/*****************************************************************************
+ * LibVlcMediaInstanceTest.java: VLC Java Bindings
+ *****************************************************************************
+ * Copyright (C) 1998-2008 the VideoLAN team
+ *
+ * Authors: Filippo Carone <filippo@carone.org>
+ *
+ *
+ * $Id $
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+
+package org.videolan.jvlc.internal;
+
+import org.junit.After;
+import org.junit.Assert;
+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.LibVlcMediaInstance;
+import org.videolan.jvlc.internal.LibVlc.libvlc_exception_t;
+
+
+public class LibVlcMediaPlayerTest
+{
+    
+    private LibVlc libvlc = LibVlc.SYNC_INSTANCE;
+
+    private LibVlcInstance libvlcInstance;
+
+    private String mrl = this.getClass().getResource("/raffa_voice.ogg").getPath();
+
+    private libvlc_exception_t exception;
+
+    @Before
+    public void testSetup()
+    {
+        exception = new libvlc_exception_t();
+        libvlcInstance = libvlc.libvlc_new(0, new String[]{"-vvv","-I","dummy","-aout=dummy","-vout=dummy"}, exception);
+        libvlc.libvlc_exception_clear(exception);
+    }
+    
+    @After
+    public void tearDown()
+    {
+        libvlc.libvlc_release(libvlcInstance);
+        libvlc.libvlc_exception_clear(exception);
+    }
+    
+    @Test
+    public void mediaInstanceNew()
+    {
+        LibVlcMediaInstance instance = libvlc.libvlc_media_player_new(libvlcInstance, exception);
+        Assert.assertNotNull(instance);
+        Assert.assertEquals(0, exception.raised);
+    }
+    
+    @Test
+    public void mediaInstancePlayBad()
+    {
+        LibVlcMediaInstance instance = libvlc.libvlc_media_player_new(libvlcInstance, exception);
+        libvlc.libvlc_media_player_play(instance, exception);
+        Assert.assertEquals(1, exception.raised); // no associated media descriptor
+    }
+    
+    @Test
+    public void mediaInstancePlay()
+    {
+        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMediaInstance mi = libvlc.libvlc_media_player_new_from_media(md, exception);
+        libvlc.libvlc_media_player_play(mi, exception);
+        Assert.assertEquals(0, exception.raised);
+    }
+    
+    @Test
+    public void mediaInstancePauseBad()
+    {
+        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMediaInstance mi = libvlc.libvlc_media_player_new_from_media(md, exception);
+        libvlc.libvlc_media_player_pause(mi, exception);
+        Assert.assertEquals(1, exception.raised);
+    }
+    
+    @Test
+    public void mediaInstancePause()
+    {
+        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMediaInstance mi = libvlc.libvlc_media_player_new_from_media(md, exception);
+        libvlc.libvlc_media_player_play(mi, exception);
+        libvlc.libvlc_media_player_pause(mi, exception);
+        Assert.assertEquals(0, exception.raised);
+    }
+    
+    @Test
+    public void mediaInstanceSetPosition()
+    {
+        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMediaInstance mi = libvlc.libvlc_media_player_new_from_media(md, exception);
+        libvlc.libvlc_media_player_play(mi, exception);
+        libvlc.libvlc_media_player_set_position(mi, 0.5f, exception);
+        Assert.assertEquals(0, exception.raised);
+        float position = libvlc.libvlc_media_player_get_position(mi, exception);
+        Assert.assertTrue("Position is: " + position, position >= 0.5f);
+    }
+    
+    @Test
+    public void mediaInstanceStop()
+    {
+        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMediaInstance mi = libvlc.libvlc_media_player_new_from_media(md, exception);
+        libvlc.libvlc_media_player_stop(mi, exception);
+        Assert.assertEquals(0, exception.raised);
+    }
+    
+    @Test
+    public void mediaInstanceStop2() throws Exception
+    {
+        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMediaInstance mi = libvlc.libvlc_media_player_new_from_media(md, exception);
+        libvlc.libvlc_media_player_play(mi, exception);
+        Thread.sleep(100);
+        libvlc.libvlc_media_player_stop(mi, exception);
+        Assert.assertEquals(0, exception.raised);
+    }
+    
+}