[gstreamermm] tests: fix signed-compare error



commit 6253e73415551e701c8e81bde9566927f55c1298
Author: Marcin Kolny <marcin kolny gmail com>
Date:   Sat Aug 8 09:37:06 2015 +0000

    tests: fix signed-compare error
    
        * gstreamer/gstreamermm/register.h:
        * tests/test-allocator.cc:
        * tests/test-atomicqueue.cc:
        * tests/test-bin.cc:
        * tests/test-buffer.cc:
        * tests/test-capsfeatures.cc:
        * tests/test-init.cc: some constant values had to be replaced with
          'unsigned' literals.

 gstreamer/gstreamermm/register.h |    2 +-
 tests/test-allocator.cc          |   12 ++++++------
 tests/test-atomicqueue.cc        |    6 +++---
 tests/test-bin.cc                |    4 ++--
 tests/test-buffer.cc             |    4 ++--
 tests/test-capsfeatures.cc       |    6 +++---
 tests/test-init.cc               |   10 +++++-----
 7 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/gstreamer/gstreamermm/register.h b/gstreamer/gstreamermm/register.h
index 33ee09b..ed9b0bb 100644
--- a/gstreamer/gstreamermm/register.h
+++ b/gstreamer/gstreamermm/register.h
@@ -125,7 +125,7 @@ register_mm_type(const gchar * type_name)
         info.class_finalize = nullptr;
         info.class_data = nullptr;
         info.instance_size = sizeof(GlibCppType);
-        info.n_preallocs = nullptr;
+        info.n_preallocs = 0;
         info.instance_init = (GInstanceInitFunc) &GlibCppType::init;
         info.value_table = nullptr;
 
diff --git a/tests/test-allocator.cc b/tests/test-allocator.cc
index 1e928b3..9f460da 100644
--- a/tests/test-allocator.cc
+++ b/tests/test-allocator.cc
@@ -36,8 +36,8 @@ TEST(AllocatorTest, ShouldCorrectAllocateMemory)
   Glib::RefPtr<Memory> mem = allocator->alloc(10, params);
 
   ASSERT_TRUE(mem);
-  EXPECT_EQ(10, mem->get_size());
-  EXPECT_EQ(7, mem->get_align());
+  EXPECT_EQ(10ul, mem->get_size());
+  EXPECT_EQ(7ul, mem->get_align());
   EXPECT_TRUE(flags & mem->get_flags());
 
   allocator->free(mem);
@@ -91,8 +91,8 @@ TEST(AllocatorTest, DerivedFromAllocatorShouldReturnProperlyRefcountedWrappedGst
   ASSERT_TRUE(mem->gobj());
   ASSERT_TRUE(GST_IS_MINI_OBJECT_TYPE(mem->gobj(), GST_TYPE_MEMORY));
   ASSERT_EQ(1, mem->get_refcount());
-  EXPECT_EQ(10, mem->get_size());
-  EXPECT_EQ(7, mem->get_align());
+  EXPECT_EQ(10ul, mem->get_size());
+  EXPECT_EQ(7ul, mem->get_align());
   EXPECT_TRUE(flags & mem->get_flags());
 
   allocator->free(mem);
@@ -114,8 +114,8 @@ TEST(AllocatorTest, DerivedFromAllocatorShouldReturnProperlyRefcountedGstMemory)
   ASSERT_TRUE(mem);
   ASSERT_TRUE(GST_IS_MINI_OBJECT_TYPE(mem, GST_TYPE_MEMORY));
   ASSERT_EQ(1, mem->mini_object.refcount);
-  EXPECT_EQ(10, mem->size);
-  EXPECT_EQ(7, mem->align);
+  EXPECT_EQ(10ul, mem->size);
+  EXPECT_EQ(7ul, mem->align);
   EXPECT_TRUE(flags & mem->mini_object.flags);
   gst_allocator_free(allocator->gobj(), mem);
 }
diff --git a/tests/test-atomicqueue.cc b/tests/test-atomicqueue.cc
index 789cfa0..48b8dcc 100644
--- a/tests/test-atomicqueue.cc
+++ b/tests/test-atomicqueue.cc
@@ -20,7 +20,7 @@ TEST(AtomicQueueTest, ShouldReturnFirstElementInQueueAndNotRemoveIt)
        queue->push(9);
 
        ASSERT_EQ(12, queue->peek());
-       ASSERT_EQ(3, queue->length());
+       ASSERT_EQ(3u, queue->length());
 }
 
 TEST(AtomicQueueTest, ShouldThrowExceptionOnPeekIfQueueIsEmpty)
@@ -38,7 +38,7 @@ TEST(AtomicQueueTest, ShouldReturnFirstElementAndRemoveIt)
        queue->push(10);
 
        ASSERT_EQ(7, queue->pop());
