add descriptor tests postfix

diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c
index b2e37daed852d03f9e302ffe186468020f335be1..07d55cb2815ff8c97c9ee37aa3ae1e2e01354ea5 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -17,7 +17,7 @@ int teardown(void **state)
        return 0;
 }
 
-void kds_s2000w_option_get_descriptor_zero()
+void kds_s2000w_option_get_descriptor_zero_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(0);
 
@@ -31,7 +31,7 @@ void kds_s2000w_option_get_descriptor_zero()
        assert_int_equal(SANE_CONSTRAINT_NONE, option->constraint_type);
 }
 
-void kds_s2000w_option_get_descriptor_one()
+void kds_s2000w_option_get_descriptor_one_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(1);
 
@@ -45,7 +45,7 @@ void kds_s2000w_option_get_descriptor_one()
        assert_int_equal(SANE_CONSTRAINT_NONE, option->constraint_type);
 }
 
-void kds_s2000w_option_get_descriptor_two()
+void kds_s2000w_option_get_descriptor_two_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(2);
 
@@ -63,7 +63,7 @@ void kds_s2000w_option_get_descriptor_two()
        assert_null(option->constraint.string_list[3]);
 }
 
-void kds_s2000w_option_get_descriptor_three()
+void kds_s2000w_option_get_descriptor_three_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(3);
 
@@ -81,7 +81,7 @@ void kds_s2000w_option_get_descriptor_three()
        assert_null(option->constraint.string_list[3]);
 }
 
-void kds_s2000w_option_get_descriptor_four()
+void kds_s2000w_option_get_descriptor_four_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(4);
 
@@ -98,7 +98,7 @@ void kds_s2000w_option_get_descriptor_four()
        assert_int_equal(300, option->constraint.word_list[2]);
 }
 
-void kds_s2000w_option_get_descriptor_five()
+void kds_s2000w_option_get_descriptor_five_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(5);
 
@@ -115,7 +115,7 @@ void kds_s2000w_option_get_descriptor_five()
        assert_null(option->constraint.string_list[2]);
 }
 
-void kds_s2000w_option_get_descriptor_six()
+void kds_s2000w_option_get_descriptor_six_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(6);
 
@@ -129,7 +129,7 @@ void kds_s2000w_option_get_descriptor_six()
        assert_int_equal(SANE_CONSTRAINT_NONE, option->constraint_type);
 }
 
-void kds_s2000w_option_get_descriptor_seven()
+void kds_s2000w_option_get_descriptor_seven_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(7);
 
@@ -143,7 +143,7 @@ void kds_s2000w_option_get_descriptor_seven()
        assert_int_equal(SANE_CONSTRAINT_NONE, option->constraint_type);
 }
 
-void kds_s2000w_option_get_descriptor_eight()
+void kds_s2000w_option_get_descriptor_eight_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(8);
 
@@ -166,7 +166,7 @@ void kds_s2000w_option_get_descriptor_eight()
        assert_null(option->constraint.string_list[8]);
 }
 
-void kds_s2000w_option_get_descriptor_nine()
+void kds_s2000w_option_get_descriptor_nine_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(9);
 
@@ -183,7 +183,7 @@ void kds_s2000w_option_get_descriptor_nine()
        assert_int_equal(1, option->constraint.range->quant);
 }
 
-void kds_s2000w_option_get_descriptor_ten()
+void kds_s2000w_option_get_descriptor_ten_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(10);
 
@@ -200,7 +200,7 @@ void kds_s2000w_option_get_descriptor_ten()
        assert_null(option->constraint.string_list[2]);
 }
 
-void kds_s2000w_option_get_descriptor_eleven()
+void kds_s2000w_option_get_descriptor_eleven_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(11);
 
@@ -219,7 +219,7 @@ void kds_s2000w_option_get_descriptor_eleven()
        assert_null(option->constraint.string_list[4]);
 }
 
-void kds_s2000w_option_get_descriptor_twelve()
+void kds_s2000w_option_get_descriptor_twelve_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(12);
 
