Commit 760cf331 authored by Victor Kotlyar's avatar Victor Kotlyar
Browse files

Repalce castor::exception::CommandLineNotParsed with

cta::exception::CommandLineNotParsed
parent 020d8fea
......@@ -73,6 +73,7 @@ set (COMMON_LIB_SRC_FILES
exception/UserError.cpp
exception/AcceptConnectionInterrupted.cpp
exception/BadAlloc.cpp
exception/CommandLineNotParsed.cpp
log/DummyLogger.cpp
log/LogContext.cpp
log/Logger.cpp
......
......@@ -21,12 +21,12 @@
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#include "castor/exception/CommandLineNotParsed.hpp"
#include "common/exception/CommandLineNotParsed.hpp"
// -----------------------------------------------------------------------------
// Constructor
// -----------------------------------------------------------------------------
castor::exception::CommandLineNotParsed::CommandLineNotParsed():
cta::exception::CommandLineNotParsed::CommandLineNotParsed():
cta::exception::Exception() {
}
......@@ -25,7 +25,7 @@
#include "common/exception/Exception.hpp"
namespace castor { namespace exception {
namespace cta { namespace exception {
/**
* CommandLineNotParsed.
......@@ -41,5 +41,5 @@ namespace castor { namespace exception {
}; // class CommandLineNotParsed
} } // namespace castor exception
} } // namespace cta exception
......@@ -128,7 +128,7 @@ const std::string &castor::server::Daemon::getServerName() const throw() {
bool castor::server::Daemon::getForeground() const
{
if(!m_commandLineHasBeenParsed) {
castor::exception::CommandLineNotParsed ex;
cta::exception::CommandLineNotParsed ex;
ex.getMessage() <<
"Failed to determine whether or not the daemon should run in the"
" foreground because the command-line has not yet been parsed";
......
......@@ -21,7 +21,7 @@
#pragma once
#include "castor/exception/CommandLineNotParsed.hpp"
#include "common/exception/CommandLineNotParsed.hpp"
#include "castor/log/Logger.hpp"
#include "common/exception/Exception.hpp"
......
......@@ -64,7 +64,7 @@ TEST_F(castor_server_DaemonTest, getForegroundBeforeParseCommandLine) {
castor::log::DummyLogger log(m_programName);
castor::server::Daemon daemon(dummyStdOut, dummyStdErr, log);
ASSERT_THROW(daemon.getForeground(), castor::exception::CommandLineNotParsed);
ASSERT_THROW(daemon.getForeground(), cta::exception::CommandLineNotParsed);
}
TEST_F(castor_server_DaemonTest, parseEmptyCmdLine) {
......
......@@ -38,7 +38,6 @@ set (UTILS_LIB_SRC_FILES
../exception/MissingOperand.cpp
../exception/NoPortInRange.cpp
../exception/TimeOut.cpp
../exception/CommandLineNotParsed.cpp
../exception/OutOfMemory.cpp
../BaseObject.cpp
../Services.cpp
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment