Merge pull request #253 from codelerity/test-fixes

Update tests to fix errors logged by GStreamer.

Author: neilcsmith-net

.github/workflows/maven.yml

@@ -8,56 +8,78 @@ on:
 
 jobs:
 
-  test-baseline:
+#  test-baseline:
+#
+#    runs-on: ubuntu-16.04
+#
+#    steps:
+#      - name: Checkout
+#        uses: actions/checkout@v2
+#      
+#      - name: Set up JDK 1.8
+#        uses: actions/setup-java@v1
+#        with:
+#         java-version: 1.8
+#      
+#      - name: Install GStreamer
+#        run: sudo apt-get update && sudo apt-get install gstreamer1.0-plugins-good
+#      
+#      - name: Build with Maven
+#        run: mvn -B verify --file pom.xml
+  
+  test-1-14:
 
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-18.04
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-         java-version: 1.8
+         java-version: '8'
+         distribution: 'temurin'
 
       - name: Install GStreamer
         run: sudo apt-get update && sudo apt-get install gstreamer1.0-plugins-good
 
       - name: Build with Maven
         run: mvn -B verify --file pom.xml
 
-  test-1-14:
+  test-1-16:
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-         java-version: 1.8
+         java-version: '8'
+         distribution: 'temurin'
 
       - name: Install GStreamer
-        run: sudo apt-get update && sudo apt-get install gstreamer1.0-plugins-good
+        run: sudo apt-get update && sudo apt-get install gstreamer1.0-plugins-good gstreamer1.0-plugins-bad
 
       - name: Build with Maven
         run: mvn -B verify --file pom.xml
-  
-  test-1-16:
 
-    runs-on: ubuntu-20.04
+  test-1-20:
+
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-         java-version: 1.8
+         java-version: '8'
+         distribution: 'temurin'
 
       - name: Install GStreamer
         run: sudo apt-get update && sudo apt-get install gstreamer1.0-plugins-good gstreamer1.0-plugins-bad

pom.xml

@@ -74,7 +74,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -107,7 +107,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.2</version>
+        <version>3.0.0-M7</version>
         <configuration>
           <!--<skipTests>true</skipTests>-->
           <forkCount>1</forkCount>

src/org/freedesktop/gstreamer/lowlevel/GlibAPI.java

