5 files changed, 120 insertions, 0 deletions
diff --git a/vdstestlib/src/tests/dirconfig/.gitignore b/vdstestlib/src/tests/dirconfig/.gitignore
new file mode 100644
index 00000000000..d19c58dc3e5
--- /dev/null
+++ b/vdstestlib/src/tests/dirconfig/.gitignore
@@ -0,0 +1,5 @@
+.depend
+Makefile
+dirconfig.tmp
+dirconfig_test
+vdstestlib_dirconfig_test_app
diff --git a/vdstestlib/src/tests/dirconfig/CMakeLists.txt b/vdstestlib/src/tests/dirconfig/CMakeLists.txt
new file mode 100644
index 00000000000..1cd06c06930
--- /dev/null
+++ b/vdstestlib/src/tests/dirconfig/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(vdstestlib_dirconfig_test_app
+    SOURCES
+    dirconfigtest.cpp
+    DEPENDS
+    vdstestlib
+)
+vespa_add_test(NAME vdstestlib_dirconfig_test_app NO_VALGRIND COMMAND vdstestlib_dirconfig_test_app)
diff --git a/vdstestlib/src/tests/dirconfig/DESC b/vdstestlib/src/tests/dirconfig/DESC
new file mode 100644
index 00000000000..2a3a952a471
--- /dev/null
+++ b/vdstestlib/src/tests/dirconfig/DESC
@@ -0,0 +1 @@
+Tests that dirconfig class works correctly.
diff --git a/vdstestlib/src/tests/dirconfig/FILES b/vdstestlib/src/tests/dirconfig/FILES
new file mode 100644
index 00000000000..6e94447a2bd
--- /dev/null
+++ b/vdstestlib/src/tests/dirconfig/FILES
@@ -0,0 +1 @@
+dirconfigtest.cpp
diff --git a/vdstestlib/src/tests/dirconfig/dirconfigtest.cpp b/vdstestlib/src/tests/dirconfig/dirconfigtest.cpp
new file mode 100644
index 00000000000..d373b7de7e4
--- /dev/null
+++ b/vdstestlib/src/tests/dirconfig/dirconfigtest.cpp
@@ -0,0 +1,105 @@
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#include <vespa/fastos/fastos.h>
+#include <vespa/vdstestlib/cppunit/dirconfig.h>
+
+#include <fstream>
+#include <iostream>
+#include <vespa/log/log.h>
+#include <vespa/vespalib/testkit/testapp.h>
+#include <vespa/vespalib/util/exceptions.h>
+
+LOG_SETUP("dirconfig_test");
+
+using namespace vdstestlib;
+
+namespace vespalib {
+
+class Test : public vespalib::TestApp
+{
+public:
+    void testNormalUsage();
+    int Main();
+};
+
+int
+Test::Main()
+{
+    TEST_INIT("dirconfig_test");
+    srandom(1);
+    testNormalUsage();
+    TEST_DONE();
+}
+
+#define ASSERT_FILE_CONTENT(file, content) \
+{ \
+    std::ifstream in(file); \
+    std::ostringstream ost; \
+    std::string line; \
+    while (getline(in, line, '\n')) { \
+        ost << line << '\n'; \
+    } \
+    EXPECT_EQUAL(content, ost.str()); \
+}
+
+void Test::testNormalUsage() {
+    DirConfig config1;
+    DirConfig config2;
+
+    EXPECT_EQUAL("dir:dirconfig.tmp/1", config1.getConfigId());
+    EXPECT_EQUAL("dir:dirconfig.tmp/2", config2.getConfigId());
+
+    try{
+        config1.getConfig("testconfig");
+        TEST_FATAL("Not supposed to get here");
+    } catch (vespalib::Exception& e) {
+        EXPECT_EQUAL("No config named testconfig", e.getMessage());
+    }
+    DirConfig::Config& file1(config1.addConfig("testconfig"));
+    try{
+        config1.addConfig("testconfig");
+        TEST_FATAL("Not supposed to get here");
+    } catch (vespalib::Exception& e) {
+        EXPECT_EQUAL("There is already a config named testconfig",
+                   e.getMessage());
+    }
+    EXPECT_EQUAL(&file1, &config1.getConfig("testconfig"));
+    file1.set("intval", "5");
+    file1.set("intval", "7");
+    file1.set("stringval", "\"foo\"");
+    file1.set("tmpval", "4");
+    file1.remove("tmpval");
+        // Trigger publish
+    config1.getConfigId();
+
+    ASSERT_FILE_CONTENT("dirconfig.tmp/1/testconfig.cfg",
+                        "intval 7\n"
+                        "stringval \"foo\"\n");
+
+    DirConfig::Config& file2(config2.addConfig("testconfig"));
+    file2.set("longval", "6");
+    file2.clear();
+    file2.set("intval", "4");
+
+    DirConfig::Config& file3(config1.addConfig("config2"));
+    file3.set("intval", "3");
+    file3.set("myarray[2]");
+    file3.set("myarray[0].foo", "4");
+    file3.set("myarray[1].foo", "2");
+
+    config1.publish();
+    config2.publish();
+
+    ASSERT_FILE_CONTENT("dirconfig.tmp/2/testconfig.cfg",
+                        "intval 4\n");
+    ASSERT_FILE_CONTENT("dirconfig.tmp/1/config2.cfg",
+                        "intval 3\n"
+                        "myarray[2]\n"
+                        "myarray[0].foo 4\n"
+                        "myarray[1].foo 2\n");
+
+}
+
+} // vespalib
+
+TEST_APPHOOK(vespalib::Test)