add max value tests calc inch pixel

diff --git a/src/kds_s2000w_handler_opts_calc.c b/src/kds_s2000w_handler_opts_calc.c
index 891bd2734332f86ad7ae1c06102d666651d461fe..40f4039c833ad2d402098a2fc4b3a58cee5740a2 100644 (file)
--- a/src/kds_s2000w_handler_opts_calc.c
+++ b/src/kds_s2000w_handler_opts_calc.c
@@ -4,12 +4,12 @@
 
 int32_t kds_s2000w_handler_opts_calc_inch_to_pixel(int32_t dpi, int32_t inch)
 {
-       return inch / INCH_RESOLUTION * dpi;
+       return inch * dpi / INCH_RESOLUTION;
 }
 
 int32_t kds_s2000w_handler_opts_calc_pixel_to_inch(int32_t dpi, int32_t pixel)
 {
-       return pixel / dpi * INCH_RESOLUTION;
+       return pixel * INCH_RESOLUTION / dpi;
 }
 
 int32_t kds_s2000w_handler_opts_calc_pixel_quant(int32_t dpi)

diff --git a/tests/kds_s2000w_handler_opts_calc_tests.c b/tests/kds_s2000w_handler_opts_calc_tests.c
index 4aa78d032151e83a2aea3d979df1addf6a8bc242..d721c1035043ffded509cec26f6a4bde23302b7d 100644 (file)
--- a/tests/kds_s2000w_handler_opts_calc_tests.c
+++ b/tests/kds_s2000w_handler_opts_calc_tests.c
@@ -2,29 +2,49 @@
 
 void kds_s2000w_handler_opts_calc_inch_to_pixel_test()
 {
-       int32_t dpi = 300;
+       int32_t dpi = 200;
        int32_t inch = 10;
 
        int32_t pixel = kds_s2000w_handler_opts_calc_inch_to_pixel(dpi, inch);
 
-       assert_int_equal(pixel, 300);
+       assert_int_equal(pixel, 200);
+}
+
+void kds_s2000w_handler_opts_calc_inch_to_pixel_max_x_value_test()
+{
+       int32_t dpi = 200;
+       int32_t inch = 75;
+
+       int32_t pixel = kds_s2000w_handler_opts_calc_inch_to_pixel(dpi, inch);
+
+       assert_int_equal(pixel, 1500);
 }
 
 void kds_s2000w_handler_opts_calc_pixel_to_inch_test()
 {
-       int32_t dpi = 300;
-       int32_t pixel = 300;
+       int32_t dpi = 200;
+       int32_t pixel = 200;
 
        int32_t inch = kds_s2000w_handler_opts_calc_pixel_to_inch(dpi, pixel);
 
        assert_int_equal(inch, 10);
 }
 
+void kds_s2000w_handler_opts_calc_pixel_to_inch_max_x_value_test()
+{
+       int32_t dpi = 200;
+       int32_t pixel = 1500;
+
+       int32_t inch = kds_s2000w_handler_opts_calc_pixel_to_inch(dpi, pixel);
+
+       assert_int_equal(inch, 75);
+}
+
 void kds_s2000w_handler_opts_calc_pixel_quant_test()
 {
-       int32_t dpi = 300;
+       int32_t dpi = 200;
 
        int32_t pixel_quant = kds_s2000w_handler_opts_calc_pixel_quant(dpi);
 
-       assert_int_equal(pixel_quant, 30);
+       assert_int_equal(pixel_quant, 20);
 }
\ No newline at end of file

diff --git a/tests/kds_s2000w_handler_opts_calc_tests.h b/tests/kds_s2000w_handler_opts_calc_tests.h
index f21a5d10ae25e7cff4ae8c10ecd04c10d73ad841..2276083eb6e7214d4809cd8fec34a0e34ad27c08 100644 (file)
--- a/tests/kds_s2000w_handler_opts_calc_tests.h
+++ b/tests/kds_s2000w_handler_opts_calc_tests.h
@@ -8,7 +8,9 @@
 #include "../src/kds_s2000w_handler_opts_calc.h"
 
 void kds_s2000w_handler_opts_calc_inch_to_pixel_test();
+void kds_s2000w_handler_opts_calc_inch_to_pixel_max_x_value_test();
 void kds_s2000w_handler_opts_calc_pixel_to_inch_test();
+void kds_s2000w_handler_opts_calc_pixel_to_inch_max_x_value_test();
 void kds_s2000w_handler_opts_calc_pixel_quant_test();
 
 #endif
\ No newline at end of file

diff --git a/tests/kds_s2000w_handler_opts_calc_tests_run.c b/tests/kds_s2000w_handler_opts_calc_tests_run.c
index 8e05021f2cb61ea21e08fc0ed3340157eae5f3e8..a1e8eef0966fe1109e24ba559d27917da4a744b3 100644 (file)
--- a/tests/kds_s2000w_handler_opts_calc_tests_run.c
+++ b/tests/kds_s2000w_handler_opts_calc_tests_run.c
@@ -4,7 +4,9 @@ int main()
 {
        const struct CMUnitTest opts_calc_tests[] = {
                cmocka_unit_test(kds_s2000w_handler_opts_calc_inch_to_pixel_test),
+               cmocka_unit_test(kds_s2000w_handler_opts_calc_inch_to_pixel_max_x_value_test),
                cmocka_unit_test(kds_s2000w_handler_opts_calc_pixel_to_inch_test),
+               cmocka_unit_test(kds_s2000w_handler_opts_calc_pixel_to_inch_max_x_value_test),
                cmocka_unit_test(kds_s2000w_handler_opts_calc_pixel_quant_test)
        };