@@ -106,6 +106,7 @@ interface GDestroyNotify extends Callback {
     int g_timeout_add_full(int priority, int interval, GSourceFunc function,
             Pointer data, GDestroyNotify notify);
     int g_timeout_add_seconds(int interval, GSourceFunc function, Pointer data);
+    GstAPI.GErrorStruct g_error_new(int quark, int code, String message);
     void g_error_free(Pointer error);
     void g_error_free(GstAPI.GErrorStruct error);
 

src/org/freedesktop/gstreamer/query/AllocationQuery.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Neil C Smith
+ * Copyright (c) 2022 Neil C Smith
  * Copyright (c) 2016 Christophe Lafolet
  *
  * This file is part of gstreamer-java.
@@ -25,7 +25,6 @@
 import org.freedesktop.gstreamer.lowlevel.GstQueryAPI;
 
 import com.sun.jna.Pointer;
-import org.freedesktop.gstreamer.glib.NativeObject;
 import org.freedesktop.gstreamer.glib.Natives;
 
 /**
@@ -45,10 +44,7 @@ public class AllocationQuery extends Query {
      * @param init initialization data.
      */
     AllocationQuery(Initializer init) {
-        // special case : no ref shall be added
-        // the allocationQuery is an in/out parameter during query notification
-        // so, we shall keep query writable for add methods
-        super(Natives.initializer(init.ptr.getPointer(), false, true));
+        super(init);
     }
 
     /**

test/org/freedesktop/gstreamer/BusTest.java

@@ -23,6 +23,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
+import org.freedesktop.gstreamer.lowlevel.GlibAPI;
 import org.freedesktop.gstreamer.lowlevel.GstAPI.GErrorStruct;
 import org.freedesktop.gstreamer.message.EOSMessage;
 import org.freedesktop.gstreamer.message.Message;
@@ -136,14 +137,15 @@ public void errorMessage() {
         };
         pipe.getBus().connect(errorSignal);
 
-        GErrorStruct msg = new GErrorStruct();
+        GErrorStruct msg = GlibAPI.GLIB_API.g_error_new(1, 1, "MSG");
         GSTELEMENT_API.gst_element_post_message(pipe.src,
                 GSTMESSAGE_API.gst_message_new_error(pipe.src, msg, "testing error messages"));
         pipe.play().run();
         pipe.getBus().disconnect(errorSignal);
         pipe.dispose();
         assertTrue("ERROR signal not received", signalFired.get());
         assertEquals("Incorrect source object on signal", pipe.src, signalSource.get());
+        GlibAPI.GLIB_API.g_error_free(msg);
     }
 
     @Test
@@ -160,7 +162,7 @@ public void warningMessage() {
         };
         pipe.getBus().connect(signal);
 
-        GErrorStruct msg = new GErrorStruct();
+        GErrorStruct msg = GlibAPI.GLIB_API.g_error_new(1, 1, "MSG");
         pipe.play();
         GSTELEMENT_API.gst_element_post_message(pipe.src,
                 GSTMESSAGE_API.gst_message_new_warning(pipe.src, msg, "testing warning messages"));
@@ -169,6 +171,7 @@ public void warningMessage() {
         pipe.dispose();
         assertTrue("WARNING signal not received", signalFired.get());
         assertEquals("Incorrect source object on signal", pipe.src, signalSource.get());
+        GlibAPI.GLIB_API.g_error_free(msg);
     }
 
     @Test
@@ -185,7 +188,7 @@ public void infoMessage() {
         };
         pipe.getBus().connect(signal);
 
-        GErrorStruct msg = new GErrorStruct();
+        GErrorStruct msg = GlibAPI.GLIB_API.g_error_new(1, 1, "MSG");
         pipe.play();
         GSTELEMENT_API.gst_element_post_message(pipe.src,
                 GSTMESSAGE_API.gst_message_new_info(pipe.src, msg, "testing info messages"));
@@ -194,6 +197,7 @@ public void infoMessage() {
         pipe.dispose();
         assertTrue("INFO signal not received", signalFired.get());
         assertEquals("Incorrect source object on signal", pipe.src, signalSource.get());
+        GlibAPI.GLIB_API.g_error_free(msg);
     }
 
     @Test

test/org/freedesktop/gstreamer/PadTest.java

@@ -66,8 +66,6 @@ public void setUp() throws Exception {
     public void tearDown() throws Exception {
     }
 
-    // Does not work yet (<- this comment was here in the 0.10 code)
-//    @Ignore("Didn't work in the 0.10 either by the comment so still ignored")
     @Test
     public void getPad() throws Exception {
         Element src = ElementFactory.make("fakesrc", "src");
@@ -78,26 +76,23 @@ public void getPad() throws Exception {
         assertNotNull("Could not get sink pad", sinkPad);
         src = null;
         sink = null;
-        WeakReference<Pad> srcRef = new WeakReference<Pad>(srcPad);
-        WeakReference<Pad> sinkRef = new WeakReference<Pad>(sinkPad);
+        WeakReference<Pad> srcRef = new WeakReference<>(srcPad);
+        WeakReference<Pad> sinkRef = new WeakReference<>(sinkPad);
         srcPad = null;
         sinkPad = null;
         assertTrue("Src pad not garbage collected", GCTracker.waitGC(srcRef));
         assertTrue("Sink pad not garbage collected", GCTracker.waitGC(sinkRef));
     }
 
     @Test
-    public void padLink()
-            throws Exception {
+    public void padLink() throws Exception {
         Element src = ElementFactory.make("fakesrc", "src");
         Element sink = ElementFactory.make("fakesink", "src");
         Pad srcPad = src.getStaticPad("src");
         Pad sinkPad = sink.getStaticPad("sink");
         srcPad.link(sinkPad);
     }
 
-//    @Ignore("This seems to fail because gst1.0 doesn't actually send the event because pads " +
-//    		"are now created in FLUSHING state")
     @Test
     public void addEventProbe() {
         Element elem = ElementFactory.make("identity", "src");
@@ -263,6 +258,9 @@ public PadProbeReturn dataReceived(Pad pad, Buffer buffer) {
         // push data
         res = src.push(buf2);
         assertNotSame("data_prober.probeData() should not have been called", buf2, b.get());
+
+        elem.stop();
+
     }
 
     @Test
@@ -278,8 +276,9 @@ public void addProbe_Data() {
         Pad.PROBE probe = (Pad pad, PadProbeInfo info) -> {
             assertTrue("Info type does not include buffer",
                     info.getType().contains(PadProbeType.BUFFER));
-            assertTrue(info.getEvent() == null);
-            assertTrue(info.getQuery() == null);
+            // These cause assertion messages to be logged by GStreamer
+            // assertTrue(info.getEvent() == null);
+            // assertTrue(info.getQuery() == null);
             b.set(info.getBuffer());
             return PadProbeReturn.OK;
         };
@@ -299,6 +298,9 @@ public void addProbe_Data() {
         // push data
         res = src.push(buf2);
         assertNotSame("Probe (Data) should not have been called", buf2, b.get());
+
+        elem.stop();
+
     }
 
     @Test
@@ -330,7 +332,6 @@ public void addProbe_Idle() {
     public void addProbe_Query() {
         ProbeTester.test(PadProbeType.QUERY_BOTH, info -> {
             Query q = info.getQuery();
-//            System.out.println(q.getStructure());
             return q instanceof AllocationQuery;
         });
 

test/org/freedesktop/gstreamer/event/EventTest.java

@@ -183,7 +183,7 @@ public static void tearDownClass() throws Exception {
         assertTrue("Event ref not collected after TagList is unreferenced", GCTracker.waitGC(evRef));
     }
     @Test public void Event_testGC() throws Exception {
-        Event ev = new LatencyEvent(ClockTime.NONE);
+        Event ev = new LatencyEvent(100);
         @SuppressWarnings("unused")
         Structure s = ev.getStructure();
         WeakReference<Event> evRef = new WeakReference<Event>(ev);

test/org/freedesktop/gstreamer/lowlevel/ReferenceManagerTest.java

@@ -70,7 +70,7 @@ public boolean waitGC(Reference<? extends Object> ref) throws InterruptedExcepti
 
     @Test public void testReference() throws Exception {
         Object ref = new Object();
-        Caps target = new Caps("video/x-raw-rgb");
+        Caps target = new Caps("video/x-raw");
         ReferenceManager.addKeepAliveReference(ref, target);
         WeakReference<Object> targetRef = new WeakReference<Object>(target);
         target = null;
@@ -81,7 +81,7 @@ public boolean waitGC(Reference<? extends Object> ref) throws InterruptedExcepti
     @Test public void testMultipleReferences() throws Exception {
         Object ref1 = new Object();
         Object ref2 = new Object();
-        Caps target = new Caps("video/x-raw-rgb");
+        Caps target = new Caps("video/x-raw");
         ReferenceManager.addKeepAliveReference(ref1, target);
         ReferenceManager.addKeepAliveReference(ref2, target);
         WeakReference<Object> targetRef = new WeakReference<Object>(target);