Socket: Documentation for new addressing classes

[senf.git] / Console / Executor.test.cc

diff --git a/Console/Executor.test.cc b/Console/Executor.test.cc
index 0e751f1..1266ae0 100644 (file)
--- a/Console/Executor.test.cc
+++ b/Console/Executor.test.cc
@@ -62,7 +62,8 @@ BOOST_AUTO_UNIT_TEST(executor)
         parser.parse("cd dir1", &setCommand);
         executor(os, commands.back());
         BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::BuiltinCD );
-        BOOST_CHECK( &executor.cwd() == &senf::console::root()["dir1"] );
+        BOOST_CHECK( executor.cwd() == senf::console::root()["dir1"] );
+        BOOST_CHECK_EQUAL( executor.cwdPath(), "/dir1" );
         BOOST_CHECK_EQUAL( os.str(), "" );
     }
 
@@ -78,10 +79,10 @@ BOOST_AUTO_UNIT_TEST(executor)
     {
         std::stringstream os;
         parser.parse("cd dir1", &setCommand);
-        executor(os, commands.back());
+        BOOST_CHECK_THROW( executor(os, commands.back()), senf::console::SyntaxErrorException );
         BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::BuiltinCD );
         BOOST_CHECK( &executor.cwd() == &senf::console::root()["dir2"] );
-        BOOST_CHECK_EQUAL( os.str(), "invalid directory\n" );
+        BOOST_CHECK_EQUAL( os.str(), "" );
     }
 
     {
@@ -112,9 +113,9 @@ BOOST_AUTO_UNIT_TEST(executor)
     {
         std::stringstream os;
         parser.parse("ls dir3", &setCommand);
-        executor(os, commands.back());
+        BOOST_CHECK_THROW( executor(os, commands.back()), senf::console::SyntaxErrorException );
         BOOST_CHECK_EQUAL( commands.back().builtin(), senf::console::ParseCommandInfo::BuiltinLS );
-        BOOST_CHECK_EQUAL( os.str(), "invalid directory\n" );
+        BOOST_CHECK_EQUAL( os.str(), "" );
     }
     
     {
@@ -228,6 +229,38 @@ BOOST_AUTO_UNIT_TEST(executorPolicy)
     senf::console::root().remove("dir2");
 }
 
+BOOST_AUTO_UNIT_TEST(executorAuto)
+{
+    senf::console::root().mkdir("dir1").mkdir("dir3");
+    senf::console::root().mkdir("dir2").doc("Helptext").add("test",&testCommand);
+
+    senf::console::Executor executor;
+    executor
+        .autocomplete(true)
+        .autocd(true);
+    senf::console::CommandParser parser;
+
+    {
+        std::stringstream os;
+        parser.parse("dir2", &setCommand);
+        executor(os, commands.back());
+        BOOST_CHECK_EQUAL( executor.cwdPath(), "/dir2" );
+        BOOST_CHECK_EQUAL( os.str(), "" );
+    }
+    
+    {
+        std::stringstream os;
+        parser.parse("t", &setCommand);
+        executor(os, commands.back());
+        BOOST_CHECK_EQUAL( os.str(), "testCommand\n" );
+    }
+    
+
+    commands.clear();
+    senf::console::root().remove("dir1");
+    senf::console::root().remove("dir2");
+}
+
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_