@@ -236,7 +236,7 @@ void kds_s2000w_option_get_descriptor_twelve()
        assert_int_equal(1, option->constraint.range->quant);
 }
 
-void kds_s2000w_option_get_descriptor_thirdteen()
+void kds_s2000w_option_get_descriptor_thirdteen_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(13);
 
@@ -253,7 +253,7 @@ void kds_s2000w_option_get_descriptor_thirdteen()
        assert_int_equal(1, option->constraint.range->quant);
 }
 
-void kds_s2000w_option_get_descriptor_fourteen()
+void kds_s2000w_option_get_descriptor_fourteen_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(14);
 
@@ -270,7 +270,7 @@ void kds_s2000w_option_get_descriptor_fourteen()
        assert_int_equal(1, option->constraint.range->quant);
 }
 
-void kds_s2000w_option_get_descriptor_fifteen()
+void kds_s2000w_option_get_descriptor_fifteen_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(15);
 
@@ -287,7 +287,7 @@ void kds_s2000w_option_get_descriptor_fifteen()
        assert_int_equal(1, option->constraint.range->quant);
 }
 
-void kds_s2000w_option_get_descriptor_sixteen()
+void kds_s2000w_option_get_descriptor_sixteen_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(16);
 
@@ -305,7 +305,7 @@ void kds_s2000w_option_get_descriptor_sixteen()
        assert_null(option->constraint.string_list[3]);
 }
 
-void kds_s2000w_option_get_descriptor_seventeen()
+void kds_s2000w_option_get_descriptor_seventeen_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(17);
 
@@ -322,7 +322,7 @@ void kds_s2000w_option_get_descriptor_seventeen()
        assert_int_equal(1, option->constraint.range->quant);
 }
 
-void kds_s2000w_option_get_descriptor_eightteen()
+void kds_s2000w_option_get_descriptor_eightteen_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(18);
 
@@ -340,7 +340,7 @@ void kds_s2000w_option_get_descriptor_eightteen()
        assert_null(option->constraint.string_list[3]);
 }
 
-void kds_s2000w_option_get_descriptor_nineteen()
+void kds_s2000w_option_get_descriptor_nineteen_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(19);
 
@@ -357,7 +357,7 @@ void kds_s2000w_option_get_descriptor_nineteen()
        assert_int_equal(1, option->constraint.range->quant);
 }
 
-void kds_s2000w_option_get_descriptor_twenty()
+void kds_s2000w_option_get_descriptor_twenty_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(20);
 
@@ -374,7 +374,7 @@ void kds_s2000w_option_get_descriptor_twenty()
        assert_int_equal(1, option->constraint.range->quant);
 }
 
-void kds_s2000w_option_get_descriptor_twentyone()
+void kds_s2000w_option_get_descriptor_twentyone_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(21);
 
@@ -388,7 +388,7 @@ void kds_s2000w_option_get_descriptor_twentyone()
        assert_int_equal(SANE_CONSTRAINT_NONE, option->constraint_type);
 }
 
