[Tests] Update testcases to support 0-init dimension

This patch updates testcases to support dimension,
filled 0 by default.

Signed-off-by: Yelin Jeong <yelini.jeong@samsung.com>

diff --git a/tests/common/unittest_common.cc b/tests/common/unittest_common.cc
index ef002e3..9839f2f 100644 (file)
--- a/tests/common/unittest_common.cc
+++ b/tests/common/unittest_common.cc
@@ -300,7 +300,6 @@ TEST (commonGetTensorDimension, case2)
   EXPECT_EQ (dim[0], 345U);
   EXPECT_EQ (dim[1], 123U);
   EXPECT_EQ (dim[2], 433U);
-  EXPECT_EQ (dim[3], 1U);
 
   dim_str = gst_tensor_get_dimension_string (dim);
   EXPECT_TRUE (gst_tensor_dimension_string_is_equal (dim_str, "345:123:433:1"));
@@ -320,8 +319,6 @@ TEST (commonGetTensorDimension, case3)
   EXPECT_EQ (rank, 2U);
   EXPECT_EQ (dim[0], 345U);
   EXPECT_EQ (dim[1], 123U);
-  EXPECT_EQ (dim[2], 1U);
-  EXPECT_EQ (dim[3], 1U);
 
   dim_str = gst_tensor_get_dimension_string (dim);
   EXPECT_TRUE (gst_tensor_dimension_string_is_equal (dim_str, "345:123:1:1"));
@@ -340,9 +337,6 @@ TEST (commonGetTensorDimension, case4)
   rank = gst_tensor_parse_dimension ("345", dim);
   EXPECT_EQ (rank, 1U);
   EXPECT_EQ (dim[0], 345U);
-  EXPECT_EQ (dim[1], 1U);
-  EXPECT_EQ (dim[2], 1U);
-  EXPECT_EQ (dim[3], 1U);
 
   dim_str = gst_tensor_get_dimension_string (dim);
   EXPECT_TRUE (gst_tensor_dimension_string_is_equal (dim_str, "345:1:1:1"));

diff --git a/tests/nnstreamer_plugins/unittest_plugins.cc b/tests/nnstreamer_plugins/unittest_plugins.cc
index 25a7e3b..b15c8df 100644 (file)
--- a/tests/nnstreamer_plugins/unittest_plugins.cc
+++ b/tests/nnstreamer_plugins/unittest_plugins.cc
@@ -2122,7 +2122,6 @@ TEST (testTensorTransform, arithmeticFlexTensor)
     gst_tensor_meta_info_parse_header (&meta, map.data);
     EXPECT_EQ (meta.type, _NNS_FLOAT32);
     EXPECT_EQ (meta.dimension[0], 5U);
-    EXPECT_EQ (meta.dimension[1], 1U);
 
     hsize = gst_tensor_meta_info_get_header_size (&meta);
     ASSERT_EQ (gst_buffer_get_size (out_buf), data_out_size + hsize);
@@ -6424,21 +6423,21 @@ TEST_REQUIRE_TFLITE (testTensorFilter, propertyRank02)
   EXPECT_TRUE (gst_tensor_dimension_string_is_equal (input_dim, "3:224:224:1"));
   g_free (input_dim);
 
-  /* Rank should be 3 since input dimension string is not given. */
+  /* Rank should be 4 since input dimension string is not given. */
   gchar *input_ranks;
   g_object_get (filter, "inputranks", &input_ranks, NULL);
-  EXPECT_STREQ (input_ranks, "3");
+  EXPECT_STREQ (input_ranks, "4");
   g_free (input_ranks);
 
   gchar *output_dim;
   g_object_get (filter, "output", &output_dim, NULL);
-  EXPECT_TRUE (gst_tensor_dimension_string_is_equal (output_dim, "1001:1:1:1"));
+  EXPECT_TRUE (gst_tensor_dimension_string_is_equal (output_dim, "1001:1"));
   g_free (output_dim);
 
-  /* Rank should be 1 since output dimension string is not given. */
+  /* Rank should be 2 since output dimension string is not given. */
   gchar *output_ranks;
   g_object_get (filter, "outputranks", &output_ranks, NULL);
-  EXPECT_STREQ (output_ranks, "1");
+  EXPECT_STREQ (output_ranks, "2");
   g_free (output_ranks);
 
   g_object_unref (filter);

diff --git a/tests/nnstreamer_sink/unittest_sink.cc b/tests/nnstreamer_sink/unittest_sink.cc
index 31ff446..5afe90b 100644 (file)
--- a/tests/nnstreamer_sink/unittest_sink.cc
+++ b/tests/nnstreamer_sink/unittest_sink.cc
@@ -3045,8 +3045,6 @@ TEST (tensorStreamTest, octetCurrentTs)
   EXPECT_EQ (g_test_data.tensors_config.info.info[0].type, _NNS_UINT8);
   EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[0], 1U);
   EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[1], 10U);
