X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FVariables.test.cc;h=6269b3f38eddb9ca30df0bba78e47fdb28d03f60;hb=6aae6e526573187ece558842e928578e5aa4cc4c;hp=cff60d1b2b87944a3678605e0a2b3db1a9f22b26;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/Console/Variables.test.cc b/senf/Utils/Console/Variables.test.cc
index cff60d1..6269b3f 100644
--- a/senf/Utils/Console/Variables.test.cc
+++ b/senf/Utils/Console/Variables.test.cc
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
@@ -31,7 +31,7 @@
 #include <sstream>
 #include "Console.hh"
 
-#include "../../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
@@ -49,8 +49,10 @@ namespace {
     { changed_ = true; }
 }
 
-BOOST_AUTO_UNIT_TEST(variables)
+SENF_AUTO_UNIT_TEST(variables)
 {
+    namespace fty = senf::console::factory;
+
     senf::console::Executor executor;
     senf::console::CommandParser parser;
     senf::console::ScopedDirectory<> dir;
@@ -59,12 +61,13 @@ BOOST_AUTO_UNIT_TEST(variables)
     int var (5);
 
     std::stringstream ss;
-    dir.add("var", var)
+    dir.add("var", fty::Variable(var)
         .doc("Current blorg limit")
         .formatter(&testFormatter)
         .parser(&testParser)
         .typeName("number")
-        .onChange(&testCallback);
+        .onChange(&testCallback)
+        );
     parser.parse("test/var; test/var 10; test/var",
                  boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 ));
     BOOST_CHECK_EQUAL( ss.str(), "[5]\n[0]\n" );
@@ -72,45 +75,48 @@ BOOST_AUTO_UNIT_TEST(variables)
 
     ss.str("");
     dir("var").help(ss);
-    BOOST_CHECK_EQUAL(ss.str(), 
+    BOOST_CHECK_EQUAL(ss.str(),
                       "Usage:\n"
-                      "    1- var new_value:number\n"
-                      "    2- var\n"
+                      "    1- var\n"
+                      "    2- var new_value:number\n"
                       "\n"
                       "Current blorg limit\n");
 
-    senf::console::CommandNode & refvar (dir.add("refvar", boost::ref(var))
+    senf::console::CommandNode & refvar (dir.add("refvar", fty::Variable(boost::ref(var))
         .doc("Current blorg limit")
         .formatter(&testFormatter)
         .parser(&testParser)
-        .typeName("number"));
+        .typeName("number")
+    ));
 
-    (void) refvar;
+    senf::IGNORE( refvar );
 
-    dir.add("crefvar", boost::cref(var))
+    dir.add("crefvar", fty::Variable(boost::cref(var))
         .doc("Current blorg limit")
-        .formatter(&testFormatter);
+        .formatter(&testFormatter)
+        );
 }
 
 namespace {
-    
+
     class Test2
     {
     public:
         senf::console::ScopedDirectory<Test2> dir;
-        
+
         Test2() : dir(this), var_(0)
-            { dir.add("var", var_); }
-        
+            { dir.add("var", senf::console::factory::Variable(boost::ref(var_))); }
+
     private:
         int var_;
     };
-  
+
 }
 
-BOOST_AUTO_UNIT_TEST(memberVariables)
+SENF_AUTO_UNIT_TEST(memberVariables)
 {
     Test2 test2ob;
+    BOOST_CHECK( true );
 }
 
 #ifdef COMPILE_CHECK