-       ASSERT_EQ(2, queue->length());
+       ASSERT_EQ(2u, queue->length());
 }
 
 TEST(AtomicQueueTest, ShouldImitateGstAtomicQueueStructByGpointerAsTemplate)
@@ -56,6 +56,6 @@ TEST(AtomicQueueTest, ShouldImitateGstAtomicQueueStructByGpointerAsTemplate)
        ASSERT_EQ(new_element, element);
        EXPECT_STREQ("dummy-name", gst_element_get_name(new_element));
        delete new_data;
-       ASSERT_EQ(1, GST_OBJECT_REFCOUNT(element));
+       ASSERT_EQ(1u, GST_OBJECT_REFCOUNT(element));
        gst_object_unref(element);
 }
diff --git a/tests/test-bin.cc b/tests/test-bin.cc
index 08eaec2..f6deebd 100644
--- a/tests/test-bin.cc
+++ b/tests/test-bin.cc
@@ -148,7 +148,7 @@ TEST_F(BinTest, ShouldCorrectIterateElements)
     elements.erase(pos);
   }
 
-  ASSERT_EQ(0, elements.size());
+  ASSERT_EQ(0u, elements.size());
 }
 
 TEST_F(BinTest, ShouldContainsAddedElements)
@@ -165,7 +165,7 @@ TEST_F(BinTest, ShouldContainsAddedElements)
     ASSERT_NE(elements.end(), pos);
     elements.erase(pos);
   }
-  ASSERT_EQ(0, elements.size());
+  ASSERT_EQ(0u, elements.size());
 }
 
 TEST_F(BinTest, ShouldCallOnElementAddedHandler)
diff --git a/tests/test-buffer.cc b/tests/test-buffer.cc
index 89cd76e..7ad1c27 100644
--- a/tests/test-buffer.cc
+++ b/tests/test-buffer.cc
@@ -13,7 +13,7 @@ using namespace Gst;
 
 TEST(BufferTest, CheckBufferSize)
 {
-    int buff_size = 23;
+    gsize buff_size = 23;
     Glib::RefPtr<Buffer> buf = Buffer::create(buff_size);
     Glib::RefPtr<MapInfo> map_info(new MapInfo());
 
@@ -111,7 +111,7 @@ TEST(BufferTest, CheckBufferCopyIntoMethod)
   src->unmap(info);
 
   Gst::Buffer::copy_into(dest, src, BUFFER_COPY_TIMESTAMPS | BUFFER_COPY_MEMORY, 0, data.size());
-  ASSERT_EQ(dest->get_pts(), 10);
+  ASSERT_EQ(dest->get_pts(), 10ul);
   ASSERT_EQ(data.size(), dest->get_size());
 
   ASSERT_EQ(0, dest->memcmp(0, data.data(), data.size()));
diff --git a/tests/test-capsfeatures.cc b/tests/test-capsfeatures.cc
index 5e14aa1..0e06c73 100644
--- a/tests/test-capsfeatures.cc
+++ b/tests/test-capsfeatures.cc
@@ -13,16 +13,16 @@ using namespace Gst;
 TEST(CapsFeaturesTest, ShouldCorrectCreateEmptyFeature)
 {
     CapsFeatures features;
-    ASSERT_EQ(0, features.get_size());
+    ASSERT_EQ(0u, features.get_size());
 }
 
 TEST(CapsFeaturesTest, AddRemoveFeaturesShouldWorkProperly)
 {
     CapsFeatures features (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY);
-    ASSERT_EQ(1, features.get_size());
+    ASSERT_EQ(1u, features.get_size());
     ASSERT_STREQ(GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY, features.get_nth(0).c_str());
     features.remove(GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY);
-    ASSERT_EQ(0, features.get_size());
+    ASSERT_EQ(0u, features.get_size());
 }
 
 
diff --git a/tests/test-init.cc b/tests/test-init.cc
index 243693a..efbd085 100644
--- a/tests/test-init.cc
+++ b/tests/test-init.cc
@@ -36,11 +36,11 @@ TEST(InitTest, ShouldReturnCorrectGstreamerVersion)
 {
   guint major, minor, micro, nano;
   version(major, minor, micro, nano);
-
-  EXPECT_EQ(major, GST_VERSION_MAJOR);
-  EXPECT_EQ(minor, GST_VERSION_MINOR);
-  EXPECT_EQ(micro, GST_VERSION_MICRO);
-  EXPECT_EQ(nano, GST_VERSION_NANO);
+  /* todo fix it in gstreamer */
+  EXPECT_EQ(major, (guint)GST_VERSION_MAJOR);
+  EXPECT_EQ(minor, (guint)GST_VERSION_MINOR);
+  EXPECT_EQ(micro, (guint)GST_VERSION_MICRO);
+  EXPECT_EQ(nano, (guint)GST_VERSION_NANO);
 }
 
 TEST(InitTest, ShouldCorrectSetsSIGSEVHandling)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]