You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by ve...@apache.org on 2012/10/17 08:50:05 UTC
svn commit: r1399114 [3/4] - in /incubator/etch/trunk:
binding-cpp/runtime/include/common/
binding-cpp/runtime/include/serialization/
binding-cpp/runtime/include/support/ binding-cpp/runtime/include/transport/
binding-cpp/runtime/include/util/ binding-...
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchTypeTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchTypeTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchTypeTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchTypeTest.cpp Wed Oct 17 06:50:01 2012
@@ -27,16 +27,11 @@ class EtchTypeTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -59,11 +54,11 @@ TEST_F(EtchTypeTest, putValidatorTest) {
EtchField f(str2);
EtchField g(str3);
capu::SmartPointer<EtchValidator> v1;
- EtchValidatorInt::Get(0, v1);
+ EtchValidatorInt::Get(mRuntime, 0, v1);
capu::SmartPointer<EtchValidator> v2;
- EtchValidatorLong::Get(0, v2);
+ EtchValidatorLong::Get(mRuntime, 0, v2);
capu::SmartPointer<EtchValidator> v3;
- EtchValidatorByte::Get(0, v3);
+ EtchValidatorByte::Get(mRuntime, 0, v3);
EXPECT_EQ(t.putValidator(f, v1), ETCH_OK);
EXPECT_EQ(t.putValidator(g, v2), ETCH_OK);
EXPECT_EQ(t.putValidator(g, v3), ETCH_OK); //makes a combo generator
@@ -79,7 +74,7 @@ TEST_F(EtchTypeTest, getValidatorTest) {
EtchField f(str2);
EtchField g(str3);
capu::SmartPointer<EtchValidator> v;
- EtchValidatorInt::Get(0, v);
+ EtchValidatorInt::Get(mRuntime, 0, v);
capu::SmartPointer<EtchValidator> result = NULL;
t.putValidator(f, v);
EXPECT_EQ(t.getValidator(f, result), ETCH_OK);
@@ -95,9 +90,9 @@ TEST_F(EtchTypeTest, clearTest) {
EtchField f(str2);
EtchField g(str3);
capu::SmartPointer<EtchValidator> v1;
- EtchValidatorInt::Get(0, v1);
+ EtchValidatorInt::Get(mRuntime, 0, v1);
capu::SmartPointer<EtchValidator> v2;
- EtchValidatorLong::Get(0, v2);
+ EtchValidatorLong::Get(mRuntime, 0, v2);
EXPECT_EQ(t.putValidator(f, v1), ETCH_OK);
EXPECT_EQ(t.putValidator(g, v2), ETCH_OK);
EXPECT_EQ(t.clearValidator(f), ETCH_OK);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorBooleanTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorBooleanTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorBooleanTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorBooleanTest.cpp Wed Oct 17 06:50:01 2012
@@ -28,16 +28,11 @@ class EtchValidatorBooleanTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -47,7 +42,7 @@ protected:
TEST_F(EtchValidatorBooleanTest, createTest) {
capu::SmartPointer<EtchValidator> val2;
- EXPECT_TRUE(EtchValidatorBoolean::Get(0, val2) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorBoolean::Get(mRuntime, 0, val2) == ETCH_OK);
capu::SmartPointer<EtchValidatorBoolean> val = capu::smartpointer_cast<EtchValidatorBoolean>(val2);
EXPECT_TRUE(val.get() != NULL);
@@ -57,7 +52,7 @@ TEST_F(EtchValidatorBooleanTest, createT
EtchObjectType type1(EOTID_BOOL, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- EXPECT_TRUE(EtchValidatorBoolean::Get(2, val2) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorBoolean::Get(mRuntime, 2, val2) == ETCH_OK);
val = capu::smartpointer_cast<EtchValidatorBoolean>(val2);
EXPECT_TRUE(val.get() != NULL);
EXPECT_TRUE(val->getExpectedType()->equals(&type2));
@@ -70,7 +65,7 @@ TEST_F(EtchValidatorBooleanTest, validat
capu::SmartPointer<EtchObject> integer = new EtchInt32(4);
capu::SmartPointer<EtchObject> boolean2 = new EtchBool(false);
capu::SmartPointer<EtchValidator> val2;
- EXPECT_TRUE(EtchValidatorBoolean::Get(0, val2) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorBoolean::Get(mRuntime, 0, val2) == ETCH_OK);
capu::SmartPointer<EtchValidatorBoolean> val = capu::smartpointer_cast<EtchValidatorBoolean>(val2);
EXPECT_FALSE(val->validate(boolean));
EXPECT_FALSE(val->validate(integer));
@@ -84,7 +79,7 @@ TEST_F(EtchValidatorBooleanTest, validat
capu::SmartPointer<EtchObject> integer = new EtchInt32(4);
capu::SmartPointer<EtchObject> boolean2 = new EtchBool(false);
capu::SmartPointer<EtchValidator> val2;
- EXPECT_TRUE(EtchValidatorBoolean::Get(0, val2) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorBoolean::Get(mRuntime, 0, val2) == ETCH_OK);
capu::SmartPointer<EtchValidatorBoolean> val = capu::smartpointer_cast<EtchValidatorBoolean>(val2);
EXPECT_TRUE(val->validateValue(boolean, result) == ETCH_ERROR);
EXPECT_TRUE(val->validateValue(integer, result) == ETCH_ERROR);
@@ -93,7 +88,7 @@ TEST_F(EtchValidatorBooleanTest, validat
TEST_F(EtchValidatorBooleanTest, elementValidatorTest) {
capu::SmartPointer<EtchValidator> val2;
- EXPECT_TRUE(EtchValidatorBoolean::Get(1, val2) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorBoolean::Get(mRuntime, 1, val2) == ETCH_OK);
capu::SmartPointer<EtchValidatorBoolean> val = capu::smartpointer_cast<EtchValidatorBoolean>(val2);
capu::SmartPointer<EtchValidator> element_validator;
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorByteTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorByteTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorByteTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorByteTest.cpp Wed Oct 17 06:50:01 2012
@@ -27,16 +27,11 @@ class EtchValidatorByteTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -48,14 +43,14 @@ TEST_F(EtchValidatorByteTest, createTest
capu::SmartPointer<EtchValidatorByte> ptr = NULL;
capu::SmartPointer<EtchValidator> val;
- EXPECT_TRUE(EtchValidatorByte::Get(0, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorByte::Get(mRuntime, 0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorByte>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(EtchByte::TYPE()));
EXPECT_TRUE(ptr->getNDims() == 0);
EtchObjectType type1(EOTID_BYTE, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- EXPECT_TRUE(EtchValidatorByte::Get(2, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorByte::Get(mRuntime, 2, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorByte>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(&type2));
EXPECT_TRUE(ptr->getNDims() == 2);
@@ -82,7 +77,7 @@ TEST_F(EtchValidatorByteTest, validateTe
capu::SmartPointer<EtchObject> str = new EtchString();
capu::SmartPointer<EtchObject> byte2 = new EtchByte(3);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorByte::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorByte::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE((capu::smartpointer_cast<EtchTypeValidator>(ptr))->getNDims() == 0);
EXPECT_FALSE(ptr->validate(byte));
EXPECT_TRUE(ptr->validate(integer));
@@ -110,11 +105,11 @@ TEST_F(EtchValidatorByteTest, validateVa
capu::SmartPointer<EtchObject> integer3 = new EtchInt32(127);
capu::SmartPointer<EtchObject> byte2 = new EtchByte(3);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorByte::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorByte::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(byte, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(integer, result) == ETCH_OK);
EXPECT_TRUE(((EtchByte*) result.get())->get() == ((EtchInt32*) integer.get())->get());
-
+
EXPECT_TRUE(ptr->validateValue(integer2, result) == ETCH_OK);
EXPECT_TRUE(((EtchByte*) result.get())->get() == ((EtchInt32*) integer2.get())->get());
@@ -128,7 +123,7 @@ TEST_F(EtchValidatorByteTest, validateVa
TEST_F(EtchValidatorByteTest, elementValidatorTest) {
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorByte::Get(1, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorByte::Get(mRuntime, 1, ptr) == ETCH_OK);
capu::SmartPointer<EtchValidator> elementValidator;
ptr->getElementValidator(elementValidator);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorCustomTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorCustomTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorCustomTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorCustomTest.cpp Wed Oct 17 06:50:01 2012
@@ -49,16 +49,11 @@ class EtchValidatorCustomTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -71,7 +66,7 @@ TEST_F(EtchValidatorCustomTest, createTe
status_t status;
capu::SmartPointer<EtchValidator> val;
- status = EtchValidatorCustom::Get(0, MockGeneratedClass::TYPE(), true, val);
+ status = EtchValidatorCustom::Get(mRuntime, 0, MockGeneratedClass::TYPE(), true, val);
EXPECT_EQ(ETCH_OK, status);
ptr = (EtchValidatorCustom*)val.get();
@@ -81,7 +76,7 @@ TEST_F(EtchValidatorCustomTest, createTe
EtchObjectType type1(99, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- status = EtchValidatorCustom::Get(2, MockGeneratedClass::TYPE(), true, val);
+ status = EtchValidatorCustom::Get(mRuntime, 2, MockGeneratedClass::TYPE(), true, val);
EXPECT_EQ(ETCH_OK, status);
ptr = (EtchValidatorCustom*) val.get();
@@ -115,7 +110,7 @@ TEST_F(EtchValidatorCustomTest, validate
capu::SmartPointer<EtchObject> generatedClass = new MockGeneratedClass();
capu::SmartPointer<EtchValidator> val;
- status = EtchValidatorCustom::Get(0, MockGeneratedClass::TYPE(), true, val);
+ status = EtchValidatorCustom::Get(mRuntime, 0, MockGeneratedClass::TYPE(), true, val);
EXPECT_EQ(ETCH_OK, status);
EXPECT_FALSE(val->validate(byte));
@@ -149,7 +144,7 @@ TEST_F(EtchValidatorCustomTest, validate
capu::SmartPointer<EtchObject> generatedClass = new MockGeneratedClass();
capu::SmartPointer<EtchValidator> val;
- status = EtchValidatorCustom::Get(0, MockGeneratedClass::TYPE(), true, val);
+ status = EtchValidatorCustom::Get(mRuntime, 0, MockGeneratedClass::TYPE(), true, val);
EXPECT_EQ(ETCH_OK, status);
EXPECT_TRUE(val->validateValue(byte, result) == ETCH_ERROR);
@@ -166,7 +161,7 @@ TEST_F(EtchValidatorCustomTest, elementV
status_t status;
capu::SmartPointer<EtchValidator> ptr = NULL;
- status = EtchValidatorCustom::Get(1, MockGeneratedClass::TYPE(), true, ptr);
+ status = EtchValidatorCustom::Get(mRuntime, 1, MockGeneratedClass::TYPE(), true, ptr);
EXPECT_EQ(ETCH_OK, status);
capu::SmartPointer<EtchValidator> element_validator;
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorDoubleTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorDoubleTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorDoubleTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorDoubleTest.cpp Wed Oct 17 06:50:01 2012
@@ -27,16 +27,11 @@ class EtchValidatorDoubleTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -48,7 +43,7 @@ TEST_F(EtchValidatorDoubleTest, createTe
capu::SmartPointer<EtchValidatorDouble> ptr = NULL;
capu::SmartPointer<EtchValidator> val;
- EXPECT_TRUE(EtchValidatorDouble::Get(0, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorDouble::Get(mRuntime, 0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorDouble>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(EtchDouble::TYPE()));
@@ -57,7 +52,7 @@ TEST_F(EtchValidatorDoubleTest, createTe
EtchObjectType type1(EOTID_DOUBLE, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- EXPECT_TRUE(EtchValidatorDouble::Get(2, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorDouble::Get(mRuntime, 2, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorDouble>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(&type2));
EXPECT_TRUE(ptr->getNDims() == 2);
@@ -76,7 +71,7 @@ TEST_F(EtchValidatorDoubleTest, validate
capu::SmartPointer<EtchObject> str = new EtchString();
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorDouble::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorDouble::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE((capu::smartpointer_cast<EtchTypeValidator>(ptr))->getNDims() == 0);
EXPECT_FALSE(ptr->validate(byte));
@@ -96,7 +91,7 @@ TEST_F(EtchValidatorDoubleTest, validate
capu::SmartPointer<EtchObject> doubleTmp2 = new EtchDouble(5.13);
capu::SmartPointer<EtchObject> doubleTmp3 = new EtchDouble(127.54);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorDouble::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorDouble::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(byte, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(doubleTmp, result) == ETCH_OK);
EXPECT_TRUE(((EtchDouble*) result.get())->get() == ((EtchDouble*) doubleTmp.get())->get());
@@ -108,7 +103,7 @@ TEST_F(EtchValidatorDoubleTest, validate
TEST_F(EtchValidatorDoubleTest, elementValidatorTest) {
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorDouble::Get(1, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorDouble::Get(mRuntime, 1, ptr) == ETCH_OK);
capu::SmartPointer<EtchValidator> elementValidator;
ptr->getElementValidator(elementValidator);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorFloatTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorFloatTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorFloatTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorFloatTest.cpp Wed Oct 17 06:50:01 2012
@@ -28,16 +28,11 @@ class EtchValidatorFloatTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -49,7 +44,7 @@ TEST_F(EtchValidatorFloatTest, createTes
capu::SmartPointer<EtchValidatorFloat> ptr = NULL;
capu::SmartPointer<EtchValidator> val;
- EXPECT_TRUE(EtchValidatorFloat::Get(0, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorFloat::Get(mRuntime, 0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorFloat>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(EtchFloat::TYPE()));
@@ -58,7 +53,7 @@ TEST_F(EtchValidatorFloatTest, createTes
EtchObjectType type1(EOTID_FLOAT, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- EXPECT_TRUE(EtchValidatorFloat::Get(2, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorFloat::Get(mRuntime, 2, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorFloat>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(&type2));
EXPECT_TRUE(ptr->getNDims() == 2);
@@ -76,7 +71,7 @@ TEST_F(EtchValidatorFloatTest, validateT
capu::SmartPointer<EtchObject> str = new EtchString();
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorFloat::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorFloat::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE((capu::smartpointer_cast<EtchTypeValidator>(ptr))->getNDims() == 0);
EXPECT_FALSE(ptr->validate(byte));
@@ -95,7 +90,7 @@ TEST_F(EtchValidatorFloatTest, validateV
capu::SmartPointer<EtchObject> floatTmp2 = new EtchFloat(static_cast<capu::float_t>(5.13));
capu::SmartPointer<EtchObject> floatTmp3 = new EtchFloat(static_cast<capu::float_t>(127.54));
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorFloat::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorFloat::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(byte, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(floatTmp, result) == ETCH_OK);
EXPECT_TRUE(((EtchFloat*) result.get())->get() == ((EtchFloat*) floatTmp.get())->get());
@@ -107,7 +102,7 @@ TEST_F(EtchValidatorFloatTest, validateV
TEST_F(EtchValidatorFloatTest, elementValidatorTest) {
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorFloat::Get(1, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorFloat::Get(mRuntime, 1, ptr) == ETCH_OK);
capu::SmartPointer<EtchValidator> elementValidator;
ptr->getElementValidator(elementValidator);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorIntTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorIntTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorIntTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorIntTest.cpp Wed Oct 17 06:50:01 2012
@@ -27,16 +27,11 @@ class EtchValidatorIntTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -47,14 +42,14 @@ protected:
TEST_F(EtchValidatorIntTest, createTest) {
capu::SmartPointer<EtchValidatorInt> ptr = NULL;
capu::SmartPointer<EtchValidator> val;
- EXPECT_TRUE(EtchValidatorInt::Get(0, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorInt::Get(mRuntime, 0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorInt>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(EtchInt32::TYPE()));
EXPECT_TRUE(ptr->getNDims() == 0);
EtchObjectType type1(EOTID_INT32, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- EXPECT_TRUE(EtchValidatorInt::Get(2, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorInt::Get(mRuntime, 2, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorInt>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(&type2));
EXPECT_TRUE(ptr->getNDims() == 2);
@@ -90,7 +85,7 @@ TEST_F(EtchValidatorIntTest, validateTes
capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorInt::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorInt::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE((capu::smartpointer_cast<EtchTypeValidator>(ptr))->getNDims() == 0);
EXPECT_FALSE(ptr->validate(byte));
EXPECT_FALSE(ptr->validate(str));
@@ -121,7 +116,7 @@ TEST_F(EtchValidatorIntTest, validateVal
capu::SmartPointer<EtchObject> integer3 = new EtchInt32(127);
capu::SmartPointer<EtchObject> byte2 = new EtchByte(3);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorInt::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorInt::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(byte, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(integer, result) == ETCH_OK);
EXPECT_TRUE(((EtchInt32*) result.get())->get() == ((EtchInt32*) integer.get())->get());
@@ -138,7 +133,7 @@ TEST_F(EtchValidatorIntTest, validateVal
TEST_F(EtchValidatorIntTest, elementValidatorTest) {
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorInt::Get(1, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorInt::Get(mRuntime, 1, ptr) == ETCH_OK);
capu::SmartPointer<EtchValidator> elementValidator;
ptr->getElementValidator(elementValidator);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorLongTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorLongTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorLongTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorLongTest.cpp Wed Oct 17 06:50:01 2012
@@ -27,16 +27,11 @@ class EtchValidatorLongTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -48,7 +43,7 @@ TEST_F(EtchValidatorLongTest, createTest
capu::SmartPointer<EtchValidatorLong> ptr = NULL;
capu::SmartPointer<EtchValidator> val;
- EXPECT_TRUE(EtchValidatorLong::Get(0, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorLong::Get(mRuntime, 0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorLong>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(EtchLong::TYPE()));
@@ -56,7 +51,7 @@ TEST_F(EtchValidatorLongTest, createTest
EtchObjectType type1(EOTID_LONG, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- EXPECT_TRUE(EtchValidatorLong::Get(2, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorLong::Get(mRuntime, 2, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorLong>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(&type2));
EXPECT_TRUE(ptr->getNDims() == 2);
@@ -91,7 +86,7 @@ TEST_F(EtchValidatorLongTest, validateTe
capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorLong::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorLong::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE((capu::smartpointer_cast<EtchTypeValidator>(ptr))->getNDims() == 0);
EXPECT_FALSE(ptr->validate(byte));
EXPECT_FALSE(ptr->validate(str));
@@ -122,7 +117,7 @@ TEST_F(EtchValidatorLongTest, validateVa
capu::SmartPointer<EtchObject> integer3 = new EtchInt32(127);
capu::SmartPointer<EtchObject> byte2 = new EtchByte(3);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorLong::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorLong::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(byte, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(integer, result) == ETCH_OK);
EXPECT_TRUE(((EtchLong*) result.get())->get() == ((EtchInt32*) integer.get())->get());
@@ -136,7 +131,7 @@ TEST_F(EtchValidatorLongTest, validateVa
TEST_F(EtchValidatorLongTest, elementValidatorTest) {
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorLong::Get(1, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorLong::Get(mRuntime, 1, ptr) == ETCH_OK);
capu::SmartPointer<EtchValidator> elementValidator;
ptr->getElementValidator(elementValidator);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorObjectTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorObjectTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorObjectTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorObjectTest.cpp Wed Oct 17 06:50:01 2012
@@ -35,16 +35,11 @@ class EtchValidatorObjectTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -55,11 +50,11 @@ protected:
TEST_F(EtchValidatorObjectTest, createTest) {
capu::SmartPointer<EtchValidatorObject> ptr = NULL;
capu::SmartPointer<EtchValidator> val;
- EXPECT_TRUE(EtchValidatorObject::Get(0, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorObject::Get(mRuntime, 0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorObject>(val);
EXPECT_TRUE(ptr->getNDims() == 0);
- EXPECT_TRUE(EtchValidatorObject::Get(2, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorObject::Get(mRuntime, 2, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorObject>(val);
EXPECT_TRUE(ptr->getNDims() == 2);
}
@@ -69,7 +64,7 @@ TEST_F(EtchValidatorObjectTest, validate
capu::SmartPointer<EtchObject> integer = new EtchInt32(4);
capu::SmartPointer<EtchObject> boolean2 = new EtchBool(false);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorObject::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorObject::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE((capu::smartpointer_cast<EtchTypeValidator>(ptr))->getNDims() == 0);
EXPECT_FALSE(ptr->validate(boolean));
EXPECT_TRUE(ptr->validate(integer));
@@ -108,7 +103,7 @@ TEST_F(EtchValidatorObjectTest, validate
capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorObject::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorObject::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(byte, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(str, result) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(longInteger5, result) == ETCH_OK);
@@ -133,7 +128,7 @@ TEST_F(EtchValidatorObjectTest, validate
TEST_F(EtchValidatorObjectTest, elementValidatorTest) {
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorObject::Get(1, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorObject::Get(mRuntime, 1, ptr) == ETCH_OK);
capu::SmartPointer<EtchValidator> elementValidator;
ptr->getElementValidator(elementValidator);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorRuntimeExceptionTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorRuntimeExceptionTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorRuntimeExceptionTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorRuntimeExceptionTest.cpp Wed Oct 17 06:50:01 2012
@@ -28,16 +28,11 @@ class EtchValidatorRuntimeExceptionTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -48,7 +43,7 @@ protected:
TEST_F(EtchValidatorRuntimeExceptionTest, createTest) {
capu::SmartPointer<EtchValidatorRuntimeException> ptr = NULL;
capu::SmartPointer<EtchValidator> val;
- EXPECT_TRUE(EtchValidatorRuntimeException::Get(val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorRuntimeException::Get(mRuntime, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorRuntimeException>(val);
}
@@ -58,7 +53,7 @@ TEST_F(EtchValidatorRuntimeExceptionTest
capu::SmartPointer<EtchObject> integer = new EtchInt32(4);
capu::SmartPointer<EtchObject> exc = new EtchRuntimeException(excepmess, ETCH_ERROR);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorRuntimeException::Get(ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorRuntimeException::Get(mRuntime, ptr) == ETCH_OK);
EXPECT_FALSE(ptr->validate(boolean));
EXPECT_FALSE(ptr->validate(integer));
EXPECT_TRUE(ptr->validate(exc));
@@ -73,7 +68,7 @@ TEST_F(EtchValidatorRuntimeExceptionTest
capu::SmartPointer<EtchObject> integer = new EtchInt32(4);
capu::SmartPointer<EtchObject> exc = new EtchRuntimeException(excepmess, ETCH_ERROR);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorRuntimeException::Get(ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorRuntimeException::Get(mRuntime, ptr) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(boolean, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(integer, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(exc, result) == ETCH_OK);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorShortTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorShortTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorShortTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorShortTest.cpp Wed Oct 17 06:50:01 2012
@@ -27,16 +27,11 @@ class EtchValidatorShortTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -47,14 +42,14 @@ protected:
TEST_F(EtchValidatorShortTest, createTest) {
capu::SmartPointer<EtchValidatorShort> ptr = NULL;
capu::SmartPointer<EtchValidator> val;
- EXPECT_TRUE(EtchValidatorShort::Get(0, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorShort::Get(mRuntime, 0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorShort>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(EtchShort::TYPE()));
EXPECT_TRUE(ptr->getNDims() == 0);
EtchObjectType type1(EOTID_SHORT, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- EXPECT_TRUE(EtchValidatorShort::Get(2, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorShort::Get(mRuntime, 2, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorShort>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(&type2));
EXPECT_TRUE(ptr->getNDims() == 2);
@@ -91,7 +86,7 @@ TEST_F(EtchValidatorShortTest, validateT
capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorShort::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorShort::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE((capu::smartpointer_cast<EtchTypeValidator>(ptr))->getNDims() == 0);
EXPECT_FALSE(ptr->validate(byte));
EXPECT_FALSE(ptr->validate(str));
@@ -123,7 +118,7 @@ TEST_F(EtchValidatorShortTest, validateV
capu::SmartPointer<EtchObject> integer3 = new EtchInt32(127);
capu::SmartPointer<EtchObject> byte2 = new EtchByte(3);
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorShort::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorShort::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(byte, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(integer, result) == ETCH_OK);
EXPECT_TRUE(((EtchShort*) result.get())->get() == ((EtchInt32*) integer.get())->get());
@@ -137,7 +132,7 @@ TEST_F(EtchValidatorShortTest, validateV
TEST_F(EtchValidatorShortTest, elementValidatorTest) {
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorShort::Get(1, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorShort::Get(mRuntime, 1, ptr) == ETCH_OK);
capu::SmartPointer<EtchValidator> elementValidator;
ptr->getElementValidator(elementValidator);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStringTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStringTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStringTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStringTest.cpp Wed Oct 17 06:50:01 2012
@@ -27,16 +27,11 @@ class EtchValidatorStringTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -48,7 +43,7 @@ TEST_F(EtchValidatorStringTest, createTe
capu::SmartPointer<EtchValidatorString> ptr = NULL;
capu::SmartPointer<EtchValidator> val;
- EXPECT_TRUE(EtchValidatorString::Get(0, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorString::Get(mRuntime, 0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorString>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(EtchString::TYPE()));
@@ -56,7 +51,7 @@ TEST_F(EtchValidatorStringTest, createTe
EtchObjectType type1(EOTID_STRING, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- EXPECT_TRUE(EtchValidatorString::Get(2, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorString::Get(mRuntime, 2, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorString>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(&type2));
EXPECT_TRUE(ptr->getNDims() == 2);
@@ -68,7 +63,7 @@ TEST_F(EtchValidatorStringTest, validate
capu::SmartPointer<EtchObject> integer = new EtchInt32(4);
capu::SmartPointer<EtchObject> str2 = new EtchString("hello");
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorString::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorString::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE(((EtchTypeValidator*) ptr.get())->getNDims() == 0);
EXPECT_FALSE(ptr->validate(str));
EXPECT_FALSE(ptr->validate(integer));
@@ -81,7 +76,7 @@ TEST_F(EtchValidatorStringTest, validate
capu::SmartPointer<EtchObject> integer = new EtchInt32(4);
capu::SmartPointer<EtchObject> str2 = new EtchString("hello");
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorString::Get(0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorString::Get(mRuntime, 0, ptr) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(str, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(integer, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(str2, result) == ETCH_OK);
@@ -90,7 +85,7 @@ TEST_F(EtchValidatorStringTest, validate
TEST_F(EtchValidatorStringTest, elementValidatorTest) {
capu::SmartPointer<EtchValidator> ptr = NULL;
- EXPECT_TRUE(EtchValidatorString::Get(1, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorString::Get(mRuntime, 1, ptr) == ETCH_OK);
capu::SmartPointer<EtchValidator> elementValidator;
ptr->getElementValidator(elementValidator);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStructValueTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStructValueTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStructValueTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStructValueTest.cpp Wed Oct 17 06:50:01 2012
@@ -79,16 +79,11 @@ class EtchValidatorStructValueTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -102,7 +97,7 @@ TEST_F(EtchValidatorStructValueTest, cre
capu::SmartPointer<EtchValidatorStructValue> ptr = NULL;
capu::SmartPointer<EtchValidator> val = NULL;
- EXPECT_TRUE(EtchValidatorStructValue::Get(type, 0, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorStructValue::Get(mRuntime, type, 0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorStructValue>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(EtchStructValue::TYPE()));
@@ -111,12 +106,12 @@ TEST_F(EtchValidatorStructValueTest, cre
EtchObjectType type1(EOTID_STRUCT_VALUE, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- EXPECT_TRUE(EtchValidatorStructValue::Get(type, 2, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorStructValue::Get(mRuntime, type, 2, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorStructValue>(val);
EXPECT_TRUE(ptr->getExpectedType()->equals(&type2));
EXPECT_TRUE(ptr->getNDims() == 2);
- EXPECT_TRUE(EtchValidatorStructValue::Get(type, 12, val) == ETCH_EINVAL);
+ EXPECT_TRUE(EtchValidatorStructValue::Get(mRuntime, type, 12, val) == ETCH_EINVAL);
delete type;
}
@@ -129,7 +124,7 @@ TEST_F(EtchValidatorStructValueTest, ele
EtchObjectType type1(EOTID_STRUCT_VALUE, NULL);
EtchObjectType type2(EOTID_NATIVE_ARRAY, &type1);
- EXPECT_TRUE(EtchValidatorStructValue::Get(type, 1, val) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorStructValue::Get(mRuntime, type, 1, val) == ETCH_OK);
EXPECT_TRUE(val.get() != NULL);
EXPECT_TRUE((capu::smartpointer_cast<EtchTypeValidator>(val))->getExpectedType()->equals(&type2));
EXPECT_TRUE((capu::smartpointer_cast<EtchTypeValidator>(val))->getNDims() == 1);
@@ -197,7 +192,7 @@ TEST_F(EtchValidatorStructValueTest, val
capu::SmartPointer<EtchValidator> ptr = NULL;
MockValueFactory8 *fac = new MockValueFactory8();
- EXPECT_TRUE(EtchValidatorStructValue::Get(type, 0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorStructValue::Get(mRuntime, type, 0, ptr) == ETCH_OK);
capu::SmartPointer<EtchObject> byte = NULL;
@@ -264,7 +259,7 @@ TEST_F(EtchValidatorStructValueTest, val
capu::SmartPointer<EtchValidator> ptr = NULL;
MockValueFactory8 *fac = new MockValueFactory8();
- EXPECT_TRUE(EtchValidatorStructValue::Get(type, 0, ptr) == ETCH_OK);
+ EXPECT_TRUE(EtchValidatorStructValue::Get(mRuntime, type, 0, ptr) == ETCH_OK);
EXPECT_TRUE(((EtchTypeValidator*)ptr.get())->getExpectedType()->equals(EtchStructValue::TYPE()));
EXPECT_TRUE(((EtchTypeValidator*)ptr.get())->getNDims() == 0);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRemoteBaseTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRemoteBaseTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRemoteBaseTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRemoteBaseTest.cpp Wed Oct 17 06:50:01 2012
@@ -83,8 +83,8 @@ public:
*/
public:
- MockDefaultValueFactory2(EtchString uri) {
- EtchDefaultValueFactory::Init(&types, &class2type);
+ MockDefaultValueFactory2(EtchRuntime* runtime, EtchString uri) {
+ EtchDefaultValueFactory::Init(runtime, &types, &class2type);
factory = new EtchDefaultValueFactory(uri, &types, &class2type);
}
@@ -99,16 +99,12 @@ class EtchRemoteBaseTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
+
delete mRuntime;
mRuntime = NULL;
}
@@ -121,15 +117,15 @@ TEST_F(EtchRemoteBaseTest, constructorTe
MockTransport2 *transport = new MockTransport2();
MockDefaultValueFactory2 *factory;
EtchString uri("tcp://127.0.0.1:4001");
- factory = new MockDefaultValueFactory2(uri);
+ factory = new MockDefaultValueFactory2(mRuntime, uri);
//created value factory
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
EtchDeliveryService * service = NULL;
- service = new EtchDefaultDeliveryService(manager, &u);
+ service = new EtchDefaultDeliveryService(mRuntime, manager, &u);
EtchRemoteBase * remote = NULL;
- remote = new EtchRemoteBase(service, factory->factory, NULL);
+ remote = new EtchRemoteBase(mRuntime, service, factory->factory, NULL);
EXPECT_TRUE(remote != NULL);
manager->setSession(service);
@@ -147,16 +143,16 @@ TEST_F(EtchRemoteBaseTest, newMessageTes
MockTransport2 *transport = new MockTransport2();
MockDefaultValueFactory2 *factory;
EtchString uri("tcp://127.0.0.1:4001");
- factory = new MockDefaultValueFactory2(uri);
+ factory = new MockDefaultValueFactory2(mRuntime, uri);
//created value factory
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
EtchDeliveryService * service = NULL;
- service = new EtchDefaultDeliveryService(manager, &u);
+ service = new EtchDefaultDeliveryService(mRuntime, manager, &u);
EtchRemoteBase * remote = NULL;
- remote = new EtchRemoteBase(service, factory->factory, NULL);
+ remote = new EtchRemoteBase(mRuntime, service, factory->factory, NULL);
EXPECT_TRUE(remote != NULL);
manager->setSession(service);
@@ -187,16 +183,16 @@ TEST_F(EtchRemoteBaseTest, sendTest) {
MockTransport2 *transport = new MockTransport2();
MockDefaultValueFactory2 *factory;
EtchString uri("tcp://127.0.0.1:4001");
- factory = new MockDefaultValueFactory2(uri);
+ factory = new MockDefaultValueFactory2(mRuntime, uri);
//created value factory
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
EtchDeliveryService * service = NULL;
- service = new EtchDefaultDeliveryService(manager, &u);
+ service = new EtchDefaultDeliveryService(mRuntime, manager, &u);
EtchRemoteBase * remote = NULL;
- remote = new EtchRemoteBase(service, factory->factory, NULL);
+ remote = new EtchRemoteBase(mRuntime, service, factory->factory, NULL);
EXPECT_TRUE(remote != NULL);
manager->setSession(service);
@@ -204,7 +200,7 @@ TEST_F(EtchRemoteBaseTest, sendTest) {
//get the validator
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
//create type
EtchType *mt;
factory->types.get("add", mt);
@@ -232,16 +228,16 @@ TEST_F(EtchRemoteBaseTest, beginCallTest
MockTransport2 *transport = new MockTransport2();
MockDefaultValueFactory2 *factory;
EtchString uri("tcp://127.0.0.1:4001");
- factory = new MockDefaultValueFactory2(uri);
+ factory = new MockDefaultValueFactory2(mRuntime, uri);
//created value factory
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
EtchDeliveryService * service = NULL;
- service = new EtchDefaultDeliveryService(manager, &u);
+ service = new EtchDefaultDeliveryService(mRuntime, manager, &u);
EtchRemoteBase * remote = NULL;
- remote = new EtchRemoteBase(service, factory->factory, NULL);
+ remote = new EtchRemoteBase(mRuntime, service, factory->factory, NULL);
EXPECT_TRUE(remote != NULL);
manager->setSession(service);
@@ -249,7 +245,7 @@ TEST_F(EtchRemoteBaseTest, beginCallTest
//get the validator
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
//create type
EtchType *mt;
factory->types.get("add", mt);
@@ -282,16 +278,16 @@ TEST_F(EtchRemoteBaseTest, endCallTest)
MockTransport2 *transport = new MockTransport2();
MockDefaultValueFactory2 *factory;
EtchString uri("tcp://127.0.0.1:4001");
- factory = new MockDefaultValueFactory2(uri);
+ factory = new MockDefaultValueFactory2(mRuntime, uri);
//created value factory
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
EtchDeliveryService * service = NULL;
- service = new EtchDefaultDeliveryService(manager, &u);
+ service = new EtchDefaultDeliveryService(mRuntime, manager, &u);
EtchRemoteBase * remote = NULL;
- remote = new EtchRemoteBase(service, factory->factory, NULL);
+ remote = new EtchRemoteBase(mRuntime, service, factory->factory, NULL);
EXPECT_TRUE(remote != NULL);
manager->setSession(service);
@@ -301,7 +297,7 @@ TEST_F(EtchRemoteBaseTest, endCallTest)
EtchType * type;
EtchType * replyType;
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
factory->types.get("add_result", replyType);
factory->types.get("add", type);
@@ -341,7 +337,7 @@ TEST_F(EtchRemoteBaseTest, endCallTest)
EXPECT_TRUE(result == data);
factory->types.clear();
-
+
delete transport;
delete mail;
delete remote;
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp Wed Oct 17 06:50:01 2012
@@ -19,14 +19,20 @@
#include "gmock/gmock.h"
#include "support/EtchRuntime.h"
+capu::uint64_t currentIdCount;
+
TEST(EtchRuntime, Default) {
- EtchRuntime* runtime = new EtchRuntime();
+ EtchRuntime* runtime = new EtchRuntime(); //ID = 0
+ currentIdCount = runtime->getId();
delete runtime;
}
TEST(EtchRuntime, getId) {
- EtchRuntime* runtime = new EtchRuntime();
- capu::uint64_t id = runtime->getId();
+ EtchRuntime* runtime = new EtchRuntime(); //ID = 1
+ EXPECT_EQ(currentIdCount + 1, runtime->getId());
+ delete runtime;
+ runtime = new EtchRuntime(); //ID = 2
+ EXPECT_EQ(currentIdCount + 2, runtime->getId());
delete runtime;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchDefaultDeliveryServiceTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchDefaultDeliveryServiceTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchDefaultDeliveryServiceTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchDefaultDeliveryServiceTest.cpp Wed Oct 17 06:50:01 2012
@@ -28,7 +28,7 @@
class MockSession1 : public EtchSessionMessage {
public:
- MockSession1(EtchTransportMessage* transport)
+ MockSession1(EtchTransportMessage* transport)
: mTransport(transport) {
if(mTransport != NULL) {
mTransport->setSession(this);
@@ -96,8 +96,8 @@ public:
*/
public:
- MockDefaultValueFactory1(EtchString uri) {
- EtchDefaultValueFactory::Init(&types, &class2type);
+ MockDefaultValueFactory1(EtchRuntime* runtime, EtchString uri) {
+ EtchDefaultValueFactory::Init(runtime, &types, &class2type);
factory = new EtchDefaultValueFactory(uri, &types, &class2type);
}
@@ -112,16 +112,11 @@ class EtchDefaultDeliveryServiceTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -136,8 +131,8 @@ TEST_F(EtchDefaultDeliveryServiceTest, c
// create mock layer for transport
MockTransport1* transport = new MockTransport1();
- EtchPlainMailboxManager* mailboxManager = new EtchPlainMailboxManager(transport, uri, NULL);
- EtchDefaultDeliveryService* deliveryService = new EtchDefaultDeliveryService(mailboxManager, uri);
+ EtchPlainMailboxManager* mailboxManager = new EtchPlainMailboxManager(mRuntime, transport, uri, NULL);
+ EtchDefaultDeliveryService* deliveryService = new EtchDefaultDeliveryService(mRuntime, mailboxManager, uri);
// create mock layer for session
MockSession1* session = new MockSession1(deliveryService);
@@ -151,11 +146,11 @@ TEST_F(EtchDefaultDeliveryServiceTest, b
EtchString uri("tcp://127.0.0.1:4001");
// create value factory
- MockDefaultValueFactory1* factory = new MockDefaultValueFactory1(uri);
+ MockDefaultValueFactory1* factory = new MockDefaultValueFactory1(mRuntime, uri);
//set type and corresponding validator
EtchType * type = NULL;
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
factory->types.get("add", type);
type->putValidator(EtchDefaultValueFactory::_mf__messageId(), val);
@@ -170,8 +165,8 @@ TEST_F(EtchDefaultDeliveryServiceTest, b
// create mock layer for transport
MockTransport1* transport = new MockTransport1();
- EtchPlainMailboxManager* mailboxManager = new EtchPlainMailboxManager(transport, uri, NULL);
- EtchDefaultDeliveryService* deliveryService = new EtchDefaultDeliveryService(mailboxManager, uri);
+ EtchPlainMailboxManager* mailboxManager = new EtchPlainMailboxManager(mRuntime, transport, uri, NULL);
+ EtchDefaultDeliveryService* deliveryService = new EtchDefaultDeliveryService(mRuntime, mailboxManager, uri);
// create mock layer for session
MockSession1* session = new MockSession1(deliveryService);
@@ -182,7 +177,7 @@ TEST_F(EtchDefaultDeliveryServiceTest, b
//test begincall
EtchMailbox *mail = NULL;
EXPECT_TRUE(ETCH_OK == deliveryService->begincall(message, mail));
- EXPECT_EQ(1, mailboxManager->count());
+ EXPECT_EQ(1u, mailboxManager->count());
EXPECT_TRUE(ETCH_OK == message->getMessageId(id));
EXPECT_TRUE(ETCH_OK != message->getInReplyToMessageId(id));
@@ -203,13 +198,13 @@ TEST_F(EtchDefaultDeliveryServiceTest, e
EtchString uri("tcp://127.0.0.1:4001");
// create value factory
- MockDefaultValueFactory1* factory = new MockDefaultValueFactory1(uri);
+ MockDefaultValueFactory1* factory = new MockDefaultValueFactory1(mRuntime, uri);
//set type and return type and the corresponding validators
EtchType * type = NULL;
EtchType * replyType = NULL;
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
factory->types.get("add_result", replyType);
factory->types.get("add", type);
@@ -228,8 +223,8 @@ TEST_F(EtchDefaultDeliveryServiceTest, e
// create mock layer for transport
MockTransport1* transport = new MockTransport1();
- EtchPlainMailboxManager* mailboxManager = new EtchPlainMailboxManager(transport, uri, NULL);
- EtchDefaultDeliveryService* deliveryService = new EtchDefaultDeliveryService(mailboxManager, uri);
+ EtchPlainMailboxManager* mailboxManager = new EtchPlainMailboxManager(mRuntime, transport, uri, NULL);
+ EtchDefaultDeliveryService* deliveryService = new EtchDefaultDeliveryService(mRuntime, mailboxManager, uri);
// create mock layer for session
MockSession1* session = new MockSession1(deliveryService);
@@ -240,7 +235,7 @@ TEST_F(EtchDefaultDeliveryServiceTest, e
//performed the call
EtchMailbox *mail;
EXPECT_TRUE(ETCH_OK == deliveryService->begincall(message, mail));
- EXPECT_EQ(1, mailboxManager->count());
+ EXPECT_EQ(1u, mailboxManager->count());
EXPECT_TRUE(ETCH_OK == message->getMessageId(id));
EXPECT_TRUE(ETCH_OK != message->getInReplyToMessageId(id));
EXPECT_TRUE(ETCH_OK == mailboxManager->getMailbox(id, mail));
@@ -264,7 +259,7 @@ TEST_F(EtchDefaultDeliveryServiceTest, e
status = deliveryService->endcall(mail, replyType, result);
EXPECT_EQ(ETCH_OK, status);
delete mail;
-
+
//check the result
EXPECT_TRUE(result->equals(data.get()));
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessageTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessageTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessageTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/transport/EtchMessageTest.cpp Wed Oct 17 06:50:01 2012
@@ -77,21 +77,15 @@ class EtchMessageTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
-private:
EtchRuntime* mRuntime;
};
@@ -128,9 +122,9 @@ TEST_F(EtchMessageTest, getTypeTest) {
//fill validators
capu::SmartPointer<EtchValidator> val1;
- EtchValidatorBoolean::Get(0, val1);
+ EtchValidatorBoolean::Get(mRuntime, 0, val1);
capu::SmartPointer<EtchValidator> val2;
- EtchValidatorBoolean::Get(0, val2);
+ EtchValidatorBoolean::Get(mRuntime, 0, val2);
comp->putValidator(field1, val1);
comp->putValidator(field2, val2);
@@ -154,9 +148,9 @@ TEST_F(EtchMessageTest, isType) {
EtchType* comp = new EtchType(90, "comp");
capu::SmartPointer<EtchValidator> val1;
- EtchValidatorBoolean::Get(0, val1);
+ EtchValidatorBoolean::Get(mRuntime, 0, val1);
capu::SmartPointer<EtchValidator> val2;
- EtchValidatorBoolean::Get(0, val2);
+ EtchValidatorBoolean::Get(mRuntime, 0, val2);
comp->putValidator(field1, val1);
comp->putValidator(field2, val2);
//Create Value Factory
@@ -187,9 +181,9 @@ TEST_F(EtchMessageTest, putTest) {
EtchType* comp = new EtchType(90, typeName);
capu::SmartPointer<EtchValidator> val1;
- EtchValidatorBoolean::Get(0, val1);
+ EtchValidatorBoolean::Get(mRuntime, 0, val1);
capu::SmartPointer<EtchValidator> val2;
- EtchValidatorBoolean::Get(0, val2);
+ EtchValidatorBoolean::Get(mRuntime, 0, val2);
comp->putValidator(field1, val1);
comp->putValidator(field2, val2);
@@ -226,9 +220,9 @@ TEST_F(EtchMessageTest, getTest) {
EtchType* comp = new EtchType(90, typeName);
capu::SmartPointer<EtchValidator> val1;
- EtchValidatorBoolean::Get(0, val1);
+ EtchValidatorBoolean::Get(mRuntime, 0, val1);
capu::SmartPointer<EtchValidator> val2;
- EtchValidatorBoolean::Get(0, val2);
+ EtchValidatorBoolean::Get(mRuntime, 0, val2);
comp->putValidator(field1, val1);
comp->putValidator(field2, val2);
@@ -265,7 +259,7 @@ TEST_F(EtchMessageTest, removeTest) {
EtchType* comp = new EtchType(90, typeName);
capu::SmartPointer<EtchValidator> val1;
- EtchValidatorBoolean::Get(0, val1);
+ EtchValidatorBoolean::Get(mRuntime, 0, val1);
comp->putValidator(field1, val1);
EtchMessage *sv = new EtchMessage(comp, factory);
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=1399114&r1=1399113&r2=1399114&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 Wed Oct 17 06:50:01 2012
@@ -30,7 +30,7 @@
class MockListener11 : public virtual EtchSessionListener<EtchSocket> {
public:
- MockListener11(EtchTransport<EtchSessionListener<EtchSocket> >* transport)
+ MockListener11(EtchTransport<EtchSessionListener<EtchSocket> >* transport)
: mTransport(transport) {
if(mTransport != NULL) {
mTransport->setSession(this);
@@ -77,60 +77,55 @@ public:
status_t sessionNotify(capu::SmartPointer<EtchObject> event) {
return ETCH_OK;
}
-};
-
-class EtchMessagizerTest
- : public ::testing::Test {
-protected:
- virtual void SetUp() {
- mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
- mRuntime->start();
- }
-
- virtual void TearDown() {
- mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
- delete mRuntime;
- mRuntime = NULL;
- }
-
- EtchRuntime* mRuntime;
-};
-
-TEST_F(EtchMessagizerTest, constructorTest) {
- EtchTypeMap types;
- EtchClass2TypeMap class2type;
- EtchDefaultValueFactory * factory;
- EtchDefaultValueFactory::Init(&types, &class2type);
- EtchString uri("tcp://127.0.0.1:4001");
- factory = new EtchDefaultValueFactory(uri, &types, &class2type);
- //created value factory
- EtchURL u("tcp://127.0.0.1:4001");
- EtchResources r;
- EtchObject *out;
+};
+
+class EtchMessagizerTest
+ : public ::testing::Test {
+protected:
+ virtual void SetUp() {
+ mRuntime = new EtchRuntime();
+ mRuntime->start();
+ }
+
+ virtual void TearDown() {
+ mRuntime->shutdown();
+ delete mRuntime;
+ mRuntime = NULL;
+ }
+
+ EtchRuntime* mRuntime;
+};
+
+TEST_F(EtchMessagizerTest, constructorTest) {
+ EtchTypeMap types;
+ EtchClass2TypeMap class2type;
+ EtchDefaultValueFactory * factory;
+ EtchDefaultValueFactory::Init(mRuntime, &types, &class2type);
+ EtchString uri("tcp://127.0.0.1:4001");
+ factory = new EtchDefaultValueFactory(uri, &types, &class2type);
+ //created value factory
+ EtchURL u("tcp://127.0.0.1:4001");
+ EtchResources r;
+ EtchObject *out;
r.put(EtchTransport<EtchSessionMessage>::VALUE_FACTORY(), factory, out);
- EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
- EtchTransportPacket* pac = new EtchPacketizer(conn, &u);
- EtchSessionPacket* mes = new EtchMessagizer(pac, &u, &r);
-
+ EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
+ EtchTransportPacket* pac = new EtchPacketizer(mRuntime, conn, &u);
+ EtchSessionPacket* mes = new EtchMessagizer(mRuntime, pac, &u, &r);
+
//Delete created stack
delete conn;
delete mes;
delete pac;
- delete factory;
- types.clear();
-}
-
+ delete factory;
+ types.clear();
+}
+
TEST_F(EtchMessagizerTest, TransportControlTest) {
EtchTypeMap types;
EtchClass2TypeMap class2type;
EtchDefaultValueFactory * factory;
MockMailboxManager manager;
- EtchDefaultValueFactory::Init(&types, &class2type);
+ EtchDefaultValueFactory::Init(mRuntime, &types, &class2type);
EtchString uri("tcp://127.0.0.1:4001");
factory = new EtchDefaultValueFactory(uri, &types, &class2type);
//created value factory
@@ -138,36 +133,36 @@ TEST_F(EtchMessagizerTest, TransportCont
EtchResources r;
EtchObject *out;
r.put(EtchTransport<EtchSessionMessage>::VALUE_FACTORY(), factory, out);
- EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
- EtchPacketizer* pac = new EtchPacketizer(conn, &u);
- EtchMessagizer* mess = new EtchMessagizer(pac, &u, &r);
+ EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
+ EtchPacketizer* pac = new EtchPacketizer(mRuntime, conn, &u);
+ EtchMessagizer* mess = new EtchMessagizer(mRuntime, pac, &u, &r);
mess->setSession(&manager);
- EtchTcpListener* transport = new EtchTcpListener(&u);
+ EtchTcpListener* transport = new EtchTcpListener(mRuntime, &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));
transport->transportControl(new EtchString(EtchTcpListener::STOP_AND_WAIT_DOWN()), new EtchInt32(1000));
-
+
delete conn;
delete mSessionListener;
delete pac;
delete mess;
- delete factory;
- types.clear();
-}
-
-TEST_F(EtchMessagizerTest, TransportMessageTest) {
- EtchTypeMap types;
- EtchClass2TypeMap class2type;
- EtchDefaultValueFactory * factory;
+ delete factory;
+ types.clear();
+}
+
+TEST_F(EtchMessagizerTest, TransportMessageTest) {
+ EtchTypeMap types;
+ EtchClass2TypeMap class2type;
+ EtchDefaultValueFactory * factory;
MockMailboxManager manager;
- EtchDefaultValueFactory::Init(&types, &class2type);
+ EtchDefaultValueFactory::Init(mRuntime, &types, &class2type);
EtchString uri("tcp://127.0.0.1:4001");
factory = new EtchDefaultValueFactory(uri, &types, &class2type);
//default value factory
@@ -176,9 +171,9 @@ TEST_F(EtchMessagizerTest, TransportMess
EtchObject *out;
//add to the resource
r.put(EtchTransport<EtchSessionMessage>::VALUE_FACTORY(), factory, out);
- EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
- EtchPacketizer* pac = new EtchPacketizer(conn, &u);
- EtchMessagizer* mess = new EtchMessagizer(pac, &u, &r);
+ EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
+ EtchPacketizer* pac = new EtchPacketizer(mRuntime, conn, &u);
+ EtchMessagizer* mess = new EtchMessagizer(mRuntime, pac, &u, &r);
mess->setSession(&manager);
//creation of example message which will be serialized
EtchType *mt_foo = NULL;
@@ -186,78 +181,78 @@ TEST_F(EtchMessagizerTest, TransportMess
EtchString str("foo");
factory->getType(str, mt_foo);
capu::SmartPointer<EtchValidator> v;
- EtchValidatorShort::Get(0, v);
+ EtchValidatorShort::Get(mRuntime, 0, v);
mt_foo->putValidator(mf_x, v);
capu::SmartPointer<EtchShort> data = new EtchShort(10000);
capu::SmartPointer<EtchMessage> msg = new EtchMessage(mt_foo, factory);
msg->put(mf_x, data);
EXPECT_TRUE(mess->transportMessage(NULL, msg) == ETCH_ERROR);
-
+
delete conn;
delete mess;
delete pac;
- delete factory;
- types.clear();
-}
-
-TEST_F(EtchMessagizerTest, SessionDataTest) {
- //creation of an example message to compare the deserialized messageMyValueFactory vf("tcp:");
- EtchTypeMap types;
- EtchClass2TypeMap class2type;
- EtchString name1("a");
- EtchString name2("b");
- EtchType *mt_foo = new EtchType(1, name1);
- EtchField mf_x(2, name2);
- capu::SmartPointer<EtchValidator> v;
- EtchValidatorShort::Get(0, v);
- mt_foo->putValidator(mf_x, v);
- types.add(mt_foo);
- capu::SmartPointer<EtchShort> data = new EtchShort(10000);
- //default value factory
- EtchDefaultValueFactory * factory;
- EtchDefaultValueFactory::Init(&types, &class2type);
- EtchString uri("tcp://127.0.0.1:4001");
-
-
- factory = new EtchDefaultValueFactory(uri, &types, &class2type);
- capu::SmartPointer<EtchMessage> msg = new EtchMessage(mt_foo, factory);
- msg->put(mf_x, data);
-
-
- EtchURL u(uri);
- EtchResources r;
- EtchObject *out;
- //add the value factory to the resources
+ delete factory;
+ types.clear();
+}
+
+TEST_F(EtchMessagizerTest, SessionDataTest) {
+ //creation of an example message to compare the deserialized messageMyValueFactory vf("tcp:");
+ EtchTypeMap types;
+ EtchClass2TypeMap class2type;
+ EtchString name1("a");
+ EtchString name2("b");
+ EtchType *mt_foo = new EtchType(1, name1);
+ EtchField mf_x(2, name2);
+ capu::SmartPointer<EtchValidator> v;
+ EtchValidatorShort::Get(mRuntime, 0, v);
+ mt_foo->putValidator(mf_x, v);
+ types.add(mt_foo);
+ capu::SmartPointer<EtchShort> data = new EtchShort(10000);
+ //default value factory
+ EtchDefaultValueFactory * factory;
+ EtchDefaultValueFactory::Init(mRuntime, &types, &class2type);
+ EtchString uri("tcp://127.0.0.1:4001");
+
+
+ factory = new EtchDefaultValueFactory(uri, &types, &class2type);
+ capu::SmartPointer<EtchMessage> msg = new EtchMessage(mt_foo, factory);
+ msg->put(mf_x, data);
+
+
+ EtchURL u(uri);
+ EtchResources r;
+ EtchObject *out;
+ //add the value factory to the resources
r.put(EtchTransport<EtchSessionMessage>::VALUE_FACTORY(), factory, out);
- //create stack
- EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
- EtchPacketizer* pac = new EtchPacketizer(conn, &u);
- EtchMessagizer* mess = new EtchMessagizer(pac, &u, &r);
- capu::SmartPointer<EtchFlexBuffer> buffer = new EtchFlexBuffer();
-
- //A packet is created
- capu::int8_t byte_pos[] = {3, 1, 1, 2, -123, 39, 16, -127};
- buffer->setByteRepresentation(ETCH_BIG_ENDIAN);
- buffer->put((capu::int8_t *)"_header_", pac->getHeaderSize());
- buffer->put((capu::int8_t *)byte_pos, 8);
- buffer->setIndex(0);
- capu::int32_t pktsize = buffer->getLength() - pac->getHeaderSize();
- buffer->put((capu::int8_t *) & pac->SIG, sizeof (capu::int32_t));
- buffer->put((capu::int8_t *) & pktsize, sizeof (capu::int32_t));
- buffer->setIndex(pac->getHeaderSize());
- EXPECT_TRUE(buffer->getLength() == 16);
-
- //Simulate call with fake package
- EtchSessionMessage* mMailboxManager = new MockMailboxManager();
- mess->setSession(mMailboxManager);
- EXPECT_TRUE(mess->sessionPacket(NULL, buffer) == ETCH_OK);
-
- mess->setSession(NULL);
- types.clear();
+ //create stack
+ EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
+ EtchPacketizer* pac = new EtchPacketizer(mRuntime, conn, &u);
+ EtchMessagizer* mess = new EtchMessagizer(mRuntime, pac, &u, &r);
+ capu::SmartPointer<EtchFlexBuffer> buffer = new EtchFlexBuffer();
+
+ //A packet is created
+ capu::int8_t byte_pos[] = {3, 1, 1, 2, -123, 39, 16, -127};
+ buffer->setByteRepresentation(ETCH_BIG_ENDIAN);
+ buffer->put((capu::int8_t *)"_header_", pac->getHeaderSize());
+ buffer->put((capu::int8_t *)byte_pos, 8);
+ buffer->setIndex(0);
+ capu::int32_t pktsize = buffer->getLength() - pac->getHeaderSize();
+ buffer->put((capu::int8_t *) & pac->SIG, sizeof (capu::int32_t));
+ buffer->put((capu::int8_t *) & pktsize, sizeof (capu::int32_t));
+ buffer->setIndex(pac->getHeaderSize());
+ EXPECT_TRUE(buffer->getLength() == 16);
+
+ //Simulate call with fake package
+ EtchSessionMessage* mMailboxManager = new MockMailboxManager();
+ mess->setSession(mMailboxManager);
+ EXPECT_TRUE(mess->sessionPacket(NULL, buffer) == ETCH_OK);
+
+ mess->setSession(NULL);
+ types.clear();
delete conn;
delete mMailboxManager;
delete pac;
delete mess;
- delete factory;
-}
+ 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=1399114&r1=1399113&r2=1399114&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 Wed Oct 17 06:50:01 2012
@@ -74,48 +74,43 @@ public:
status_t sessionNotify(capu::SmartPointer<EtchObject> event) {
return ETCH_OK;
}
-};
-
-class EtchPacketizerTest
- : public ::testing::Test {
-protected:
- virtual void SetUp() {
- mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
- mRuntime->start();
- }
-
- virtual void TearDown() {
- mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
- delete mRuntime;
- mRuntime = NULL;
- }
+};
+
+class EtchPacketizerTest
+ : public ::testing::Test {
+protected:
+ virtual void SetUp() {
+ mRuntime = new EtchRuntime();
+ mRuntime->start();
+ }
+
+ virtual void TearDown() {
+ mRuntime->shutdown();
+ delete mRuntime;
+ mRuntime = NULL;
+ }
EtchRuntime* mRuntime;
-};
-
-TEST_F(EtchPacketizerTest, constructorTest) {
- EtchURL u("tcp://127.0.0.1:4001");
+};
+
+TEST_F(EtchPacketizerTest, constructorTest) {
+ EtchURL u("tcp://127.0.0.1:4001");
EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
- EtchSessionData* packetizer = new EtchPacketizer(conn, &u);
+ EtchSessionData* packetizer = new EtchPacketizer(mRuntime, conn, &u);
delete conn;
delete packetizer;
-
-}
-
-TEST_F(EtchPacketizerTest, TransportControlTest) {
- EtchURL u("tcp://127.0.0.1:4001");
+
+}
+
+TEST_F(EtchPacketizerTest, TransportControlTest) {
+ EtchURL u("tcp://127.0.0.1:4001");
EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
- EtchPacketizer* packetizer = new EtchPacketizer(conn, &u);
+ EtchPacketizer* packetizer = new EtchPacketizer(mRuntime, conn, &u);
MockMessagizer mes;
packetizer->setSession(&mes);
- EtchTcpListener* transport = new EtchTcpListener(&u);
+ EtchTcpListener* transport = new EtchTcpListener(mRuntime, &u);
EtchSessionListener<EtchSocket>* listener = new MockListener3(transport);
//Start the mock listener
@@ -128,34 +123,34 @@ TEST_F(EtchPacketizerTest, TransportCont
delete conn;
delete packetizer;
- delete listener;
-}
-
-TEST_F(EtchPacketizerTest, TransportPacketTest) {
- EtchURL u("tcp://127.0.0.1:4001");
+ delete listener;
+}
+
+TEST_F(EtchPacketizerTest, TransportPacketTest) {
+ EtchURL u("tcp://127.0.0.1:4001");
EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
- EtchPacketizer* packetizer = new EtchPacketizer(conn, &u);
+ EtchPacketizer* packetizer = new EtchPacketizer(mRuntime, conn, &u);
MockMessagizer mes;
packetizer->setSession(&mes);
- capu::SmartPointer<EtchFlexBuffer> buffer = new EtchFlexBuffer();
-
- //A packet is try to transmit data through not started transport
- buffer->put((capu::int8_t *)"_header_", packetizer->getHeaderSize());
- buffer->put((capu::int8_t *)"test", 4);
- buffer->setIndex(0);
-
- EXPECT_TRUE(packetizer->transportPacket(NULL, buffer) == ETCH_ERROR);
+ capu::SmartPointer<EtchFlexBuffer> buffer = new EtchFlexBuffer();
+
+ //A packet is try to transmit data through not started transport
+ buffer->put((capu::int8_t *)"_header_", packetizer->getHeaderSize());
+ buffer->put((capu::int8_t *)"test", 4);
+ buffer->setIndex(0);
+
+ EXPECT_TRUE(packetizer->transportPacket(NULL, buffer) == ETCH_ERROR);
delete conn;
- delete packetizer;
-}
-
-TEST_F(EtchPacketizerTest, SessionDataTest) {
- EtchURL u("tcp://127.0.0.1:4001");
+ delete packetizer;
+}
+
+TEST_F(EtchPacketizerTest, SessionDataTest) {
+ EtchURL u("tcp://127.0.0.1:4001");
EtchTransportData* conn = new EtchTcpConnection(mRuntime, NULL, &u);
- EtchPacketizer* packetizer = new EtchPacketizer(conn, &u);
- capu::SmartPointer<EtchFlexBuffer> buffer = new EtchFlexBuffer();
- //A packet is created
+ EtchPacketizer* packetizer = new EtchPacketizer(mRuntime, conn, &u);
+ capu::SmartPointer<EtchFlexBuffer> buffer = new EtchFlexBuffer();
+ //A packet is created
capu::int32_t pktsize = 4;
buffer->putInt(packetizer->SIG());
buffer->putInt(pktsize);
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=1399114&r1=1399113&r2=1399114&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 Wed Oct 17 06:50:01 2012
@@ -79,8 +79,8 @@ public:
*/
public:
- MockDefaultValueFactory(EtchString uri) {
- EtchDefaultValueFactory::Init(&types, &class2type);
+ MockDefaultValueFactory(EtchRuntime* runtime, EtchString uri) {
+ EtchDefaultValueFactory::Init(runtime, &types, &class2type);
factory = new EtchDefaultValueFactory(uri, &types, &class2type);
}
@@ -95,16 +95,11 @@ class EtchPlainMailboxManagerTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -117,11 +112,11 @@ TEST_F(EtchPlainMailboxManagerTest, cons
MockSession session;
MockDefaultValueFactory *factory;
EtchString uri("tcp://127.0.0.1:4001");
- factory = new MockDefaultValueFactory(uri);
+ factory = new MockDefaultValueFactory(mRuntime, uri);
//created value factory
EtchURL u(uri);
EtchMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
EXPECT_TRUE(manager != NULL);
manager->setSession(&session);
@@ -134,11 +129,11 @@ TEST_F(EtchPlainMailboxManagerTest, cons
TEST_F(EtchPlainMailboxManagerTest, transportMessageTest) {
EtchString uri("tcp://127.0.0.1:4001");
MockDefaultValueFactory *factory;
- factory = new MockDefaultValueFactory(uri);
+ factory = new MockDefaultValueFactory(mRuntime, uri);
//initialization
EtchType * type;
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
factory->types.get("add", type);
type->putValidator(EtchDefaultValueFactory::_mf__messageId(), val);
@@ -153,12 +148,12 @@ TEST_F(EtchPlainMailboxManagerTest, tran
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
manager->setSession(&session);
EXPECT_TRUE(ETCH_OK == manager->transportMessage(NULL, message));
- EXPECT_EQ(0, manager->count());
+ EXPECT_EQ(0u, manager->count());
EXPECT_TRUE(ETCH_OK == message->getMessageId(id));
EXPECT_TRUE(ETCH_OK != message->getInReplyToMessageId(id));
@@ -175,11 +170,11 @@ TEST_F(EtchPlainMailboxManagerTest, tran
TEST_F(EtchPlainMailboxManagerTest, transportResultMessageTest) {
EtchString uri("tcp://127.0.0.1:4001");
MockDefaultValueFactory *factory;
- factory = new MockDefaultValueFactory(uri);
+ factory = new MockDefaultValueFactory(mRuntime, uri);
//initialization
EtchType * type;
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
factory->types.get("add_result", type);
type->putValidator(EtchDefaultValueFactory::_mf__messageId(), val);
@@ -197,12 +192,12 @@ TEST_F(EtchPlainMailboxManagerTest, tran
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
manager->setSession(&session);
EXPECT_TRUE(ETCH_OK == manager->transportMessage(NULL, message));
- EXPECT_EQ(0, manager->count());
+ EXPECT_EQ(0u, manager->count());
EXPECT_TRUE(ETCH_OK == message->getMessageId(id));
EXPECT_TRUE(ETCH_OK == message->getInReplyToMessageId(id));
EXPECT_TRUE(id == 1L);
@@ -219,11 +214,11 @@ TEST_F(EtchPlainMailboxManagerTest, tran
TEST_F(EtchPlainMailboxManagerTest, transportCallTest) {
EtchString uri("tcp://127.0.0.1:4001");
MockDefaultValueFactory *factory;
- factory = new MockDefaultValueFactory(uri);
+ factory = new MockDefaultValueFactory(mRuntime, uri);
//initialization
EtchType * type;
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
factory->types.get("add", type);
type->putValidator(EtchDefaultValueFactory::_mf__messageId(), val);
@@ -238,7 +233,7 @@ TEST_F(EtchPlainMailboxManagerTest, tran
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
manager->setSession(&session);
//in order to notify upper layers that the connection is open
@@ -246,7 +241,7 @@ TEST_F(EtchPlainMailboxManagerTest, tran
EtchMailbox *mail;
EXPECT_TRUE(ETCH_OK == manager->transportCall(NULL, message, mail));
- EXPECT_EQ(1, manager->count());
+ EXPECT_EQ(1u, manager->count());
EXPECT_TRUE(ETCH_OK == message->getMessageId(id));
EXPECT_TRUE(ETCH_OK != message->getInReplyToMessageId(id));
@@ -262,11 +257,11 @@ TEST_F(EtchPlainMailboxManagerTest, tran
TEST_F(EtchPlainMailboxManagerTest, replicatedTransportCallTest) {
EtchString uri("tcp://127.0.0.1:4001");
MockDefaultValueFactory *factory;
- factory = new MockDefaultValueFactory(uri);
+ factory = new MockDefaultValueFactory(mRuntime, uri);
//initialization
EtchType * type;
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
factory->types.get("add", type);
type->putValidator(EtchDefaultValueFactory::_mf__messageId(), val);
@@ -284,7 +279,7 @@ TEST_F(EtchPlainMailboxManagerTest, repl
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
manager->setSession(&session);
//in order to notify upper layers that the connection is open
@@ -293,8 +288,7 @@ TEST_F(EtchPlainMailboxManagerTest, repl
EtchMailbox *mail;
EXPECT_TRUE(ETCH_ERROR == manager->transportCall(NULL, message, mail));
//should not create a mailbox
- EXPECT_EQ(0, manager->count());
- EXPECT_TRUE(ETCH_OK == message->getMessageId(id));
+ EXPECT_EQ(ETCH_OK, message->getMessageId(id));
EXPECT_TRUE(ETCH_OK != message->getInReplyToMessageId(id));
//there should be no mailbox
EXPECT_TRUE(ETCH_OK != manager->getMailbox(id, mail));
@@ -309,12 +303,12 @@ TEST_F(EtchPlainMailboxManagerTest, repl
TEST_F(EtchPlainMailboxManagerTest, sessionMessageTest) {
EtchString uri("tcp://127.0.0.1:4001");
MockDefaultValueFactory *factory;
- factory = new MockDefaultValueFactory(uri);
+ factory = new MockDefaultValueFactory(mRuntime, uri);
//initialization
EtchType * type;
EtchType * replyType;
capu::SmartPointer<EtchValidator> val = NULL;
- EtchValidatorLong::Get(0, val);
+ EtchValidatorLong::Get(mRuntime, 0, val);
factory->types.get("add_result", replyType);
factory->types.get("add", type);
@@ -332,7 +326,7 @@ TEST_F(EtchPlainMailboxManagerTest, sess
EtchURL u(uri);
EtchPlainMailboxManager * manager = NULL;
- manager = new EtchPlainMailboxManager(transport, NULL, NULL);
+ manager = new EtchPlainMailboxManager(mRuntime, transport, NULL, NULL);
manager->setSession(&session);
//in order to notify upper layers that the connection is open
@@ -341,7 +335,7 @@ TEST_F(EtchPlainMailboxManagerTest, sess
//perform the call
EtchMailbox *mail;
EXPECT_TRUE(ETCH_OK == manager->transportCall(NULL, message, mail));
- EXPECT_EQ(1, manager->count());
+ EXPECT_EQ(1u, manager->count());
EXPECT_TRUE(ETCH_OK == message->getMessageId(id));
EXPECT_TRUE(ETCH_OK != message->getInReplyToMessageId(id));
//get the created mailbox
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=1399114&r1=1399113&r2=1399114&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 Wed Oct 17 06:50:01 2012
@@ -84,16 +84,11 @@ class EtchTcpConnectionTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -111,7 +106,7 @@ TEST_F(EtchTcpConnectionTest, constructo
TEST_F(EtchTcpConnectionTest, isStartedTest) {
EtchURL url("tcp://127.0.0.1:4001");
EtchTcpConnection * conn = new EtchTcpConnection(mRuntime, NULL, &url);
- EtchTcpListener *listener = new EtchTcpListener(&url);
+ EtchTcpListener *listener = new EtchTcpListener(mRuntime, &url);
EXPECT_FALSE(conn->isStarted());
EtchSessionListener<EtchSocket>* mSessionListener = new MockListener();
EtchSessionData* mPacketizer = new MockPacketizer();
@@ -141,7 +136,7 @@ TEST_F(EtchTcpConnectionTest, SessionAcc
EtchTcpConnection * conn = new EtchTcpConnection(mRuntime, NULL, &url);
EtchSessionListener<EtchSocket>* mSessionListener = new MockListener();
EtchSessionData* mPacketizer = new MockPacketizer();
- EtchTcpListener *listener = new EtchTcpListener(&url);
+ EtchTcpListener *listener = new EtchTcpListener(mRuntime, &url);
//START THE LISTENER
listener->setSession(mSessionListener);
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=1399114&r1=1399113&r2=1399114&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 Wed Oct 17 06:50:01 2012
@@ -74,16 +74,11 @@ class EtchTcpListenerTest
protected:
virtual void SetUp() {
mRuntime = new EtchRuntime();
- mRuntime->setLogger(new EtchLogger());
mRuntime->start();
}
virtual void TearDown() {
mRuntime->shutdown();
- EtchLogger* logger = mRuntime->getLogger();
- if(logger != NULL) {
- delete logger;
- }
delete mRuntime;
mRuntime = NULL;
}
@@ -93,7 +88,7 @@ protected:
TEST_F(EtchTcpListenerTest, constructorTest) {
EtchURL url("tcp://127.0.0.1:4001");
- EtchTcpListener * tcpListener = new EtchTcpListener(&url);
+ EtchTcpListener * tcpListener = new EtchTcpListener(mRuntime, &url);
EXPECT_TRUE(tcpListener != NULL);
delete tcpListener;
}
@@ -101,7 +96,7 @@ TEST_F(EtchTcpListenerTest, constructorT
TEST_F(EtchTcpListenerTest, transportControlTest) {
MockListener2 mock;
EtchURL url("tcp://127.0.0.1:4001");
- EtchTcpListener * tcpListener = new EtchTcpListener(&url);
+ EtchTcpListener * tcpListener = new EtchTcpListener(mRuntime, &url);
tcpListener->setSession(&mock);
tcpListener->transportControl(new EtchString(EtchTcpListener::START_AND_WAIT_UP()), new EtchInt32(1000));
EXPECT_TRUE(tcpListener->isStarted());
@@ -111,10 +106,10 @@ TEST_F(EtchTcpListenerTest, transportCon
TEST_F(EtchTcpListenerTest, isStartedTest) {
// TODO refactor this test
-
+
EtchURL url("tcp://127.0.0.1:4001");
EtchTcpConnection * conn = new EtchTcpConnection(mRuntime, NULL, &url);
- EtchTcpListener *listener = new EtchTcpListener(&url);
+ EtchTcpListener *listener = new EtchTcpListener(mRuntime, &url);
EtchSessionListener<EtchSocket>* mSessionListener = new MockListener2();
EtchSessionData* mPacketizer = new MockPacketizer2();
EXPECT_FALSE(listener->isStarted());
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/util/EtchCircularQueueTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/util/EtchCircularQueueTest.cpp?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/util/EtchCircularQueueTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/util/EtchCircularQueueTest.cpp Wed Oct 17 06:50:01 2012
@@ -38,7 +38,7 @@ TEST(EtchCirclerQueueTest, putAndGetTest
EXPECT_EQ(ETCH_EINVAL, queue->get(&e1, -1));
EXPECT_EQ(ETCH_TIMEOUT, queue->get(&e1, 1));
- EXPECT_EQ(0, queue->getCount());
+ EXPECT_EQ(0u, queue->getCount());
EXPECT_TRUE(queue->isEmpty());
EXPECT_FALSE(queue->isFull());
@@ -51,7 +51,7 @@ TEST(EtchCirclerQueueTest, putAndGetTest
EXPECT_EQ(ETCH_OK, queue->get(&e3));
EXPECT_EQ(e2, e3);
- EXPECT_EQ(0, queue->getCount());
+ EXPECT_EQ(0u, queue->getCount());
EXPECT_TRUE(queue->isEmpty());
delete e2;
}
Modified: incubator/etch/trunk/examples/helloworld/etch/HelloWorld.etch
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/helloworld/etch/HelloWorld.etch?rev=1399114&r1=1399113&r2=1399114&view=diff
==============================================================================
--- incubator/etch/trunk/examples/helloworld/etch/HelloWorld.etch (original)
+++ incubator/etch/trunk/examples/helloworld/etch/HelloWorld.etch Wed Oct 17 06:50:01 2012
@@ -29,6 +29,7 @@ service HelloWorld {
)
@Direction(Server)
+ @Timeout(1305)
string say_hello(user to_whom) throws UserUnknownException
}