* Improvement #2 : the CommandManager is now a static class so,

[gdcm.git] / Testing / TestCommand.cxx

diff --git a/Testing/TestCommand.cxx b/Testing/TestCommand.cxx
index 84de4307369854d52e27069ef8a842c5d52d28e0..ab7b41522960ca9ec2d7930110ae9952054f712c 100644 (file)
--- a/Testing/TestCommand.cxx
+++ b/Testing/TestCommand.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestCommand.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/28 15:20:29 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2005/11/28 16:31:19 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -60,33 +60,31 @@ int TestCommand(int argc, char *argv[])
 {
    int error=0;
 
-   gdcm::CommandManager *mgr = gdcm::CommandManager::New();
-   CommandTest *cmd = CommandTest::New();
    gdcm::CallbackCommand *cbk = gdcm::CallbackCommand::New();
    cbk->SetCallback(CallbackTest);
-
-   mgr->SetCommand(2,cmd);
-   mgr->SetCommand(1,cbk);
-
+   gdcm::CommandManager::SetCommand(NULL,1,cbk);
    cbk->Delete();
+
+   CommandTest *cmd = CommandTest::New();
+   gdcm::CommandManager::SetCommand(NULL,2,cmd);
    cmd->Delete();
 
    std::cout << "Test on callback function execution\n";
-   mgr->ExecuteCommand(1,"Test on callback function");
+   gdcm::CommandManager::ExecuteCommand(NULL,1,"Test on callback function");
    if(!fctExecuted)
       std::cout<<"... Failed\n";
    error+=!fctExecuted;
    std::cout << std::endl;
 
    std::cout << "Test on command class execution\n";
-   mgr->ExecuteCommand(2,"Test on command class");
+   gdcm::CommandManager::ExecuteCommand(NULL,2,"Test on command class");
    if(!cmd->IsExecuted())
       std::cout<<"... Failed\n";
    error+=!cmd->IsExecuted();
    std::cout << std::endl;
 
    std::cout << "Test on unset command execution\n";
-   mgr->ExecuteCommand(3,"Test on callback function");
+   gdcm::CommandManager::ExecuteCommand(NULL,3,"Test on callback function");
    std::cout << std::endl;
 
    return error;