Update the tests

1 files changed, 13 insertions, 15 deletions

diff --git a/sigscript/test/TestConfig.cpp b/sigscript/test/TestConfig.cpp
index 64b858d2..5fee993d 100644
--- a/sigscript/test/TestConfig.cpp
+++ b/sigscript/test/TestConfig.cpp
@@ -30,7 +30,7 @@ using namespace Sigscript;
 void TestConfig::initTestCase()
 {
     qRegisterMetaType<QVariant>("QVariant");
-    qRegisterMetaType<Config::Options>("Sigscript::Config::Options");
+    qRegisterMetaType<ConfigOptions>("Sigscript::ConfigOptions");
     m_config = new Config(NULL);
 }
 
@@ -95,22 +95,22 @@ void TestConfig::testRemoveValue()
 
 void TestConfig::testSetOptions()
 {
-    QSignalSpy changeSpy(m_config, SIGNAL(optionsChanged(QString, Sigscript::Config::Options)));
+    QSignalSpy changeSpy(m_config, SIGNAL(optionsChanged(QString, Sigscript::ConfigOptions)));
     
-    m_config->setOptions("op1", Config::Deleted);
-    m_config->setOptions("op2", Config::Hidden);
-    m_config->setOptions("op3", Config::ReadOnly);
-    m_config->setOptions("op4", Config::Temporary);
+    QCOMPARE(m_config->setOptions("op1", Deleted), true);
+    QCOMPARE(m_config->setOptions("op2", Hidden), true);
+    QCOMPARE(m_config->setOptions("op3", ReadOnly), true);
+    QCOMPARE(m_config->setOptions("op4", Temporary), true);
     
-    m_config->setOptions("op1", Config::Deleted);
+    QCOMPARE(m_config->setOptions("op2", Hidden), false);
     
     QCOMPARE(changeSpy.count(), 4);
 }
 
 void TestConfig::testOptions()
 {
-    QSignalSpy addSpy(m_config, SIGNAL(valueAdded(QString, QVariant)));
     QSignalSpy changeSpy(m_config, SIGNAL(valueChanged(QString, QVariant)));
+    QSignalSpy optChangeSpy(m_config, SIGNAL(optionsChanged(QString, Sigscript::ConfigOptions)));
     
     QCOMPARE(m_config->hasValue("op1"), false);
     QCOMPARE(m_config->hasValue("op2"), false);
@@ -123,15 +123,14 @@ void TestConfig::testOptions()
     
     QCOMPARE(m_config->value("op3").toInt(), 3);
     
-    QCOMPARE(addSpy.count(), 1);
     QCOMPARE(changeSpy.count(), 1);
-    
+    QCOMPARE(optChangeSpy.count(), 1);
 }
 
 void TestConfig::testClean()
 {
     QSignalSpy removeSpy(m_config, SIGNAL(valueRemoved(QString)));
-    QSignalSpy changeSpy(m_config, SIGNAL(optionsChanged(QString, Sigscript::Config::Options)));
+    QSignalSpy changeSpy(m_config, SIGNAL(optionsChanged(QString, Sigscript::ConfigOptions)));
     
     m_config->clean();
     
@@ -142,10 +141,10 @@ void TestConfig::testClean()
 void TestConfig::testUnsetOptions()
 {
     QSignalSpy changeSpy(m_config, SIGNAL(valueChanged(QString, QVariant)));
-    QSignalSpy optChangeSpy(m_config, SIGNAL(optionsChanged(QString, Sigscript::Config::Options)));
+    QSignalSpy optChangeSpy(m_config, SIGNAL(optionsChanged(QString, Sigscript::ConfigOptions)));
     
-    QCOMPARE(m_config->unsetOptions("blag", Config::Hidden), false);
-    QCOMPARE(m_config->unsetOptions("op3", Config::ReadOnly), true);
+    QCOMPARE(m_config->unsetOptions("blag", Hidden), false);
+    QCOMPARE(m_config->unsetOptions("op3", ReadOnly), true);
     
     QCOMPARE(m_config->setValue("op3", 30), true);
     QCOMPARE(m_config->value("op3").toInt(), 30);
@@ -161,7 +160,6 @@ void TestConfig::testValueList()
     QStringList list;
     list << "bar" << "baz" << "op1" << "op3";
     
-    QEXPECT_FAIL("", "Waiting for clean to work", Continue);
     QCOMPARE(values, list);
     
     Config* subConfig = new Config(m_config);