more tests, exception fix (3a34fbdf) · Commits · github_fork / Clip

src/backends/csv/csvbackend_test.cc

+11 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,17 @@ TEST_CASE(CSVFileTest, TestInvalidFileName, [] () {
		});
		});

		TEST_CASE(CSVFileTest, TestReadHeaders, [] () {
		auto csv_file = CSVFile::openFile("test/fixtures/gbp_per_country_simple.csv");
		EXPECT(csv_file.get() != nullptr);
		std::vector<std::string> headers;
		csv_file->readNextRow(&headers);
		EXPECT(headers.size() == 2);
		EXPECT(headers[0] == "country");
		EXPECT(headers[1] == "gbp");
		});


		/*
		int main() {
		try {

+15 −2

Original line number	Diff line number	Diff line
		@@ -12,7 +12,11 @@
		namespace fnordmetric {
		namespace csv_backend {

		std::unique_ptr<CSVFile> CSVFile::openFile(const std::string& file_path) {
		std::unique_ptr<CSVFile> CSVFile::openFile(
		const std::string& file_path,
		char column_seperator /* = ',' */,
		char row_seperator /* = '\n' */,
		char quote_char /* = '"' */) {
		auto fp = file_path.c_str();
		int fd = open(fp, O_RDONLY);

		@@ -28,9 +32,18 @@ std::unique_ptr<CSVFile> CSVFile::openFile(const std::string& file_path) {
		return std::unique_ptr<CSVFile>(csv_file);
		}

		CSVFile::CSVFile(int fd) : fd_(fd) {
		CSVFile::CSVFile(
		int fd,
		char column_seperator /* = ',' */,
		char row_seperator /* = '\n' */,
		char quote_char /* = '"' */) :
		fd_(fd) {
		assert(fd > 0);
		}

		void CSVFile::readNextRow(std::vector<std::string>* target) {

		}

		}
		}

+15 −2

Original line number	Diff line number	Diff line
		@@ -28,7 +28,11 @@ public:
		*
		* @param file_path the path to the csv file
		*/
		static std::unique_ptr<CSVFile> openFile(const std::string& file_path);
		static std::unique_ptr<CSVFile> openFile(
		const std::string& file_path,
		char column_seperator = ',',
		char row_seperator = '\n',
		char quote_char = '"');

		CSVFile(const CSVFile& other) = delete;
		CSVFile& operator=(const CSVFile& other) = delete;
		@@ -39,7 +43,16 @@ public:
		*
		* @param fd a valid an opened fd, transfers ownership and closes on destruct
		*/
		explicit CSVFile(int fd);
		explicit CSVFile(
		int fd,
		char column_seperator = ',',
		char row_seperator = '\n',
		char quote_char = '"');

		/**
		* Read the next row from the csv file
		*/
		void readNextRow(std::vector<std::string>* target);

		protected:
		int fd_;

+2 −2

Original line number	Diff line number	Diff line
		@@ -37,10 +37,10 @@ RuntimeException::RuntimeException(
		pos = 0;
		}

		if (errno > 0) {
		if (posix_errno > 0) {
		snprintf(message_ + pos, sizeof(message_) - pos, ": ");
		pos += 2;
		strerror_r(errno, message_ + pos, sizeof(message_) - pos);
		strerror_r(posix_errno, message_ + pos, sizeof(message_) - pos);
		}
		}

+3 −3