Changeset c24b0dcb in mainline for uspace/lib/c/test/capa.c

Timestamp:

2019-09-30T16:38:33Z (5 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8f57fb2

Parents:

ef0a3375

git-author:

Jakub Jermar <jakub@…> (2019-09-30 16:34:10)

git-committer:

Jakub Jermar <jakub@…> (2019-09-30 16:38:33)

Message:

Rename capacity-related 'cap' to 'capa'

This allows to use 'cap' for capabilities.

File:

• uspace/lib/c/test/capa.c (moved) (moved from uspace/lib/c/test/cap.c ) (13 diffs)

uspace/lib/c/test/capa.c

@@ -28 +28 @@
 
 #include <pcut/pcut.h>
-#include <cap.h>
+#include <capa.h>
 
 PCUT_INIT;
 
-PCUT_TEST_SUITE(cap);
-
-PCUT_TEST(cap_format)
+PCUT_TEST_SUITE(capa);
+
+PCUT_TEST(capa_format)
 {
         int block_size = 4;
@@ -86 +86 @@
         };
 
-        cap_spec_t cap;
+        capa_spec_t capa;
         char *str;
         errno_t rc;
@@ -93 +93 @@
         for (i = 0; i < input_size; i++) {
                 for (x = 0; x < block_size; x++) {
-                        cap_from_blocks(input[i], block[x], &cap);
-                        cap_simplify(&cap);
-
-                        rc = cap_format(&cap, &str);
+                        capa_from_blocks(input[i], block[x], &capa);
+                        capa_simplify(&capa);
+
+                        rc = capa_format(&capa, &str);
 
                         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
@@ -102 +102 @@
                         free(str);
 
-                        cap_from_blocks(block[x], input[i], &cap);
-                        cap_simplify(&cap);
-
-                        rc = cap_format(&cap, &str);
+                        capa_from_blocks(block[x], input[i], &capa);
+                        capa_simplify(&capa);
+
+                        rc = capa_format(&capa, &str);
 
                         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
@@ -114 +114 @@
 }
 
-PCUT_TEST(cap_format_rounding)
+PCUT_TEST(capa_format_rounding)
 {
         int input_size = 8;
@@ -139 +139 @@
         };
 
-        cap_spec_t cap;
+        capa_spec_t capa;
         char *str;
         errno_t rc;
@@ -145 +145 @@
         int i;
         for (i = 0; i < input_size; i++) {
-                cap_from_blocks(input[i], 1, &cap);
-                cap_simplify(&cap);
-
-                rc = cap_format(&cap, &str);
+                capa_from_blocks(input[i], 1, &capa);
+                capa_simplify(&capa);
+
+                rc = capa_format(&capa, &str);
 
                 PCUT_ASSERT_ERRNO_VAL(EOK, rc);
@@ -154 +154 @@
                 free(str);
 
-                cap_from_blocks(1, input[i], &cap);
-                cap_simplify(&cap);
-
-                rc = cap_format(&cap, &str);
+                capa_from_blocks(1, input[i], &capa);
+                capa_simplify(&capa);
+
+                rc = capa_format(&capa, &str);
 
                 PCUT_ASSERT_ERRNO_VAL(EOK, rc);
@@ -165 +165 @@
 }
 
-PCUT_TEST(cap_parse)
+PCUT_TEST(capa_parse)
 {
         int input_size = 4;
@@ -196 +196 @@
         };
 
-        cap_spec_t cap;
+        capa_spec_t capa;
         errno_t rc;
         int i;
 
         for (i = 0; i < input_size; i++) {
-                rc = cap_parse(input[i], &cap);
-
-                PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-                PCUT_ASSERT_INT_EQUALS(out_cunit[i], cap.cunit);
-                PCUT_ASSERT_INT_EQUALS(out_dp[i], cap.dp);
-                PCUT_ASSERT_INT_EQUALS(out_m[i], cap.m);
-        }
-}
-
-PCUT_TEST(cap_to_blocks)
+                rc = capa_parse(input[i], &capa);
+
+                PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+                PCUT_ASSERT_INT_EQUALS(out_cunit[i], capa.cunit);
+                PCUT_ASSERT_INT_EQUALS(out_dp[i], capa.dp);
+                PCUT_ASSERT_INT_EQUALS(out_m[i], capa.m);
+        }
+}
+
+PCUT_TEST(capa_to_blocks)
 {
         int input_size = 0;
@@ -261 +261 @@
         };
 
-        cap_spec_t cap;
+        capa_spec_t capa;
         errno_t rc;
         int i;
@@ -267 +267 @@
 
         for (i = 0; i < input_size; i++) {
-                cap.m = input_m[i];
-                cap.dp = input_dp[i];
-                cap.cunit = cu_kbyte;
-
-                rc = cap_to_blocks(&cap, cv_nom, block[i], &ret);
+                capa.m = input_m[i];
+                capa.dp = input_dp[i];
+                capa.cunit = cu_kbyte;
+
+                rc = capa_to_blocks(&capa, cv_nom, block[i], &ret);
                 PCUT_ASSERT_ERRNO_VAL(EOK, rc);
                 PCUT_ASSERT_INT_EQUALS(out_nom[i], ret);
 
-                rc = cap_to_blocks(&cap, cv_min, block[i], &ret);
+                rc = capa_to_blocks(&capa, cv_min, block[i], &ret);
                 PCUT_ASSERT_ERRNO_VAL(EOK, rc);
                 PCUT_ASSERT_INT_EQUALS(out_min[i], ret);
 
-                rc = cap_to_blocks(&cap, cv_max, block[i], &ret);
+                rc = capa_to_blocks(&capa, cv_max, block[i], &ret);
                 PCUT_ASSERT_ERRNO_VAL(EOK, rc);
                 PCUT_ASSERT_INT_EQUALS(out_max[i], ret);
@@ -285 +285 @@
 }
 
-PCUT_EXPORT(cap);
+PCUT_EXPORT(capa);