You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by fi...@apache.org on 2012/08/02 17:33:41 UTC
svn commit: r1368543 [2/2] - in /incubator/etch/trunk/binding-cpp/runtime:
include/common/ include/support/ include/transport/ include/util/ src/main/
src/main/common/ src/main/support/ src/main/transport/ src/main/util/
src/test/ src/test/support/ src...
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessagizerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessagizerTest.cpp?rev=1368543&r1=1368542&r2=1368543&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessagizerTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessagizerTest.cpp Thu Aug 2 15:33:40 2012
@@ -30,8 +30,20 @@
class MockListener11 : public virtual EtchSessionListener<EtchSocket> {
public:
- //This method is called
+ MockListener11(EtchTransport<EtchSessionListener<EtchSocket> >* transport)
+ : mTransport(transport) {
+ if(mTransport != NULL) {
+ mTransport->setSession(this);
+ }
+ }
+
+ virtual ~MockListener11() {
+ if(mTransport != NULL) {
+ delete mTransport;
+ }
+ }
+ //This method is called
status_t sessionAccepted(EtchSocket* connection) {
delete connection;
return ETCH_OK;
@@ -44,6 +56,9 @@ public:
status_t sessionNotify(capu::SmartPointer<EtchObject> event) {
return ETCH_OK;
}
+
+private:
+ EtchTransport<EtchSessionListener<EtchSocket> >* mTransport;
};
class MockMailboxManager : public EtchSessionMessage {
@@ -51,6 +66,7 @@ public:
status_t sessionMessage(capu::SmartPointer<EtchWho> receipent, capu::SmartPointer<EtchMessage> buf) {
EXPECT_TRUE(buf->count() == 1);
+ buf->clear();
return ETCH_OK;
}
@@ -75,13 +91,11 @@ TEST(EtchMessagizerTest, constructorTest
EtchResources r;
EtchObject *out;
r.put((EtchString &) EtchTransport<EtchSessionMessage>::VALUE_FACTORY, factory, out);
- EtchTransportData* conn = new EtchTcpConnection(NULL, &u);
+ EtchTransportData* conn = new EtchTcpConnection(NULL, NULL, &u);
EtchTransportPacket* pac = new EtchPacketizer(conn, &u);
EtchSessionPacket* mes = new EtchMessagizer(pac, &u, &r);
//Created stack
delete mes;
- delete pac;
- delete conn;
delete factory;
types.clear();
}
@@ -99,27 +113,24 @@ TEST(EtchMessagizerTest, TransportContro
EtchResources r;
EtchObject *out;
r.put((EtchString &) EtchTransport<EtchSessionMessage>::VALUE_FACTORY, factory, out);
- EtchTransportData* conn = new EtchTcpConnection(NULL, &u);
+ EtchTransportData* conn = new EtchTcpConnection(NULL, NULL, &u);
EtchPacketizer* pac = new EtchPacketizer(conn, &u);
EtchMessagizer* mess = new EtchMessagizer(pac, &u, &r);
mess->setSession(&manager);
- EtchSessionListener<EtchSocket>* mSessionListener = new MockListener11();
- EtchTcpListener* listener = new EtchTcpListener(&u);
- //Start the mock listener
- listener->setSession(mSessionListener);
- listener->transportControl(new EtchString(EtchTcpListener::START_AND_WAIT_UP), new EtchInt32(1000));
+ EtchTcpListener* transport = new EtchTcpListener(&u);
+ EtchSessionListener<EtchSocket>* mSessionListener = new MockListener11(transport);
+
+ transport->transportControl(new EtchString(EtchTcpListener::START_AND_WAIT_UP), new EtchInt32(1000));
+
mess->transportControl(new EtchString(EtchPacketizer::START_AND_WAIT_UP), new EtchInt32(1000));
//test transport commands
mess->transportControl(new EtchString(EtchPacketizer::STOP_AND_WAIT_DOWN), new EtchInt32(1000));
- listener->transportControl(new EtchString(EtchTcpListener::STOP_AND_WAIT_DOWN), new EtchInt32(1000));
- listener->setSession(mSessionListener);
+
+ transport->transportControl(new EtchString(EtchTcpListener::STOP_AND_WAIT_DOWN), new EtchInt32(1000));
delete mSessionListener;
delete mess;
- delete pac;
- delete conn;
- delete listener;
delete factory;
types.clear();
}
@@ -138,7 +149,7 @@ TEST(EtchMessagizerTest, TransportMessag
EtchObject *out;
//add to the resource
r.put((EtchString &) EtchTransport<EtchSessionMessage>::VALUE_FACTORY, factory, out);
- EtchTransportData* conn = new EtchTcpConnection(NULL, &u);
+ EtchTransportData* conn = new EtchTcpConnection(NULL, NULL, &u);
EtchPacketizer* pac = new EtchPacketizer(conn, &u);
EtchMessagizer* mess = new EtchMessagizer(pac, &u, &r);
mess->setSession(&manager);
@@ -154,11 +165,9 @@ TEST(EtchMessagizerTest, TransportMessag
capu::SmartPointer<EtchMessage> msg = new EtchMessage(mt_foo, factory);
msg->put(mf_x, data);
- EXPECT_TRUE(mess->transportMessage(NULL, msg) == ETCH_EINVAL);
+ EXPECT_TRUE(mess->transportMessage(NULL, msg) == ETCH_ERROR);
delete mess;
- delete pac;
- delete conn;
delete factory;
types.clear();
}
@@ -193,7 +202,7 @@ TEST(EtchMessagizerTest, SessionDataTest
//add the value factory to the resources
r.put((EtchString &) EtchTransport<EtchSessionMessage>::VALUE_FACTORY, factory, out);
//create stack
- EtchTransportData* conn = new EtchTcpConnection(NULL, &u);
+ EtchTransportData* conn = new EtchTcpConnection(NULL, NULL, &u);
EtchPacketizer* pac = new EtchPacketizer(conn, &u);
EtchMessagizer* mess = new EtchMessagizer(pac, &u, &r);
capu::SmartPointer<EtchFlexBuffer> buffer = new EtchFlexBuffer();
@@ -219,8 +228,6 @@ TEST(EtchMessagizerTest, SessionDataTest
types.clear();
delete mMailboxManager;
delete mess;
- delete pac;
- delete conn;
delete factory;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPacketizerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPacketizerTest.cpp?rev=1368543&r1=1368542&r2=1368543&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPacketizerTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPacketizerTest.cpp Thu Aug 2 15:33:40 2012
@@ -31,8 +31,20 @@
class MockListener3 : public virtual EtchSessionListener<EtchSocket> {
public:
- //This method is called
+ MockListener3(EtchTransport<EtchSessionListener<EtchSocket> >* transport) :
+ mTransport(transport) {
+ if(mTransport != NULL) {
+ mTransport->setSession(this);
+ }
+ }
+
+ virtual ~MockListener3() {
+ if(mTransport != NULL) {
+ delete mTransport;
+ }
+ }
+ //This method is called
status_t sessionAccepted(EtchSocket* connection) {
delete connection;
return ETCH_OK;
@@ -45,6 +57,9 @@ public:
status_t sessionNotify(capu::SmartPointer<EtchObject> event) {
return ETCH_OK;
}
+
+private:
+ EtchTransport<EtchSessionListener<EtchSocket> >* mTransport;
};
class MockMessagizer : public EtchSessionPacket {
@@ -63,41 +78,37 @@ public:
TEST(EtchPacketizer, constructorTest) {
EtchURL u("tcp://127.0.0.1:4001");
- EtchTransportData* conn = new EtchTcpConnection(NULL, &u);
+ EtchTransportData* conn = new EtchTcpConnection(NULL, NULL, &u);
EtchSessionData* packetizer = new EtchPacketizer(conn, &u);
delete packetizer;
- delete conn;
}
TEST(EtchPacketizer, TransportControlTest) {
EtchURL u("tcp://127.0.0.1:4001");
- EtchTransportData* conn = new EtchTcpConnection(NULL, &u);
- EtchPacketizer* res = new EtchPacketizer(conn, &u);
+ EtchTransportData* conn = new EtchTcpConnection(NULL, NULL, &u);
+ EtchPacketizer* packetizer = new EtchPacketizer(conn, &u);
MockMessagizer mes;
- res->setSession(&mes);
- EtchSessionListener<EtchSocket>* mSessionListener = new MockListener3();
- EtchTcpListener* listener = new EtchTcpListener(&u);
+ packetizer->setSession(&mes);
+
+
+ EtchTcpListener* transport = new EtchTcpListener(&u);
+ EtchSessionListener<EtchSocket>* listener = new MockListener3(transport);
+
//Start the mock listener
- listener->setSession(mSessionListener);
- listener->transportControl(new EtchString(EtchTcpListener::START_AND_WAIT_UP), new EtchInt32(1000));
- res->transportControl(new EtchString(EtchPacketizer::START_AND_WAIT_UP), new EtchInt32(1000));
-
- res->transportControl(new EtchString(EtchPacketizer::STOP_AND_WAIT_DOWN), new EtchInt32(1000));
- listener->transportControl(new EtchString(EtchTcpListener::STOP_AND_WAIT_DOWN), new EtchInt32(1000));
-
- conn->setSession(NULL);
- res->setSession(NULL);
- listener->setSession(NULL);
-
- delete mSessionListener;
- delete res;
- delete conn;
+ transport->transportControl(new EtchString(EtchTcpListener::START_AND_WAIT_UP), new EtchInt32(1000));
+
+ packetizer->transportControl(new EtchString(EtchPacketizer::START_AND_WAIT_UP), new EtchInt32(1000));
+ packetizer->transportControl(new EtchString(EtchPacketizer::STOP_AND_WAIT_DOWN), new EtchInt32(1000));
+
+ transport->transportControl(new EtchString(EtchTcpListener::STOP_AND_WAIT_DOWN), new EtchInt32(1000));
+
+ delete packetizer;
delete listener;
}
TEST(EtchPacketizer, TransportPacketTest) {
EtchURL u("tcp://127.0.0.1:4001");
- EtchTransportData* conn = new EtchTcpConnection(NULL, &u);
+ EtchTransportData* conn = new EtchTcpConnection(NULL, NULL, &u);
EtchPacketizer* packetizer = new EtchPacketizer(conn, &u);
MockMessagizer mes;
packetizer->setSession(&mes);
@@ -109,20 +120,18 @@ TEST(EtchPacketizer, TransportPacketTest
buffer->setIndex(0);
EXPECT_TRUE(packetizer->transportPacket(NULL, buffer) == ETCH_ERROR);
-
delete packetizer;
- delete conn;
}
TEST(EtchPacketizer, SessionDataTest) {
EtchURL u("tcp://127.0.0.1:4001");
- EtchTransportData* conn = new EtchTcpConnection(NULL, &u);
+ EtchTransportData* conn = new EtchTcpConnection(NULL, NULL, &u);
EtchPacketizer* packetizer = new EtchPacketizer(conn, &u);
capu::SmartPointer<EtchFlexBuffer> buffer = new EtchFlexBuffer();
//A packet is created
capu::int32_t pktsize = 4;
- buffer->put((capu::int8_t *) & packetizer->SIG, sizeof (capu::int32_t));
- buffer->put((capu::int8_t *) & pktsize, sizeof (capu::int32_t));
+ buffer->putInt(packetizer->SIG);
+ buffer->putInt(pktsize);
buffer->put((capu::int8_t *)"test", pktsize);
buffer->setIndex(0);
EXPECT_TRUE(buffer->getLength() == 12);
@@ -137,5 +146,4 @@ TEST(EtchPacketizer, SessionDataTest) {
packetizer->setSession(NULL);
delete mSessionPacker;
delete packetizer;
- delete conn;
}
\ No newline at end of file
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPlainMailboxManagerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPlainMailboxManagerTest.cpp?rev=1368543&r1=1368542&r2=1368543&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPlainMailboxManagerTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPlainMailboxManagerTest.cpp Thu Aug 2 15:33:40 2012
@@ -91,7 +91,7 @@ public:
};
TEST(EtchPlainMailboxManager, constructorTest) {
- MockTransport transport;
+ MockTransport *transport = new MockTransport();
MockSession session;
MockDefaultValueFactory *factory;
EtchString uri("tcp://127.0.0.1:4001");
@@ -99,7 +99,7 @@ TEST(EtchPlainMailboxManager, constructo
//created value factory
EtchURL u(uri);
EtchMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(&transport, &u, NULL);
+ manager = new EtchPlainMailboxManager(transport, NULL, NULL);
EXPECT_TRUE(manager != NULL);
manager->setSession(&session);
@@ -125,12 +125,12 @@ TEST(EtchPlainMailboxManager, transportM
EXPECT_TRUE(ETCH_OK != message->getMessageId(id));
EXPECT_TRUE(ETCH_OK != message->getInReplyToMessageId(id));
- MockTransport transport;
+ MockTransport *transport = new MockTransport();
MockSession session;
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(&transport, &u, NULL);
+ manager = new EtchPlainMailboxManager(transport, NULL, NULL);
manager->setSession(&session);
@@ -167,12 +167,12 @@ TEST(EtchPlainMailboxManager, transportR
message->setInReplyToMessageId(1L);
- MockTransport transport;
+ MockTransport *transport = new MockTransport();
MockSession session;
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(&transport, &u, NULL);
+ manager = new EtchPlainMailboxManager(transport, NULL, NULL);
manager->setSession(&session);
@@ -206,12 +206,12 @@ TEST(EtchPlainMailboxManager, transportC
EXPECT_TRUE(ETCH_OK != message->getMessageId(id));
EXPECT_TRUE(ETCH_OK != message->getInReplyToMessageId(id));
- MockTransport transport;
+ MockTransport *transport = new MockTransport();
MockSession session;
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(&transport, &u, NULL);
+ manager = new EtchPlainMailboxManager(transport, NULL, NULL);
manager->setSession(&session);
//in order to notify upper layers that the connection is open
@@ -247,7 +247,7 @@ TEST(EtchPlainMailboxManager, replicated
EXPECT_TRUE(ETCH_OK != message->getMessageId(id));
EXPECT_TRUE(ETCH_OK != message->getInReplyToMessageId(id));
- MockTransport transport;
+ MockTransport *transport = new MockTransport();
MockSession session;
// test sending a call message that has already been sent (has a message id)
@@ -255,7 +255,7 @@ TEST(EtchPlainMailboxManager, replicated
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(&transport, &u, NULL);
+ manager = new EtchPlainMailboxManager(transport, NULL, NULL);
manager->setSession(&session);
//in order to notify upper layers that the connection is open
@@ -296,12 +296,12 @@ TEST(EtchPlainMailboxManager, sessionMes
EXPECT_TRUE(ETCH_OK != message->getMessageId(id));
EXPECT_TRUE(ETCH_OK != message->getInReplyToMessageId(id));
- MockTransport transport;
+ MockTransport *transport = new MockTransport();
MockSession session;
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(&transport, &u, NULL);
+ manager = new EtchPlainMailboxManager(transport, NULL, NULL);
manager->setSession(&session);
//in order to notify upper layers that the connection is open
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpConnectionTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpConnectionTest.cpp?rev=1368543&r1=1368542&r2=1368543&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpConnectionTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpConnectionTest.cpp Thu Aug 2 15:33:40 2012
@@ -42,7 +42,6 @@ public:
MOCK_METHOD2(sessionControl, status_t(capu::SmartPointer<EtchObject> control, capu::SmartPointer<EtchObject> value));
-
status_t sessionNotify(capu::SmartPointer<EtchObject> event) {
return ETCH_OK;
}
@@ -78,14 +77,14 @@ public:
TEST(EtchTcpConnection, constructorTest) {
EtchURL url("tcp://127.0.0.1:4001");
- EtchTcpConnection * conn = new EtchTcpConnection(NULL, &url);
+ EtchTcpConnection * conn = new EtchTcpConnection(NULL, NULL, &url);
EXPECT_TRUE(conn != NULL);
delete conn;
}
TEST(EtchTcpConnection, isStartedTest) {
EtchURL url("tcp://127.0.0.1:4001");
- EtchTcpConnection * conn = new EtchTcpConnection(NULL, &url);
+ EtchTcpConnection * conn = new EtchTcpConnection(NULL, NULL, &url);
EtchTcpListener *listener = new EtchTcpListener(&url);
EXPECT_FALSE(conn->isStarted());
EtchSessionListener<EtchSocket>* mSessionListener = new MockListener();
@@ -112,7 +111,7 @@ TEST(EtchTcpConnection, isStartedTest) {
TEST(EtchTcpConnectionAndListener, SessionAcceptTest) {
EtchURL url("tcp://127.0.0.1:4001");
- EtchTcpConnection * conn = new EtchTcpConnection(NULL, &url);
+ EtchTcpConnection * conn = new EtchTcpConnection(NULL, NULL, &url);
EtchSessionListener<EtchSocket>* mSessionListener = new MockListener();
EtchSessionData* mPacketizer = new MockPacketizer();
EtchTcpListener *listener = new EtchTcpListener(&url);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpListenerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpListenerTest.cpp?rev=1368543&r1=1368542&r2=1368543&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpListenerTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchTcpListenerTest.cpp Thu Aug 2 15:33:40 2012
@@ -89,7 +89,7 @@ TEST(EtchTcpListener, transportControlTe
TEST(EtchTcpListener, isStartedTest) {
EtchURL url("tcp://127.0.0.1:4001");
- EtchTcpConnection * conn = new EtchTcpConnection(NULL, &url);
+ EtchTcpConnection * conn = new EtchTcpConnection(NULL, NULL, &url);
EtchTcpListener *listener = new EtchTcpListener(&url);
EtchSessionListener<EtchSocket>* mSessionListener = new MockListener2();
EtchSessionData* mPacketizer = new MockPacketizer2();