Add tests for separator validation

Desbordante · Sep 23, 2024 · d9fdc83 · d9fdc83
1 parent b4eee18
commit d9fdc83
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 0 deletions.
diff --git a/src/tests/all_csv_configs.cpp b/src/tests/all_csv_configs.cpp
@@ -119,4 +119,6 @@ CSVConfig const kTestDynamicFDUpdateBad3 =
         CreateCsvConfig("dynamic_fd/TestDynamicUpdateBad3.csv", ',', true);
 CSVConfig const kTestDynamicFDUpdateBad4 =
         CreateCsvConfig("dynamic_fd/TestDynamicUpdateBad4.csv", ',', true);
+CSVConfig const kTestSeparator = CreateCsvConfig("TestSeparator.csv", ',', false);
+CSVConfig const kTestSeparator1 = CreateCsvConfig("TestSeparator1.csv", ',', false);
 }  // namespace tests
diff --git a/src/tests/all_csv_configs.h b/src/tests/all_csv_configs.h
@@ -99,4 +99,6 @@ extern CSVConfig const kTestDynamicFDUpdateBad1;
 extern CSVConfig const kTestDynamicFDUpdateBad2;
 extern CSVConfig const kTestDynamicFDUpdateBad3;
 extern CSVConfig const kTestDynamicFDUpdateBad4;
+extern CSVConfig const kTestSeparator;
+extern CSVConfig const kTestSeparator1;
 }  // namespace tests
diff --git a/src/tests/test_util.cpp b/src/tests/test_util.cpp
@@ -11,6 +11,7 @@
 #include "model/table/agree_set_factory.h"
 #include "model/table/column_layout_relation_data.h"
 #include "model/table/identifier_set.h"
+#include "separator_validator.h"
 
 namespace tests {
 
@@ -230,4 +231,35 @@ INSTANTIATE_TEST_SUITE_P(TestLevenshteinSuite, TestLevenshtein,
                                            TestLevenshteinParam("", "book", 4),
                                            TestLevenshteinParam("randomstring", "juststring", 6)));
 
+struct TestSeparatorValidationParam {
+    CSVConfig csv_config;
+    char test_separator;
+    std::optional<char> expected_separator;
+};
+
+class TestSeparatorValidation : public ::testing::TestWithParam<TestSeparatorValidationParam> {};
+
+TEST_P(TestSeparatorValidation, Default) {
+    TestSeparatorValidationParam const& p = GetParam();
+    std::optional<char> actual = util::ValidateSeparator(p.csv_config.path, p.test_separator).first;
+    EXPECT_EQ(actual, p.expected_separator);
+}
+
+INSTANTIATE_TEST_SUITE_P(TestSeparatorValidationSuite, TestSeparatorValidation,
+                         ::testing::Values(TestSeparatorValidationParam(kTest1, ',', ','),
+                                           TestSeparatorValidationParam(kTest1, ';', ';'),
+                                           TestSeparatorValidationParam(kTest1, '1', std::nullopt),
+                                           TestSeparatorValidationParam(kTestFD, ',', ','),
+                                           TestSeparatorValidationParam(kTestFD, ';', ','),
+                                           TestSeparatorValidationParam(kAdult, ';', ';'),
+                                           TestSeparatorValidationParam(kAdult, ',', ';'),
+                                           TestSeparatorValidationParam(kAbalone, ',', ','),
+                                           TestSeparatorValidationParam(kAbalone, '.', ','),
+                                           TestSeparatorValidationParam(kTestParse, ',', ','),
+                                           TestSeparatorValidationParam(kTestSeparator, ',', ','),
+                                           TestSeparatorValidationParam(kTestSeparator, ';', ','),
+                                           TestSeparatorValidationParam(kTestSeparator1, ',', ','),
+                                           TestSeparatorValidationParam(kTestSeparator1, ';',
+                                                                        ';')));
+
 }  // namespace tests
diff --git a/test_input_data/TestSeparator.csv b/test_input_data/TestSeparator.csv
@@ -0,0 +1,3 @@
+"a,;b",c
+"a;","b,c"
+a,b;c
diff --git a/test_input_data/TestSeparator1.csv b/test_input_data/TestSeparator1.csv
@@ -0,0 +1,3 @@
+,;,;,;
+;,;,;,
+,;,;,;