-void kds_s2000w_option_get_descriptor_over_max_options()
+void kds_s2000w_option_get_descriptor_over_max_options_test()
 {
        SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(MAX_OPTION_COUNT);
 

diff --git a/tests/kds_s2000w_option_descriptor_tests.h b/tests/kds_s2000w_option_descriptor_tests.h
index fdc4a1542ffa968ad5b2a11d64f128a04f95aef2..67080aa25692e4e4bf1c4809a4ef1bf12fa78636 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.h
+++ b/tests/kds_s2000w_option_descriptor_tests.h
@@ -8,27 +8,27 @@
 
 int setup(void** state);
 int teardown(void** state);
-void kds_s2000w_option_get_descriptor_zero();
-void kds_s2000w_option_get_descriptor_one();
-void kds_s2000w_option_get_descriptor_two();
-void kds_s2000w_option_get_descriptor_three();
-void kds_s2000w_option_get_descriptor_four();
-void kds_s2000w_option_get_descriptor_five();
-void kds_s2000w_option_get_descriptor_six();
-void kds_s2000w_option_get_descriptor_seven();
-void kds_s2000w_option_get_descriptor_eight();
-void kds_s2000w_option_get_descriptor_nine();
-void kds_s2000w_option_get_descriptor_ten();
-void kds_s2000w_option_get_descriptor_eleven();
-void kds_s2000w_option_get_descriptor_twelve();
-void kds_s2000w_option_get_descriptor_thirdteen();
-void kds_s2000w_option_get_descriptor_fourteen();
-void kds_s2000w_option_get_descriptor_fifteen();
-void kds_s2000w_option_get_descriptor_sixteen();
-void kds_s2000w_option_get_descriptor_seventeen();
-void kds_s2000w_option_get_descriptor_eightteen();
-void kds_s2000w_option_get_descriptor_nineteen();
-void kds_s2000w_option_get_descriptor_twenty();
-void kds_s2000w_option_get_descriptor_twentyone();
-void kds_s2000w_option_get_descriptor_over_max_options();
+void kds_s2000w_option_get_descriptor_zero_test();
+void kds_s2000w_option_get_descriptor_one_test();
+void kds_s2000w_option_get_descriptor_two_test();
+void kds_s2000w_option_get_descriptor_three_test();
+void kds_s2000w_option_get_descriptor_four_test();
+void kds_s2000w_option_get_descriptor_five_test();
+void kds_s2000w_option_get_descriptor_six_test();
+void kds_s2000w_option_get_descriptor_seven_test();
+void kds_s2000w_option_get_descriptor_eight_test();
+void kds_s2000w_option_get_descriptor_nine_test();
+void kds_s2000w_option_get_descriptor_ten_test();
+void kds_s2000w_option_get_descriptor_eleven_test();
+void kds_s2000w_option_get_descriptor_twelve_test();
+void kds_s2000w_option_get_descriptor_thirdteen_test();
+void kds_s2000w_option_get_descriptor_fourteen_test();
+void kds_s2000w_option_get_descriptor_fifteen_test();
+void kds_s2000w_option_get_descriptor_sixteen_test();
+void kds_s2000w_option_get_descriptor_seventeen_test();
+void kds_s2000w_option_get_descriptor_eightteen_test();
+void kds_s2000w_option_get_descriptor_nineteen_test();
+void kds_s2000w_option_get_descriptor_twenty_test();
+void kds_s2000w_option_get_descriptor_twentyone_test();
+void kds_s2000w_option_get_descriptor_over_max_options_test();
 #endif
\ No newline at end of file

diff --git a/tests/kds_s2000w_option_descriptor_tests_run.c b/tests/kds_s2000w_option_descriptor_tests_run.c
index 243dc6752176969180abc664529077c74cad5484..63c3a01af883ba8691127cc4d534c30eda574be0 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests_run.c
+++ b/tests/kds_s2000w_option_descriptor_tests_run.c
@@ -3,29 +3,29 @@
 int main()
 {
        const struct CMUnitTest option_descriptor_tests[] = {
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_zero, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_one, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_two, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_three, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_four, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_five, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_six, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_seven, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_eight, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_nine, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_ten, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_eleven, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twelve, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdteen, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourteen, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fifteen, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_sixteen, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_seventeen, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_eightteen, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_nineteen, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twenty, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentyone, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_over_max_options, setup, teardown)
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_zero_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_one_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_two_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_three_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_four_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_five_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_six_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_seven_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_eight_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_nine_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_ten_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_eleven_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twelve_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdteen_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourteen_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fifteen_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_sixteen_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_seventeen_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_eightteen_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_nineteen_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twenty_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentyone_test, setup, teardown),
+               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_over_max_options_test, setup, teardown)
        };
 
        return cmocka_run_group_tests(option_descriptor_tests, NULL, NULL);