From a0dda8c8b25e61cdab7e6bb8ae62d97f538a2052 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 21 May 2015 20:50:22 +0200 Subject: Make C++11 fix. --- test/test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/test.cc b/test/test.cc index 88c72e6..282062d 100644 --- a/test/test.cc +++ b/test/test.cc @@ -40,7 +40,7 @@ int main(int argc, char* argv[]) runner.addTest( suite ); std::ofstream myfile; - myfile.open("result_"OUTPUT".xml"); + myfile.open("result_" OUTPUT ".xml"); runner.setOutputter(new CppUnit::XmlOutputter(&runner.result(), myfile)); // Run the tests. -- cgit v1.2.3 From 560c26d33c76fee45b04e92ffd36ce885c357db6 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 21 May 2015 20:52:08 +0200 Subject: New configfile parser with unit test. --- test/Makefile.am | 11 +++- test/configtest.cc | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 193 insertions(+), 1 deletion(-) create mode 100644 test/configtest.cc (limited to 'test') diff --git a/test/Makefile.am b/test/Makefile.am index 5aaf33f..90373e1 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,7 +1,7 @@ # Rules for the test code (use `make check` to execute) include $(top_srcdir)/src/Makefile.am.drumgizmo -TESTS = engine gui resampler lv2 +TESTS = engine gui resampler lv2 configfile check_PROGRAMS = $(TESTS) @@ -40,3 +40,12 @@ lv2_SOURCES = \ test.cc \ lv2_test_host.cc \ lv2.cc + +configfile_CXXFLAGS = -DOUTPUT=\"configfile\" $(CPPUNIT_CFLAGS) \ + -I$(top_srcdir)/hugin +configfile_LDFLAGS = $(CPPUNIT_LIBS) +configfile_SOURCES = \ + $(top_srcdir)/src/configfile.cc \ + $(top_srcdir)/hugin/hugin.c \ + test.cc \ + configtest.cc diff --git a/test/configtest.cc b/test/configtest.cc new file mode 100644 index 0000000..c05299f --- /dev/null +++ b/test/configtest.cc @@ -0,0 +1,183 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/*************************************************************************** + * configtest.cc + * + * Thu May 14 20:58:29 CEST 2015 + * Copyright 2015 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of DrumGizmo. + * + * DrumGizmo is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * DrumGizmo is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with DrumGizmo; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + */ +#include + +#include +#include + +#include "../src/configfile.h" + +class TestConfigFile : public ConfigFile { +public: + TestConfigFile() : ConfigFile("") {} + +protected: + // Overload the built-in open method to use local file instead of homedir. + virtual bool open(std::string mode) override + { + fp = fopen("test.conf", mode.c_str()); + return fp != nullptr; + } +}; + +class test_configtest : public CppUnit::TestFixture +{ + CPPUNIT_TEST_SUITE(test_configtest); + CPPUNIT_TEST(loading_no_newline); + CPPUNIT_TEST(loading_equal_sign); + CPPUNIT_TEST(loading_newline); + CPPUNIT_TEST(loading_padding_space); + CPPUNIT_TEST(loading_padding_space_newline); + CPPUNIT_TEST(loading_padding_tab); + CPPUNIT_TEST(loading_padding_tab_newline); + CPPUNIT_TEST(loading_comment); + CPPUNIT_TEST(loading_inline_comment); + CPPUNIT_TEST(loading_single_quoted_string); + CPPUNIT_TEST(loading_double_quoted_string); + CPPUNIT_TEST_SUITE_END(); + +public: + void setUp() + { + } + + void tearDown() + { + unlink("test.conf"); + } + + void writeFile(const char* str) + { + FILE* fp = fopen("test.conf", "w"); + fprintf(fp, "%s", str); + fclose(fp); + } + + void loading_no_newline() + { + writeFile("a:b"); + + TestConfigFile cf; + cf.load(); + CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a")); + } + + void loading_equal_sign() + { + writeFile(" a =\tb\t\n"); + + TestConfigFile cf; + cf.load(); + CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a")); + } + + void loading_newline() + { + writeFile("a:b\n"); + + TestConfigFile cf; + cf.load(); + CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a")); + } + + void loading_padding_space() + { + writeFile(" a : b "); + + TestConfigFile cf; + cf.load(); + CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a")); + } + + void loading_padding_tab() + { + writeFile("\ta\t:\tb\t"); + + TestConfigFile cf; + cf.load(); + CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a")); + } + + void loading_padding_space_newline() + { + writeFile(" a : b \n"); + + TestConfigFile cf; + cf.load(); + CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a")); + } + + void loading_padding_tab_newline() + { + writeFile("\ta\t:\tb\t\n"); + + TestConfigFile cf; + cf.load(); + CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a")); + } + + void loading_comment() + { + writeFile("# comment\na:b\n"); + + TestConfigFile cf; + cf.load(); + CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a")); + } + + void loading_inline_comment() + { + writeFile("a:b #comment\n"); + + TestConfigFile cf; + cf.load(); + CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a")); + } + + void loading_single_quoted_string() + { + writeFile("a: '#\"b\" ' \n"); + + TestConfigFile cf; + cf.load(); + CPPUNIT_ASSERT_EQUAL(std::string("#\"b\" "), cf.getValue("a")); + } + + void loading_double_quoted_string() + { + writeFile("a: \"#'b' \" \n"); + + TestConfigFile cf; + cf.load(); + CPPUNIT_ASSERT_EQUAL(std::string("#'b' "), cf.getValue("a")); + } +}; + +// Registers the fixture into the 'registry' +CPPUNIT_TEST_SUITE_REGISTRATION(test_configtest); + + -- cgit v1.2.3 From 28776a862e6a00f4209c95531592c1abe08448f2 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 21 May 2015 20:56:56 +0200 Subject: override not supported by our build servers, so better not use it yet. --- test/configtest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/configtest.cc b/test/configtest.cc index c05299f..e12123f 100644 --- a/test/configtest.cc +++ b/test/configtest.cc @@ -37,7 +37,7 @@ public: protected: // Overload the built-in open method to use local file instead of homedir. - virtual bool open(std::string mode) override + virtual bool open(std::string mode) { fp = fopen("test.conf", mode.c_str()); return fp != nullptr; -- cgit v1.2.3 From d7e31edc42e075567059c2ddcda6bb19b4c7bd69 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 21 May 2015 21:00:41 +0200 Subject: nullptr not supported by our build servers, so better not use it yet. --- test/configtest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/configtest.cc b/test/configtest.cc index e12123f..6adcd39 100644 --- a/test/configtest.cc +++ b/test/configtest.cc @@ -40,7 +40,7 @@ protected: virtual bool open(std::string mode) { fp = fopen("test.conf", mode.c_str()); - return fp != nullptr; + return fp != NULL; } }; -- cgit v1.2.3 From 6e3b53cd1b0fc6dcd721fac3beb699cb722e1e23 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Fri, 22 May 2015 08:30:24 +0200 Subject: Add error handling in ConfigFile parser. --- test/configtest.cc | 58 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 11 deletions(-) (limited to 'test') diff --git a/test/configtest.cc b/test/configtest.cc index 6adcd39..24a7048 100644 --- a/test/configtest.cc +++ b/test/configtest.cc @@ -58,6 +58,10 @@ class test_configtest : public CppUnit::TestFixture CPPUNIT_TEST(loading_inline_comment); CPPUNIT_TEST(loading_single_quoted_string); CPPUNIT_TEST(loading_double_quoted_string); + CPPUNIT_TEST(loading_error_no_key); + CPPUNIT_TEST(loading_error_no_value); + CPPUNIT_TEST(loading_error_string_not_terminated_single); + CPPUNIT_TEST(loading_error_string_not_terminated_double); CPPUNIT_TEST_SUITE_END(); public: @@ -82,7 +86,7 @@ public: writeFile("a:b"); TestConfigFile cf; - cf.load(); + CPPUNIT_ASSERT_EQUAL(true, cf.load()); CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a")); } @@ -91,7 +95,7 @@ public: writeFile(" a =\tb\t\n"); TestConfigFile cf; - cf.load(); + CPPUNIT_ASSERT_EQUAL(true, cf.load()); CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a")); } @@ -100,7 +104,7 @@ public: writeFile("a:b\n"); TestConfigFile cf; - cf.load(); + CPPUNIT_ASSERT_EQUAL(true, cf.load()); CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a")); } @@ -109,7 +113,7 @@ public: writeFile(" a : b "); TestConfigFile cf; - cf.load(); + CPPUNIT_ASSERT_EQUAL(true, cf.load()); CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a")); } @@ -118,7 +122,7 @@ public: writeFile("\ta\t:\tb\t"); TestConfigFile cf; - cf.load(); + CPPUNIT_ASSERT_EQUAL(true, cf.load()); CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a")); } @@ -127,7 +131,7 @@ public: writeFile(" a : b \n"); TestConfigFile cf; - cf.load(); + CPPUNIT_ASSERT_EQUAL(true, cf.load()); CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a")); } @@ -136,7 +140,7 @@ public: writeFile("\ta\t:\tb\t\n"); TestConfigFile cf; - cf.load(); + CPPUNIT_ASSERT_EQUAL(true, cf.load()); CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a")); } @@ -145,7 +149,7 @@ public: writeFile("# comment\na:b\n"); TestConfigFile cf; - cf.load(); + CPPUNIT_ASSERT_EQUAL(true, cf.load()); CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a")); } @@ -154,7 +158,7 @@ public: writeFile("a:b #comment\n"); TestConfigFile cf; - cf.load(); + CPPUNIT_ASSERT_EQUAL(true, cf.load()); CPPUNIT_ASSERT_EQUAL(std::string("b"), cf.getValue("a")); } @@ -163,7 +167,7 @@ public: writeFile("a: '#\"b\" ' \n"); TestConfigFile cf; - cf.load(); + CPPUNIT_ASSERT_EQUAL(true, cf.load()); CPPUNIT_ASSERT_EQUAL(std::string("#\"b\" "), cf.getValue("a")); } @@ -172,9 +176,41 @@ public: writeFile("a: \"#'b' \" \n"); TestConfigFile cf; - cf.load(); + CPPUNIT_ASSERT_EQUAL(true, cf.load()); CPPUNIT_ASSERT_EQUAL(std::string("#'b' "), cf.getValue("a")); } + + void loading_error_no_key() + { + writeFile(":foo"); + + TestConfigFile cf; + CPPUNIT_ASSERT_EQUAL(false, cf.load()); + } + + void loading_error_no_value() + { + writeFile("key"); + + TestConfigFile cf; + CPPUNIT_ASSERT_EQUAL(false, cf.load()); + } + + void loading_error_string_not_terminated_single() + { + writeFile("a:'b\n"); + + TestConfigFile cf; + CPPUNIT_ASSERT_EQUAL(false, cf.load()); + } + + void loading_error_string_not_terminated_double() + { + writeFile("a:\"b\n"); + + TestConfigFile cf; + CPPUNIT_ASSERT_EQUAL(false, cf.load()); + } }; // Registers the fixture into the 'registry' -- cgit v1.2.3