[SQUASH ME] pktbuf: fix tests for new situation

RIOT-OS · Sep 19, 2014 · fc74686 · fc74686
1 parent 8d796ef
commit fc74686
Showing 1 changed file with 22 additions and 6 deletions.
diff --git a/tests/unittests/tests-pktbuf/tests-pktbuf.c b/tests/unittests/tests-pktbuf/tests-pktbuf.c
@@ -187,6 +187,7 @@ static void test_pktbuf_insert_success(void)
     }
 }
 
+#ifdef DEVELHELP
 static void test_pktbuf_copy_efault(void)
 {
     char *data = (char *)pktbuf_insert("abcd", 5);
@@ -195,6 +196,7 @@ static void test_pktbuf_copy_efault(void)
     TEST_ASSERT_EQUAL_INT(-EFAULT, pktbuf_copy(data, NULL, 3));
     TEST_ASSERT_EQUAL_STRING("abcd", data);
 }
+#endif
 
 static void test_pktbuf_copy_data_len_too_long(void)
 {
@@ -250,10 +252,12 @@ static void test_pktbuf_hold_ptr_null(void)
     TEST_ASSERT_NOT_NULL(data);
     TEST_ASSERT_NOT_NULL(pktbuf_alloc(16));
 
+    TEST_ASSERT_EQUAL_INT(3, pktbuf_packets_allocated());
+
     pktbuf_hold(NULL);
     pktbuf_release(data);
 
-    TEST_ASSERT_EQUAL_INT(-EINVAL, pktbuf_copy(data, "ef", 3));
+    TEST_ASSERT_EQUAL_INT(2, pktbuf_packets_allocated());
     TEST_ASSERT_EQUAL_STRING("abcd", data);
 }
 
@@ -266,10 +270,12 @@ static void test_pktbuf_hold_wrong_ptr(void)
     TEST_ASSERT_NOT_NULL(data);
     TEST_ASSERT_NOT_NULL(pktbuf_alloc(16));
 
+    TEST_ASSERT_EQUAL_INT(3, pktbuf_packets_allocated());
+
     pktbuf_hold(&wrong);
     pktbuf_release(data);
 
-    TEST_ASSERT_EQUAL_INT(-EINVAL, pktbuf_copy(data, "ef", 3));
+    TEST_ASSERT_EQUAL_INT(2, pktbuf_packets_allocated());
     TEST_ASSERT_EQUAL_STRING("abcd", data);
 }
 
@@ -344,13 +350,15 @@ static void test_pktbuf_release_success(void)
     TEST_ASSERT_NOT_NULL(data);
     TEST_ASSERT_NOT_NULL(pktbuf_alloc(16));
 
+    TEST_ASSERT_EQUAL_INT(3, pktbuf_packets_allocated());
+
     pktbuf_hold(data);
     pktbuf_hold(data);
     pktbuf_release(data + 3);
     pktbuf_release(data + 4);
     pktbuf_release(data + 2);
 
-    TEST_ASSERT_EQUAL_INT(-EINVAL, pktbuf_copy(data, "ef", 3));
+    TEST_ASSERT_EQUAL_INT(2, pktbuf_packets_allocated());
 }
 
 static void test_pktbuf_release_success2(void)
@@ -364,9 +372,11 @@ static void test_pktbuf_release_success2(void)
     data3 = (char *)pktbuf_insert("ghijkl", 7);
     TEST_ASSERT_NOT_NULL(data3);
 
+    TEST_ASSERT_EQUAL_INT(3, pktbuf_packets_allocated());
+
     pktbuf_release(data2);
 
-    TEST_ASSERT_EQUAL_INT(-EINVAL, pktbuf_copy(data2, "m", 2));
+    TEST_ASSERT_EQUAL_INT(2, pktbuf_packets_allocated());
     TEST_ASSERT_EQUAL_INT(2, pktbuf_copy(data1, "m", 2));
     TEST_ASSERT_EQUAL_STRING("m", data1);
     TEST_ASSERT_EQUAL_INT(4, pktbuf_copy(data3, "nop", 4));
@@ -384,9 +394,11 @@ static void test_pktbuf_release_success3(void)
     data3 = (char *)pktbuf_insert("ghijkl", 7);
     TEST_ASSERT_NOT_NULL(data3);
 
+    TEST_ASSERT_EQUAL_INT(3, pktbuf_packets_allocated());
+
     pktbuf_release(data1);
 
-    TEST_ASSERT_EQUAL_INT(-EINVAL, pktbuf_copy(data1, "m", 2));
+    TEST_ASSERT_EQUAL_INT(2, pktbuf_packets_allocated());
     TEST_ASSERT_EQUAL_INT(2, pktbuf_copy(data2, "m", 2));
     TEST_ASSERT_EQUAL_STRING("m", data2);
     TEST_ASSERT_EQUAL_INT(4, pktbuf_copy(data3, "nop", 4));
@@ -404,9 +416,11 @@ static void test_pktbuf_release_success4(void)
     data3 = (char *)pktbuf_insert("ghijkl", 7);
     TEST_ASSERT_NOT_NULL(data3);
 
+    TEST_ASSERT_EQUAL_INT(3, pktbuf_packets_allocated());
+
     pktbuf_release(data3);
 
-    TEST_ASSERT_EQUAL_INT(-EINVAL, pktbuf_copy(data3, "m", 2));
+    TEST_ASSERT_EQUAL_INT(2, pktbuf_packets_allocated());
     TEST_ASSERT_EQUAL_INT(2, pktbuf_copy(data1, "m", 2));
     TEST_ASSERT_EQUAL_STRING("m", data1);
     TEST_ASSERT_EQUAL_INT(1, pktbuf_copy(data2, "", 1));
@@ -432,7 +446,9 @@ Test *tests_pktbuf_tests(void)
         new_TestFixture(test_pktbuf_insert_data_NULL),
         new_TestFixture(test_pktbuf_insert_memfull),
         new_TestFixture(test_pktbuf_insert_success),
+#ifdef DEVELHELP
         new_TestFixture(test_pktbuf_copy_efault),
+#endif
         new_TestFixture(test_pktbuf_copy_data_len_too_long),
         new_TestFixture(test_pktbuf_copy_data_len_too_long2),
         new_TestFixture(test_pktbuf_copy_data_len_0),