new_tests_added_old_tests_fixed

Author: Nypiaka

integration-tests/c-example/lib/different_variables.c

@@ -15,17 +15,26 @@ void swap_four_int(int *a, int *b, int *c, int *d) {
   *d = p;
 }
 
-void swap_two_double(float *a, float *b) {
+void swap_two_float(float *a, float *b) {
   float t = *a;
   *a = *b;
   *b = t;
 }
 
-void swap_four_double(float *a, float *b, float *c, float *d) {
+void swap_four_float(float *a, float *b, float *c, float *d) {
   float t = *a;
   *a = *b;
   *b = t;
   float f = *c;
   *c = *d;
   *d = f;
 }
+
+void swap_two_int_two_float(int *a, int *b, float *c, float *d) {
+  int t = *a;
+  *a = *b;
+  *b = t;
+  float f = *c;
+  *c = *d;
+  *d = f;
+}

integration-tests/c-example/lib/different_variables.h

@@ -5,8 +5,10 @@ void swap_two_int(int *a, int *b);
 
 void swap_four_int(int *a, int *b, int *c, int *d);
 
-void swap_two_double(float *a, float *b);
+void swap_two_float(float *a, float *b);
 
-void swap_four_double(float *a, float *b, float *c, float *d);
+void swap_four_float(float *a, float *b, float *c, float *d);
+
+void swap_two_int_and_two_float(int *a, int *b, float *c, float *d);
 
 #endif //SIMPLE_TEST_PROJECT_DIFFERENT_VARIABLES_H

server/test/framework/Server_Tests.cpp

@@ -199,7 +199,7 @@ namespace {
                                                            true, diffVars) &&
                                        testCase.stdinValue == std::nullopt;} }),
                         methodName);
-                } else if (methodName == "swap_two_double") {
+                } else if (methodName == "swap_two_float") {
                     checkTestCasePredicates(
                         methodDescription.testCases,
                         std::vector<TestCasePredicate>(
@@ -216,7 +216,7 @@ namespace {
                                        testCase.stdinValue == std::nullopt;
                             } }),
                         methodName);
-                } else if (methodName == "swap_four_double") {
+                } else if (methodName == "swap_four_float") {
                     checkTestCasePredicates(
                         methodDescription.testCases,
                         std::vector<TestCasePredicate>(
@@ -240,6 +240,31 @@ namespace {
                                                            false, diffVars) &&
                                        testCase.stdinValue == std::nullopt;} }),
                         methodName);
+                } else if (methodName == "swap_two_int_two_float") {
+                    checkTestCasePredicates(
+                        methodDescription.testCases,
+                        std::vector<TestCasePredicate>(
+                            { [diffVars](tests::Tests::MethodTestCase const &testCase) {
+                                return commonSimpleChecker({testCase.paramValues[0]
+                                                                 .view->getEntryValue(nullptr),
+                                                             testCase.paramPostValues[0]
+                                                                 .view->getEntryValue(nullptr),
+                                                             testCase.paramValues[1]
+                                                                 .view->getEntryValue(nullptr),
+                                                             testCase.paramPostValues[1]
+                                                                 .view->getEntryValue(nullptr)},
+                                                           true, diffVars) &&
+                                       commonSimpleChecker({testCase.paramValues[2]
+                                                                 .view->getEntryValue(nullptr),
+                                                             testCase.paramPostValues[2]
+                                                                 .view->getEntryValue(nullptr),
+                                                             testCase.paramValues[3]
+                                                                 .view->getEntryValue(nullptr),
+                                                             testCase.paramPostValues[3]
+                                                                 .view->getEntryValue(nullptr)},
+                                                           false, diffVars) &&
+                                       testCase.stdinValue == std::nullopt;} }),
+                        methodName);
                 }
             }
         }

server/test/suites/server/different_variables.c

@@ -15,17 +15,26 @@ void swap_four_int(int *a, int *b, int *c, int *d) {
   *d = p;
 }
 
-void swap_two_double(float *a, float *b) {
+void swap_two_float(float *a, float *b) {
   float t = *a;
   *a = *b;
   *b = t;
 }
 
-void swap_four_double(float *a, float *b, float *c, float *d) {
+void swap_four_float(float *a, float *b, float *c, float *d) {
   float t = *a;
   *a = *b;
   *b = t;
   float f = *c;
   *c = *d;
   *d = f;
 }
+
+void swap_two_int_two_float(int *a, int *b, float *c, float *d) {
+    int t = *a;
+    *a = *b;
+    *b = t;
+    float f = *c;
+    *c = *d;
+    *d = f;
+}

server/test/suites/server/different_variables.h

@@ -5,8 +5,10 @@ void swap_two_int(int *a, int *b);
 
 void swap_four_int(int *a, int *b, int *c, int *d);
 
-void swap_two_double(float *a, float *b);
+void swap_two_float(float *a, float *b);
 
-void swap_four_double(float *a, float *b, float *c, float *d);
+void swap_four_float(float *a, float *b, float *c, float *d);
+
+void swap_two_int_and_two_float(int *a, int *b, float *c, float *d);
 
 #endif //SIMPLE_TEST_PROJECT_DIFFERENT_VARIABLES_H