Commit e1e1ed82 authored by Eric Cano's avatar Eric Cano
Browse files

Fixed wrong capitalization of class name.

parent 0b32e99a
......@@ -3,10 +3,10 @@ add_executable(tapeserverd TapeDaemon.cpp TapeDaemonMain.cpp)
target_link_libraries(tapeserverd Exception SCSI System Utils File castorcommon
castorclient)
add_library(tapeserver clientInterface.cpp)
add_library(tapeserver ClientInterface.cpp)
add_library(tapeserverdTest
clientSimulator.cpp
ClientSimulator.cpp
../../tpcp/TpcpCommand.cpp
../../tpcp/StreamOperators.cpp
../../tpcp/Helper.cpp
......
......@@ -22,7 +22,7 @@
* @author Castor Dev team, castor-dev@cern.ch
*****************************************************************************/
#include "clientInterface.hpp"
#include "ClientInterface.hpp"
#include "castor/io/ClientSocket.hpp"
#include "castor/tape/tapegateway/VolumeRequest.hpp"
#include "castor/tape/tapegateway/Volume.hpp"
......
......@@ -25,7 +25,7 @@
#include <typeinfo>
#include <memory>
#include "clientSimulator.hpp"
#include "ClientSimulator.hpp"
#include "../../tapegateway/GatewayMessage.hpp"
#include "castor/tape/tapegateway/Volume.hpp"
#include "castor/tape/tapegateway/EndNotificationErrorReport.hpp"
......@@ -33,7 +33,7 @@
using namespace castor::tape::server;
using namespace castor::tape;
clientSimulator::clientSimulator(uint32_t volReqId, std::string vid):
ClientSimulator::ClientSimulator(uint32_t volReqId, std::string vid):
TpcpCommand("clientSimulator::clientSimulator"), m_vid(vid)
{
m_volReqId = volReqId;
......@@ -41,7 +41,7 @@ clientSimulator::clientSimulator(uint32_t volReqId, std::string vid):
}
void clientSimulator::processFirstRequest()
void ClientSimulator::processFirstRequest()
throw (castor::exception::Exception) {
// Accept the next connection
std::auto_ptr<castor::io::ServerSocket> clientConnection(m_callbackSock.accept());
......@@ -88,7 +88,7 @@ throw (castor::exception::Exception) {
clientConnection->sendObject(vol);
}
void clientSimulator::sendEndNotificationErrorReport(
void ClientSimulator::sendEndNotificationErrorReport(
const uint64_t tapebridgeTransactionId,
const int errorCode,
const std::string &errorMessage,
......
......@@ -35,11 +35,11 @@ namespace server {
* will hence setup a client callback socket and wait. All the tape mounting
* logic is hence skipped. We will then in parallel start a tape session.
*/
class clientSimulator: public tpcp::TpcpCommand {
class ClientSimulator: public tpcp::TpcpCommand {
public:
clientSimulator(uint32_t volReqId, std::string vid);
ClientSimulator(uint32_t volReqId, std::string vid);
virtual ~clientSimulator() throw () {}
virtual ~ClientSimulator() throw () {}
struct ipPort {
ipPort(uint32_t i, uint16_t p): ip(i), port(p) {}
......
......@@ -23,8 +23,8 @@
*****************************************************************************/
#include <gtest/gtest.h>
#include "clientSimulator.hpp"
#include "clientInterface.hpp"
#include "ClientSimulator.hpp"
#include "ClientInterface.hpp"
#include "../threading/Threading.hpp"
using namespace castor::tape::server;
......@@ -33,12 +33,12 @@ namespace unitTest {
class clientRunner: public castor::tape::threading::Thread {
public:
clientRunner(clientSimulator &client): m_sim(client) {}
clientRunner(ClientSimulator &client): m_sim(client) {}
private:
void run() {
m_sim.sessionLoop();
}
clientSimulator & m_sim;
ClientSimulator & m_sim;
};
......@@ -50,8 +50,8 @@ TEST(tapeServer, ClientInterfaceGoodDay) {
// 1) prepare the client and run it in another thread
uint32_t volReq = 0xBEEF;
std::string vid = "V12345";
clientSimulator sim(volReq, vid);
struct clientSimulator::ipPort clientAddr = sim.getCallbackAddress();
ClientSimulator sim(volReq, vid);
struct ClientSimulator::ipPort clientAddr = sim.getCallbackAddress();
clientRunner simRun(sim);
simRun.start();
......
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