-  EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[2], 1U);
-  EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[3], 1U);
   EXPECT_EQ (g_test_data.tensors_config.rate_n, 0);
   EXPECT_EQ (g_test_data.tensors_config.rate_d, 1);
 
@@ -3092,8 +3090,6 @@ TEST (tensorStreamTest, octetFramerateTs)
   EXPECT_EQ (g_test_data.tensors_config.info.info[0].type, _NNS_UINT8);
   EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[0], 1U);
   EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[1], 10U);
-  EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[2], 1U);
-  EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[3], 1U);
   EXPECT_EQ (g_test_data.tensors_config.rate_n, 10);
   EXPECT_EQ (g_test_data.tensors_config.rate_d, 1);
 
@@ -3166,8 +3162,6 @@ TEST (tensorStreamTest, octetValidTs)
   EXPECT_EQ (g_test_data.tensors_config.info.info[0].type, _NNS_UINT8);
   EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[0], 1U);
   EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[1], 10U);
-  EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[2], 1U);
-  EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[3], 1U);
   EXPECT_EQ (g_test_data.tensors_config.rate_n, 0);
   EXPECT_EQ (g_test_data.tensors_config.rate_d, 1);
 
@@ -3240,8 +3234,6 @@ TEST (tensorStreamTest, octetInvalidTs)
   EXPECT_EQ (g_test_data.tensors_config.info.info[0].type, _NNS_UINT8);
   EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[0], 1U);
   EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[1], 10U);
-  EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[2], 1U);
-  EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[3], 1U);
   EXPECT_EQ (g_test_data.tensors_config.rate_n, 0);
   EXPECT_EQ (g_test_data.tensors_config.rate_d, 1);
 
@@ -3314,8 +3306,6 @@ TEST (tensorStreamTest, octet2f)
   EXPECT_EQ (g_test_data.tensors_config.info.info[0].type, _NNS_INT8);
   EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[0], 1U);
   EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[1], 5U);
-  EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[2], 1U);
-  EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[3], 1U);
   EXPECT_EQ (g_test_data.tensors_config.rate_n, 10);
   EXPECT_EQ (g_test_data.tensors_config.rate_d, 1);
 
@@ -3382,15 +3372,9 @@ TEST (tensorStreamTest, octetMultiTensors)
 
   EXPECT_EQ (g_test_data.tensors_config.info.info[0].type, _NNS_INT32);
   EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[0], 2U);
-  EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[1], 1U);
-  EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[2], 1U);
-  EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[3], 1U);
 
   EXPECT_EQ (g_test_data.tensors_config.info.info[1].type, _NNS_INT8);
   EXPECT_EQ (g_test_data.tensors_config.info.info[1].dimension[0], 2U);
-  EXPECT_EQ (g_test_data.tensors_config.info.info[1].dimension[1], 1U);
-  EXPECT_EQ (g_test_data.tensors_config.info.info[1].dimension[2], 1U);
-  EXPECT_EQ (g_test_data.tensors_config.info.info[1].dimension[3], 1U);
 
   EXPECT_EQ (g_test_data.tensors_config.rate_n, 10);
   EXPECT_EQ (g_test_data.tensors_config.rate_d, 1);
@@ -3547,9 +3531,6 @@ TEST (tensorStreamTest, flexToStatic)
   EXPECT_TRUE (gst_tensors_config_validate (&g_test_data.tensors_config));
   EXPECT_EQ (g_test_data.tensors_config.info.info[0].type, _NNS_UINT8);
   EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[0], 10U);
-  EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[1], 1U);
-  EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[2], 1U);
-  EXPECT_EQ (g_test_data.tensors_config.info.info[0].dimension[3], 1U);
   EXPECT_EQ (g_test_data.tensors_config.rate_n, 10);
   EXPECT_EQ (g_test_data.tensors_config.rate_d, 1);
 

diff --git a/tests/nnstreamer_sparse/runTest.sh b/tests/nnstreamer_sparse/runTest.sh
index 4607c68..8b323f2 100644 (file)
--- a/tests/nnstreamer_sparse/runTest.sh
+++ b/tests/nnstreamer_sparse/runTest.sh
@@ -175,7 +175,9 @@ gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} \
 videotestsrc num-buffers=1 ! \
     video/x-raw,format=RGB,width=10,height=10,framerate=0/1 ! videoconvert ! \
     tensor_converter ! tensor_filter framework=lua \
-    model=\"${MAKE_SAMPLE_TENSORS_SCRIPT}\" ! tensor_sparse_enc ! filesink location=./sample1.sparse" 4 0 0 $PERFORMANCE
+    model=\"${MAKE_SAMPLE_TENSORS_SCRIPT}\" ! \
+    other/tensors,num_tensors=1,framerate=0/1,dimensions=1:3:4:1,types=uint8 ! \
+    tensor_sparse_enc ! filesink location=./sample1.sparse" 4 0 0 $PERFORMANCE
 
 gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} \
 filesrc location=sample1.sparse ! \

diff --git a/tests/tizen_nnfw_runtime/unittest_tizen_nnfw_runtime_raw.cc b/tests/tizen_nnfw_runtime/unittest_tizen_nnfw_runtime_raw.cc
index 379527c..9b7ca9a 100644 (file)
--- a/tests/tizen_nnfw_runtime/unittest_tizen_nnfw_runtime_raw.cc
+++ b/tests/tizen_nnfw_runtime/unittest_tizen_nnfw_runtime_raw.cc
@@ -69,7 +69,7 @@ get_model_file ()
  */
 TEST (nnstreamerNnfwRuntimeRawFunctions, getDimension)
 {
-  int ret, i;
+  int ret;
   void *data = NULL;
   GstTensorsInfo info, res;
   gchar *model_file;
@@ -93,8 +93,7 @@ TEST (nnstreamerNnfwRuntimeRawFunctions, getDimension)
 
   info.num_tensors = 1;
   info.info[0].type = _NNS_FLOAT32;
-  for (i = 0; i < NNS_TENSOR_RANK_LIMIT; i++)
-    info.info[0].dimension[i] = 1;
+  info.info[0].dimension[0] = 1;
 
   /** get input/output dimension successfully */
   ret = sp->getInputDimension (&prop, &data, &res);
@@ -102,16 +101,14 @@ TEST (nnstreamerNnfwRuntimeRawFunctions, getDimension)
 
   EXPECT_EQ (res.num_tensors, info.num_tensors);
   EXPECT_EQ (res.info[0].type, info.info[0].type);
-  for (i = 0; i < NNS_TENSOR_RANK_LIMIT; i++)
-    EXPECT_EQ (res.info[0].dimension[i], info.info[0].dimension[i]);
+  EXPECT_EQ (res.info[0].dimension[0], info.info[0].dimension[0]);
 
   ret = sp->getOutputDimension (&prop, &data, &res);
   EXPECT_EQ (ret, 0);
 
   EXPECT_EQ (res.num_tensors, info.num_tensors);
   EXPECT_EQ (res.info[0].type, info.info[0].type);
-  for (i = 0; i < NNS_TENSOR_RANK_LIMIT; i++)
-    EXPECT_EQ (res.info[0].dimension[i], info.info[0].dimension[i]);
+  EXPECT_EQ (res.info[0].dimension[0], info.info[0].dimension[0]);
 
   sp->close (&prop, &data);
 
@@ -159,8 +156,6 @@ TEST (nnstreamerNnfwRuntimeRawFunctions, setDimension)
   res.num_tensors = 1;
   res.info[0].type = _NNS_FLOAT32;
   res.info[0].dimension[0] = tensor_size;
-  for (i = 1; i < NNS_TENSOR_RANK_LIMIT; i++)
-    res.info[0].dimension[i] = 1;
 
   /** get input/output dimension successfully */
   ret = sp->getInputDimension (&prop, &data, &in_info);
@@ -170,8 +165,6 @@ TEST (nnstreamerNnfwRuntimeRawFunctions, setDimension)
   EXPECT_EQ (res.info[0].type, in_info.info[0].type);
 
   EXPECT_NE (res.info[0].dimension[0], in_info.info[0].dimension[0]);
-  for (i = 1; i < NNS_TENSOR_RANK_LIMIT; i++)
-    EXPECT_EQ (res.info[0].dimension[i], in_info.info[0].dimension[i]);
 
   ret = sp->setInputDimension (&prop, &data, &res, &out_info);
   EXPECT_EQ (ret, 0);
@@ -372,16 +365,11 @@ TEST (nnstreamerNnfwRuntimeRawFunctions, invokeAdvanced)
   info.info[0].type = _NNS_UINT8;
   info.info[0].dimension[0] = 1001;
   info.info[0].dimension[1] = 1;
-  info.info[0].dimension[2] = 1;
-  info.info[0].dimension[3] = 1;
 
   EXPECT_EQ (res.num_tensors, info.num_tensors);
   EXPECT_EQ (res.info[0].type, info.info[0].type);
   EXPECT_EQ (res.info[0].dimension[0], info.info[0].dimension[0]);
   EXPECT_EQ (res.info[0].dimension[1], info.info[0].dimension[1]);
-  EXPECT_EQ (res.info[0].dimension[2], info.info[0].dimension[2]);
-  EXPECT_EQ (res.info[0].dimension[3], info.info[0].dimension[3]);
-
   output.size = gst_tensor_info_get_size (&res.info[0]);
 
   input.data = NULL;