From ab81de3e2a0bac2ce104ca8445daf61ddf5d6fd0 Mon Sep 17 00:00:00 2001 From: Filippo Carone Date: Sun, 14 Dec 2008 22:23:06 +0100 Subject: [PATCH] jvlc: various unit tests fixes --- .../src/test/java/org/videolan/jvlc/AbstractJVLCTest.java | 2 +- .../org/videolan/jvlc/internal/AbstractVLCInternalTest.java | 6 +++++- .../org/videolan/jvlc/internal/MediaListPlayerTest.java | 4 ---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/AbstractJVLCTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/AbstractJVLCTest.java index 86d6b27544..077fe9caf5 100644 --- a/bindings/java/core/src/test/java/org/videolan/jvlc/AbstractJVLCTest.java +++ b/bindings/java/core/src/test/java/org/videolan/jvlc/AbstractJVLCTest.java @@ -47,7 +47,7 @@ public abstract class AbstractJVLCTest protected String mrl; - private String address = "http://streams.videolan.org/streams-videolan/reference/mp4/bl.mp4"; + private String address = "http://streams.videolan.org/streams-videolan/avi/Hero-Div3.avi"; /** * Logger. diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/AbstractVLCInternalTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/AbstractVLCInternalTest.java index efdcbcb621..defc8da0c9 100644 --- a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/AbstractVLCInternalTest.java +++ b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/AbstractVLCInternalTest.java @@ -54,7 +54,7 @@ public abstract class AbstractVLCInternalTest protected libvlc_exception_t exception; - private String address = "http://streams.videolan.org/streams-videolan/reference/avi/Hero-Div3.avi"; + private String address = "http://streams.videolan.org/streams-videolan/avi/Hero-Div3.avi"; /** * Logger. @@ -123,6 +123,10 @@ public abstract class AbstractVLCInternalTest out.write(buffer, 0, numRead); numWritten += numRead; } + if (numWritten == 0) + { + throw new RuntimeException("Cannot download sample, please check the url or your internet connection."); + } log.info("Sample downloaded."); mrl = testResoucesPath + ".avi"; } diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java index 994282f79d..a84ba01e69 100644 --- a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java +++ b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java @@ -98,9 +98,6 @@ public class MediaListPlayerTest extends AbstractVLCInternalTest libvlc.libvlc_media_list_player_release(mediaListPlayer); } - /** - * this fails: see https://trac.videolan.org/vlc/ticket/1527 - */ @Test public void mediaListPlayerPlay() { @@ -115,7 +112,6 @@ public class MediaListPlayerTest extends AbstractVLCInternalTest Assert.assertEquals("Exception message: " + exception.message + ".\n", 0, exception.raised); libvlc.libvlc_media_release(mediaDescriptor); libvlc.libvlc_media_list_release(mediaList); - libvlc.libvlc_media_list_player_release(mediaListPlayer); } @Test -- 2.39.5