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:48:57 UTC
svn commit: r1399111 [2/2] - in /incubator/etch/trunk/binding-cpp:
compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/
runtime/include/common/ runtime/include/serialization/
runtime/include/support/ runtime/include/transport/ runtime/src...
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchStructValue.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchStructValue.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchStructValue.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchStructValue.cpp Wed Oct 17 06:48:53 2012
@@ -24,13 +24,17 @@ const EtchObjectType* EtchStructValue::T
}
EtchStructValue::EtchStructValue(EtchType* type, EtchValueFactory* vf)
-: EtchObject(EtchStructValue::TYPE()), mType(type), mLevel(vf->getLevel()), mTable(DEFAULT_SIZE) {
-
+ : mType(type), mLevel(vf->getLevel()), mTable(DEFAULT_SIZE) {
+ addObjectType(TYPE());
}
EtchStructValue::EtchStructValue(EtchType* type, EtchValueFactory* vf, capu::uint32_t length)
-: EtchObject(EtchStructValue::TYPE()), mType(type), mLevel(vf->getLevel()), mTable(length > 0 ? (length * 4 + 2) / 3 : DEFAULT_SIZE) {
+ : mType(type), mLevel(vf->getLevel()), mTable(length > 0 ? (length * 4 + 2) / 3 : DEFAULT_SIZE) {
+ addObjectType(TYPE());
+}
+EtchStructValue::EtchStructValue(const EtchStructValue& other)
+ : EtchObject(other), mType(other.mType), mLevel(other.mLevel), mTable(other.mTable) {
}
EtchStructValue::~EtchStructValue() {
@@ -93,7 +97,7 @@ status_t EtchStructValue::get(const Etch
return mTable.get(key, value);
}
-EtchStructValue::Iterator EtchStructValue::begin()
+EtchStructValue::Iterator EtchStructValue::begin() const
{
return mTable.begin();
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchType.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchType.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchType.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchType.cpp Wed Oct 17 06:48:53 2012
@@ -23,21 +23,29 @@ const EtchObjectType* EtchType::TYPE() {
const static EtchObjectType TYPE(EOTID_TYPE, NULL);
return &TYPE;
}
-
EtchType::EtchType()
-: EtchObject(EtchType::TYPE()), mId(0), mTimeout(0), mName(""), mSuperType(NULL),
-mResultType(NULL), mDirection(BOTH), mAsyncMode(NONE), mLocked(false), mComponentType(NULL), mHelper(NULL), mStubHelper(NULL) {
+: mId(0), mTimeout(0), mName(""), mSuperType(NULL), mResultType(NULL),
+ mDirection(BOTH), mAsyncMode(NONE), mLocked(false), mComponentType(NULL), mHelper(NULL), mStubHelper(NULL) {
+ addObjectType(TYPE());
}
EtchType::EtchType(EtchString name)
-: EtchObject(EtchType::TYPE()), mTimeout(0), mName(name), mSuperType(NULL),
+: mTimeout(0), mName(name), mSuperType(NULL),
mResultType(NULL), mDirection(BOTH), mAsyncMode(NONE), mLocked(false), mComponentType(NULL), mHelper(NULL), mStubHelper(NULL) {
- mId = EtchHashEx::Digest(mName);;
+ mId = EtchHashEx::Digest(mName);
+ addObjectType(TYPE());
}
EtchType::EtchType(capu::uint32_t id, EtchString name)
-: EtchObject(EtchType::TYPE()), mId(id), mTimeout(0), mName(name), mSuperType(NULL),
+: mId(id), mTimeout(0), mName(name), mSuperType(NULL),
mResultType(NULL), mDirection(BOTH), mAsyncMode(NONE), mLocked(false), mComponentType(NULL), mHelper(NULL), mStubHelper(NULL) {
+ addObjectType(TYPE());
+}
+
+EtchType::EtchType(const EtchType& other)
+ : EtchObject(other), mId(other.mId), mTimeout(other.mTimeout), mName(other.mName), mSuperType(other.mSuperType),
+ mResultType(other.mResultType), mDirection(other.mDirection), mAsyncMode(other.mAsyncMode), mLocked(other.mLocked),
+ mComponentType(other.mComponentType), mHelper(other.mHelper), mStubHelper(other.mStubHelper) {
}
EtchType::~EtchType() {
@@ -49,7 +57,6 @@ EtchType::~EtchType() {
//TODO: Check memory management
delete mStubHelper;
}
-
}
capu::uint64_t EtchType::getHashCode() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTypeValidator.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTypeValidator.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTypeValidator.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchTypeValidator.cpp Wed Oct 17 06:48:53 2012
@@ -25,7 +25,7 @@ EtchTypeValidator::EtchTypeValidator(con
if (mNDims == 0)
mExpectedType = new EtchObjectType(scalarClass->getTypeId(),scalarClass->getObjectComponentType());
- else if (mNDims > 0){
+ else if (mNDims > 0){
EtchObjectType *type = new EtchObjectType(EOTID_NATIVE_ARRAY, scalarClass);
mExpectedType = type;
mArrayComponentType = scalarClass;
@@ -33,6 +33,11 @@ EtchTypeValidator::EtchTypeValidator(con
}
+EtchTypeValidator::EtchTypeValidator(const EtchTypeValidator& other)
+ : EtchValidator(other), mNDims(other.mNDims), mExpectedType(other.mExpectedType),
+ mArrayComponentType(other.mArrayComponentType), mSubclass(other.mSubclass) {
+}
+
EtchTypeValidator::~EtchTypeValidator(){
delete mExpectedType;
}
@@ -50,4 +55,4 @@ status_t EtchTypeValidator::checkDimensi
return ETCH_OK;
else
return ETCH_ERROR;
-}
\ No newline at end of file
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp Wed Oct 17 06:48:53 2012
@@ -37,6 +37,10 @@ EtchValidatorBoolean::EtchValidatorBoole
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorBoolean::EtchValidatorBoolean(const EtchValidatorBoolean& other)
+: EtchTypeValidator(other), mRuntime(other.mRuntime) {
+}
+
EtchValidatorBoolean::~EtchValidatorBoolean() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp Wed Oct 17 06:48:53 2012
@@ -37,6 +37,11 @@ EtchValidatorByte::EtchValidatorByte(cap
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorByte::EtchValidatorByte(const EtchValidatorByte& other)
+: EtchTypeValidator(other), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorByte::~EtchValidatorByte() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp Wed Oct 17 06:48:53 2012
@@ -82,17 +82,17 @@ const EtchObjectType* EtchValidatorCusto
}
EtchValidatorCustomKey::EtchValidatorCustomKey()
-: EtchObject(EtchValidatorCustomKey::TYPE())
-, mType(NULL)
-, mDims(0)
-, mSubclassOk(false) {
+ : mType(NULL), mDims(0), mSubclassOk(false) {
+ addObjectType(EtchValidatorCustomKey::TYPE());
}
EtchValidatorCustomKey::EtchValidatorCustomKey(const EtchObjectType * type, capu::int32_t dim, capu::bool_t sub)
-: EtchObject(EtchValidatorCustomKey::TYPE())
-, mType(type)
-, mDims(dim)
-, mSubclassOk(sub) {
+ : mType(type), mDims(dim), mSubclassOk(sub) {
+ addObjectType(EtchValidatorCustomKey::TYPE());
+}
+
+EtchValidatorCustomKey::EtchValidatorCustomKey(const EtchValidatorCustomKey& other)
+ : EtchObject(other), mType(other.mType), mDims(other.mDims), mSubclassOk(other.mSubclassOk) {
}
EtchValidatorCustomKey::~EtchValidatorCustomKey() {
@@ -122,6 +122,11 @@ EtchValidatorCustom::EtchValidatorCustom
mSubclass = sub;
}
+EtchValidatorCustom::EtchValidatorCustom(const EtchValidatorCustom& other)
+ : EtchTypeValidator(other) {
+
+}
+
EtchValidatorCustom::~EtchValidatorCustom() {
}
@@ -173,4 +178,4 @@ status_t EtchValidatorCustom::getElement
EtchHashTable<EtchValidatorCustomKey, capu::SmartPointer<EtchValidator> >& EtchValidatorCustom::Validators(EtchRuntime* runtime) {
static EtchValidatorCustomCaches validators;
return validators.get(runtime);
-}
\ No newline at end of file
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorDouble.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorDouble.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorDouble.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorDouble.cpp Wed Oct 17 06:48:53 2012
@@ -36,6 +36,11 @@ EtchValidatorDouble::EtchValidatorDouble
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorDouble::EtchValidatorDouble(const EtchValidatorDouble& other)
+: EtchTypeValidator(other), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorDouble::~EtchValidatorDouble() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorFloat.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorFloat.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorFloat.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorFloat.cpp Wed Oct 17 06:48:53 2012
@@ -37,6 +37,11 @@ EtchValidatorFloat::EtchValidatorFloat(c
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorFloat::EtchValidatorFloat(const EtchValidatorFloat& other)
+: EtchTypeValidator(other), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorFloat::~EtchValidatorFloat() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp Wed Oct 17 06:48:53 2012
@@ -37,6 +37,11 @@ EtchValidatorInt::EtchValidatorInt(capu:
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorInt::EtchValidatorInt(const EtchValidatorInt& other)
+: EtchTypeValidator(other), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorInt::~EtchValidatorInt() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorLong.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorLong.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorLong.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorLong.cpp Wed Oct 17 06:48:53 2012
@@ -37,6 +37,11 @@ EtchValidatorLong::EtchValidatorLong(cap
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorLong::EtchValidatorLong(const EtchValidatorLong& other)
+: EtchTypeValidator(other), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorLong::~EtchValidatorLong() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorNone.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorNone.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorNone.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorNone.cpp Wed Oct 17 06:48:53 2012
@@ -35,6 +35,11 @@ EtchValidatorNone::EtchValidatorNone()
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorNone::EtchValidatorNone(const EtchValidatorNone& other)
+: EtchValidator(other), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorNone::~EtchValidatorNone() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorObject.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorObject.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorObject.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorObject.cpp Wed Oct 17 06:48:53 2012
@@ -36,6 +36,11 @@ EtchValidatorObject::EtchValidatorObject
mSubclass = true;
}
+EtchValidatorObject::EtchValidatorObject(const EtchValidatorObject& other)
+: EtchTypeValidator(other), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorObject::~EtchValidatorObject() {
}
@@ -63,7 +68,7 @@ status_t EtchValidatorObject::validateVa
status_t EtchValidatorObject::Get(capu::uint32_t ndim, capu::SmartPointer<EtchValidator> &val) {
//TODO rafactor this
EtchRuntime* runtime = EtchRuntime::getRuntime();
-
+
if (ndim > MAX_NDIMS)
return ETCH_EINVAL;
if (ndim >= MAX_CACHED) {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorRuntimeException.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorRuntimeException.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorRuntimeException.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorRuntimeException.cpp Wed Oct 17 06:48:53 2012
@@ -37,6 +37,11 @@ EtchValidatorRuntimeException::EtchValid
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorRuntimeException::EtchValidatorRuntimeException(const EtchValidatorRuntimeException& other)
+: EtchValidator(other), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorRuntimeException::~EtchValidatorRuntimeException() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp Wed Oct 17 06:48:53 2012
@@ -37,6 +37,11 @@ EtchValidatorShort::EtchValidatorShort(c
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorShort::EtchValidatorShort(const EtchValidatorShort& other)
+: EtchTypeValidator(other), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorShort::~EtchValidatorShort() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorString.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorString.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorString.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorString.cpp Wed Oct 17 06:48:53 2012
@@ -37,6 +37,11 @@ EtchValidatorString::EtchValidatorString
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorString::EtchValidatorString(const EtchValidatorString& other)
+: EtchTypeValidator(other), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorString::~EtchValidatorString() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorStructValue.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorStructValue.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorStructValue.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorStructValue.cpp Wed Oct 17 06:48:53 2012
@@ -32,6 +32,11 @@ EtchValidatorStructValue::EtchValidatorS
mRuntime = EtchRuntime::getRuntime();
}
+EtchValidatorStructValue::EtchValidatorStructValue(const EtchValidatorStructValue& other)
+: EtchTypeValidator(other), mType(other.mType), mRuntime(other.mRuntime) {
+
+}
+
EtchValidatorStructValue::~EtchValidatorStructValue() {
}
@@ -85,4 +90,4 @@ status_t EtchValidatorStructValue::Get(E
EtchType* EtchValidatorStructValue::getType() {
return mType;
-}
\ No newline at end of file
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValueFactory.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValueFactory.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValueFactory.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValueFactory.cpp Wed Oct 17 06:48:53 2012
@@ -23,8 +23,12 @@ const EtchObjectType* EtchValueFactory::
return &TYPE;
}
-EtchValueFactory::EtchValueFactory()
-: EtchObject(EtchValueFactory::TYPE()) {
+EtchValueFactory::EtchValueFactory() {
+ addObjectType(EtchValueFactory::TYPE());
+}
+
+EtchValueFactory::EtchValueFactory(const EtchValueFactory& other)
+ : EtchObject(other) {
}
EtchString EtchValueFactory::getStringEncoding() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchFreePool.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchFreePool.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchFreePool.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchFreePool.cpp Wed Oct 17 06:48:53 2012
@@ -67,13 +67,10 @@ const EtchObjectType* EtchFreePool::TYPE
}
EtchFreePool::EtchFreePool(capu::int32_t size)
- : EtchPool(EtchFreePool::TYPE())
- , mSize(0)
- , mSizeMax(size)
- , mIsOpen(true) {
-
- mThreads = new capu::Thread*[mSizeMax];
- capu::Memory::Set(mThreads, 0, sizeof(capu::Thread*)*mSizeMax);
+ : mSize(0), mSizeMax(size), mIsOpen(true) {
+ addObjectType(TYPE());
+ mThreads = new capu::Thread*[mSizeMax];
+ capu::Memory::Set(mThreads, 0, sizeof(capu::Thread*)*mSizeMax);
}
EtchFreePool::~EtchFreePool() {
@@ -116,7 +113,7 @@ status_t EtchFreePool::add(capu::SmartPo
if(!mIsOpen) {
return ETCH_ERROR;
}
-
+
mMutex.lock();
// clean thread list
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchPool.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchPool.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchPool.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchPool.cpp Wed Oct 17 06:48:53 2012
@@ -20,3 +20,7 @@
#include "support/EtchPool.h"
+const EtchObjectType* EtchPool::TYPE() {
+ const static EtchObjectType TYPE(EOTID_POOL, NULL);
+ return &TYPE;
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp Wed Oct 17 06:48:53 2012
@@ -65,10 +65,9 @@ const EtchObjectType* EtchQueuedPool::TY
}
EtchQueuedPool::EtchQueuedPool(capu::int32_t size)
- : EtchPool(EtchQueuedPool::TYPE())
- , mSizeMax(size)
- , mIsOpen(true) {
- mPool = new capu::ThreadPool(mSizeMax);
+: mSizeMax(size), mIsOpen(true) {
+ addObjectType(TYPE());
+ mPool = new capu::ThreadPool(mSizeMax);
}
EtchQueuedPool::~EtchQueuedPool() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStack.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStack.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStack.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStack.cpp Wed Oct 17 06:48:53 2012
@@ -38,7 +38,18 @@ EtchStack::EtchStack() : EtchObject()
, mDeliveryService(NULL)
, mStub(NULL)
{
- EtchObject::addObjectType(EtchStack::TYPE());
+ addObjectType(EtchStack::TYPE());
+}
+
+EtchStack::EtchStack(const EtchStack& other) : EtchObject(other)
+, mTransportData(other.mTransportData)
+, mTransportPacket(other.mTransportPacket)
+, mTransportMessage(other.mTransportMessage)
+, mResources(other.mResources)
+, mValueFactory(other.mValueFactory)
+, mMailboxManager(other.mMailboxManager)
+, mDeliveryService(other.mDeliveryService)
+, mStub(other.mStub) {
}
EtchStack::~EtchStack() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackClient.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackClient.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackClient.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackClient.cpp Wed Oct 17 06:48:53 2012
@@ -24,8 +24,13 @@ const EtchObjectType* EtchStackClient::T
}
EtchStackClient::EtchStackClient() : EtchStack(), mStaticResources(NULL) {
- EtchObject::addObjectType(EtchStackClient::TYPE());
- EtchObject::setObjectType(EtchStackClient::TYPE());
+ addObjectType(EtchStackClient::TYPE());
+}
+
+EtchStackClient::EtchStackClient(const EtchStackClient& other)
+ : EtchStack(other), mStaticResources(other.mStaticResources)
+{
+
}
EtchStackClient::~EtchStackClient() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackServer.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackServer.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackServer.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/support/EtchStackServer.cpp Wed Oct 17 06:48:53 2012
@@ -23,11 +23,12 @@ const EtchObjectType* EtchStackServer::T
}
EtchStackServer::EtchStackServer()
-: EtchStack()
- , mRemote(NULL)
-{
- EtchObject::addObjectType(EtchStackServer::TYPE());
- EtchObject::setObjectType(EtchStackServer::TYPE());
+: EtchStack(), mRemote(NULL) {
+ addObjectType(EtchStackServer::TYPE());
+}
+
+EtchStackServer::EtchStackServer(const EtchStackServer& other)
+: EtchStack(other), mRemote(other.mRemote) {
}
EtchStackServer::~EtchStackServer() {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchMessage.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchMessage.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchMessage.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/main/transport/EtchMessage.cpp Wed Oct 17 06:48:53 2012
@@ -29,6 +29,10 @@ EtchMessage::EtchMessage(EtchType* type,
}
+EtchMessage::EtchMessage(const EtchMessage& other)
+ : EtchStructValue(other), mVf(other.mVf) {
+}
+
EtchMessage::~EtchMessage() {
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchArrayValueTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchArrayValueTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchArrayValueTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchArrayValueTest.cpp Wed Oct 17 06:48:53 2012
@@ -195,5 +195,22 @@ TEST(EtchArrayValueTest, addTest) {
delete av2;
}
+TEST(EtchArrayValueTest, copyTest) {
+ capu::SmartPointer<EtchNativeArray<capu::int8_t> > nativeTypeArray = new EtchNativeArray<capu::int8_t>(1);
+ nativeTypeArray->set(0, 1);
+ EtchArrayValue o1(nativeTypeArray, 1);
+ EtchArrayValue o2(o1);
+ EtchArrayValue o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+TEST(EtchArrayValueTest, isInstanceOf) {
+ capu::SmartPointer<EtchNativeArray<capu::int8_t> > nativeTypeArray = new EtchNativeArray<capu::int8_t>(1);
+ EtchObject* o1 = new EtchArrayValue(nativeTypeArray, 1);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchArrayValue::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchAuthenticationExceptionTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchAuthenticationExceptionTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchAuthenticationExceptionTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchAuthenticationExceptionTest.cpp Wed Oct 17 06:48:53 2012
@@ -60,3 +60,22 @@ TEST(EtchAuthenticationExceptionTest, eq
delete test2;
delete test3;
}
+
+TEST(EtchAuthenticationExceptionTest, copyTest) {
+ EtchString str("test message");
+ EtchAuthenticationException o1(str);
+ EtchAuthenticationException o2(o1);
+ EtchAuthenticationException o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchAuthenticationExceptionTest, isInstanceOf) {
+ EtchString str("test message");
+ EtchObject* o1 = new EtchAuthenticationException(str);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchException::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchAuthenticationException::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchBoolTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchBoolTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchBoolTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchBoolTest.cpp Wed Oct 17 06:48:53 2012
@@ -18,44 +18,62 @@
#include <gtest/gtest.h>
#include "common/EtchBool.h"
+#include "common/EtchString.h"
// Tests positive input.
TEST(EtchBoolTest, Constructor_Default){
EtchBool* i1 = new EtchBool();
EXPECT_TRUE(i1->getObjectType()->equals(EtchBool::TYPE()));
- EXPECT_TRUE(i1->get() == false);
+ EXPECT_FALSE(i1->get());
delete i1;
}
TEST(EtchBoolTest, Constructor_Bool){
EtchBool* i1 = new EtchBool(true);
EXPECT_TRUE(i1->getObjectType()->equals(EtchBool::TYPE()));
- EXPECT_TRUE(i1->get() == true);
+ EXPECT_TRUE(i1->get());
delete i1;
}
TEST(EtchBoolTest, set){
EtchBool* i1 = new EtchBool();
i1->set(true);
- EXPECT_TRUE(i1->get() == true);
+ EXPECT_TRUE(i1->get());
delete i1;
}
TEST(EtchBoolTest, get){
EtchBool* i1 = new EtchBool();
- EXPECT_TRUE(i1->get() == false);
+ EXPECT_FALSE(i1->get());
i1->set(true);
- EXPECT_TRUE(i1->get() == true);
+ EXPECT_TRUE(i1->get());
delete i1;
}
TEST(EtchBoolTest, equals){
EtchBool i1, i2;
- EXPECT_TRUE(i1.get() == false);
+ EXPECT_FALSE(i1.get());
i1.set(true);
i2.set(false);
- EXPECT_TRUE(i1.equals(&i2) == false);
+ EXPECT_FALSE(i1.equals(&i2));
i2.set(true);
- EXPECT_TRUE(i1.equals(&i2) == true);
+ EXPECT_TRUE(i1.equals(&i2));
}
+
+TEST(EtchBoolTest, copyTest) {
+ EtchBool o1(true);
+ EtchBool o2(o1);
+ EtchBool o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchBoolTest, isInstanceOf) {
+ EtchObject* o1 = new EtchBool(true);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchBool::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
+
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchByteTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchByteTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchByteTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchByteTest.cpp Wed Oct 17 06:48:53 2012
@@ -18,44 +18,63 @@
#include <gtest/gtest.h>
#include "common/EtchByte.h"
+#include "common/EtchString.h"
// Tests positive input.
TEST(EtchByteTest, Constructor_Default){
EtchByte* i1 = new EtchByte();
EXPECT_TRUE(i1->getObjectType()->equals(EtchByte::TYPE()));
- EXPECT_TRUE(i1->get() == 0);
+ EXPECT_EQ(0, i1->get());
delete i1;
}
TEST(EtchByteTest, Constructor_Byte){
EtchByte* i1 = new EtchByte(42);
EXPECT_TRUE(i1->getObjectType()->equals(EtchByte::TYPE()));
- EXPECT_TRUE(i1->get() == 42);
+ EXPECT_EQ(42, i1->get());
delete i1;
}
TEST(EtchByteTest, set){
EtchByte* i1 = new EtchByte();
i1->set(43);
- EXPECT_TRUE(i1->get() == 43);
+ EXPECT_EQ(43, i1->get());
delete i1;
}
TEST(EtchByteTest, get){
EtchByte* i1 = new EtchByte();
- EXPECT_TRUE(i1->get() == 0);
+ EXPECT_EQ(0, i1->get());
i1->set(41);
- EXPECT_TRUE(i1->get() == 41);
+ EXPECT_EQ(41, i1->get());
delete i1;
}
TEST(EtchByteTest, equals){
EtchByte i1, i2;
- EXPECT_TRUE(i1.get() == false);
+ EXPECT_FALSE(i1.get());
i1.set(40);
i2.set(41);
- EXPECT_TRUE(i1.equals(&i2) == false);
+ EXPECT_FALSE(i1.equals(&i2));
i2.set(40);
- EXPECT_TRUE(i1.equals(&i2) == true);
+ EXPECT_TRUE(i1.equals(&i2));
}
+
+
+TEST(EtchByteTest, copyTest) {
+ EtchByte o1(2);
+ EtchByte o2(o1);
+ EtchByte o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchByteTest, isInstanceOf) {
+ EtchObject* o1 = new EtchByte(2);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchByte::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
+
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchDateTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchDateTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchDateTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchDateTest.cpp Wed Oct 17 06:48:53 2012
@@ -18,6 +18,7 @@
#include <gtest/gtest.h>
#include "common/EtchDate.h"
+#include "common/EtchString.h"
TEST(EtchDateTest, Constructor) {
EtchDate* i1 = new EtchDate();
@@ -49,3 +50,22 @@ TEST(EtchDateTest, equals) {
i2.set(_time);
EXPECT_TRUE(i1.equals(&i2) == true);
}
+
+
+TEST(EtchDateTest, copyTest) {
+ EtchDate o1;
+ time_t _time = 1234567;
+ o1.set(_time);
+ EtchDate o2(o1);
+ EtchDate o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchDateTest, isInstanceOf) {
+ EtchObject* o1 = new EtchDate();
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchDate::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchDoubleTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchDoubleTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchDoubleTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchDoubleTest.cpp Wed Oct 17 06:48:53 2012
@@ -18,44 +18,61 @@
#include <gtest/gtest.h>
#include "common/EtchDouble.h"
+#include "common/EtchString.h"
// Tests positive input.
TEST(EtchDoubleTest, Constructor_Default){
EtchDouble* i1 = new EtchDouble();
EXPECT_TRUE(i1->getObjectType()->equals(EtchDouble::TYPE()));
- EXPECT_TRUE(i1->get() == 0.0L);
+ EXPECT_EQ(0.0L, i1->get());
delete i1;
}
TEST(EtchDoubleTest, Constructor_Double){
EtchDouble* i1 = new EtchDouble(42.0L);
EXPECT_TRUE(i1->getObjectType()->equals(EtchDouble::TYPE()));
- EXPECT_TRUE(i1->get() == 42.0L);
+ EXPECT_EQ(42.0L, i1->get());
delete i1;
}
TEST(EtchDoubleTest, set){
EtchDouble* i1 = new EtchDouble();
i1->set(43.0L);
- EXPECT_EQ(i1->get(), 43.0L);
+ EXPECT_EQ(43.0L, i1->get());
delete i1;
}
TEST(EtchDoubleTest, get){
EtchDouble* i1 = new EtchDouble();
- EXPECT_TRUE(i1->get() == 0.0L);
+ EXPECT_EQ(0.0L, i1->get());
i1->set(41.0L);
- EXPECT_TRUE(i1->get() == 41.0L);
+ EXPECT_EQ(41.0L, i1->get());
delete i1;
}
TEST(EtchDoubleTest, equals){
EtchDouble i1, i2;
- EXPECT_TRUE(i1.get() == 0.0);
+ EXPECT_EQ(0.0L, i1.get());
i1.set(40);
i2.set(41);
- EXPECT_TRUE(i1.equals(&i2) == false);
+ EXPECT_FALSE(i1.equals(&i2));
i2.set(40);
- EXPECT_TRUE(i1.equals(&i2) == true);
+ EXPECT_TRUE(i1.equals(&i2));
+}
+
+TEST(EtchDoubleTest, copyTest) {
+ EtchDouble o1(2.123);
+ EtchDouble o2(o1);
+ EtchDouble o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchDoubleTest, isInstanceOf) {
+ EtchObject* o1 = new EtchDouble(2.123);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchDouble::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchExceptionTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchExceptionTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchExceptionTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchExceptionTest.cpp Wed Oct 17 06:48:53 2012
@@ -18,6 +18,7 @@
#include <gtest/gtest.h>
#include "common/EtchException.h"
+#include "common/EtchString.h"
TEST(EtchExceptionTest, createTest) {
EtchString str("test message");
@@ -59,3 +60,19 @@ TEST(EtchExceptionTest, equalsTest) {
delete test2;
delete test3;
}
+
+TEST(EtchExceptionTest, copyTest) {
+ EtchException o1(EtchString("Message"), ETCH_ERROR, EtchException::EXCPTYPE_BUILTIN);
+ EtchException o2(o1);
+ EtchException o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchExceptionTest, isInstanceOf) {
+ EtchObject* o1 = new EtchException(EtchString("Message"), ETCH_ERROR, EtchException::EXCPTYPE_BUILTIN);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchException::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchFloatTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchFloatTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchFloatTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchFloatTest.cpp Wed Oct 17 06:48:53 2012
@@ -18,44 +18,61 @@
#include <gtest/gtest.h>
#include "common/EtchFloat.h"
+#include "common/EtchString.h"
// Tests positive input.
TEST(EtchFloatTest, Constructor_Default){
EtchFloat* i1 = new EtchFloat();
EXPECT_TRUE(i1->getObjectType()->equals(EtchFloat::TYPE()));
- EXPECT_TRUE(i1->get() == 0.0f);
+ EXPECT_EQ(0.0f, i1->get());
delete i1;
}
TEST(EtchFloatTest, Constructor_Float){
EtchFloat* i1 = new EtchFloat(42.0f);
EXPECT_TRUE(i1->getObjectType()->equals(EtchFloat::TYPE()));
- EXPECT_TRUE(i1->get() == 42.0f);
+ EXPECT_EQ(42.0f, i1->get());
delete i1;
}
TEST(EtchFloatTest, set){
EtchFloat* i1 = new EtchFloat();
i1->set(43.33f);
- EXPECT_TRUE(i1->get() == 43.33f);
+ EXPECT_EQ(43.33f, i1->get());
delete i1;
}
TEST(EtchFloatTest, get){
EtchFloat* i1 = new EtchFloat();
- EXPECT_TRUE(i1->get() == 0.0f);
+ EXPECT_EQ(0.0f, i1->get());
i1->set(41.0f);
- EXPECT_TRUE(i1->get() == 41.0f);
+ EXPECT_EQ(41.0f, i1->get());
delete i1;
}
TEST(EtchFloatTest, equals){
EtchFloat i1, i2;
- EXPECT_TRUE(i1.get() == 0.0f);
+ EXPECT_EQ(0.0f, i1.get());
i1.set(40);
i2.set(41);
- EXPECT_TRUE(i1.equals(&i2) == false);
+ EXPECT_FALSE(i1.equals(&i2));
i2.set(40);
- EXPECT_TRUE(i1.equals(&i2) == true);
+ EXPECT_TRUE(i1.equals(&i2));
+}
+
+TEST(EtchFloatTest, copyTest) {
+ EtchFloat o1(2.123);
+ EtchFloat o2(o1);
+ EtchFloat o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchFloatTest, isInstanceOf) {
+ EtchObject* o1 = new EtchFloat(2.123);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchFloat::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchInt32Test.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchInt32Test.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchInt32Test.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchInt32Test.cpp Wed Oct 17 06:48:53 2012
@@ -18,6 +18,7 @@
#include <gtest/gtest.h>
#include "common/EtchInt32.h"
+#include "common/EtchString.h"
// Tests positive input.
@@ -31,33 +32,33 @@ TEST(EtchInt32Test, Constructor_Default)
TEST(EtchInt32Test, Constructor_Int){
EtchInt32* i1 = new EtchInt32(42);
EXPECT_TRUE(i1->getObjectType()->equals(EtchInt32::TYPE()));
- EXPECT_TRUE(i1->get() == 42);
+ EXPECT_EQ(42, i1->get());
delete i1;
}
TEST(EtchInt32Test, set){
EtchInt32* i1 = new EtchInt32();
i1->set(42);
- EXPECT_TRUE(i1->get() == 42);
+ EXPECT_EQ(42, i1->get());
delete i1;
}
TEST(EtchInt32Test, get){
EtchInt32* i1 = new EtchInt32();
- EXPECT_TRUE(i1->get() == 0);
+ EXPECT_EQ(0, i1->get());
i1->set(42);
- EXPECT_TRUE(i1->get() == 42);
+ EXPECT_EQ(42, i1->get());
delete i1;
}
TEST(EtchInt32Test, equals){
EtchInt32 i1, i2;
- EXPECT_TRUE(i1.get() == false);
+ EXPECT_FALSE(i1.get());
i1.set(40);
i2.set(41);
- EXPECT_TRUE(i1.equals(&i2) == false);
+ EXPECT_FALSE(i1.equals(&i2));
i2.set(40);
- EXPECT_TRUE(i1.equals(&i2) == true);
+ EXPECT_TRUE(i1.equals(&i2));
}
TEST(EtchInt32Test, operator_equal){
@@ -127,3 +128,19 @@ TEST(EtchInt32Test, operator_unequal){
++b;
EXPECT_FALSE(a != b);
}
+
+TEST(EtchInt32Test, copyTest) {
+ EtchInt32 o1(2);
+ EtchInt32 o2(o1);
+ EtchInt32 o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchInt32Test, isInstanceOf) {
+ EtchObject* o1 = new EtchInt32(2);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchInt32::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchListTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchListTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchListTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchListTest.cpp Wed Oct 17 06:48:53 2012
@@ -19,6 +19,7 @@
#include <gtest/gtest.h>
#include "common/EtchInt32.h"
#include "common/EtchList.h"
+#include "common/EtchString.h"
TEST(EtchList, Constructor_Default) {
//create an empty linked list
@@ -369,3 +370,23 @@ TEST(EtchListIterator, next) {
}
+TEST(EtchList, copyTest) {
+ EtchList<EtchInt32> o1;
+ o1.add(EtchInt32(2));
+ o1.add(EtchInt32(3));
+ EtchList<EtchInt32> o2(o1);
+ EtchList<EtchInt32> o3 = o2;
+
+ EXPECT_EQ(o1.size(), o2.size());
+ EXPECT_EQ(o2.size(), o3.size());
+}
+
+TEST(EtchList, isInstanceOf) {
+ EtchObject* o1 = new EtchList<EtchInt32>();
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchList<EtchInt32>::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
+
+
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchLongTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchLongTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchLongTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchLongTest.cpp Wed Oct 17 06:48:53 2012
@@ -18,27 +18,28 @@
#include <gtest/gtest.h>
#include "common/EtchLong.h"
+#include "common/EtchString.h"
// Tests positive input.
TEST(EtchLongTest, Constructor_Default){
EtchLong* i1 = new EtchLong();
EXPECT_TRUE(i1->getObjectType()->equals(EtchLong::TYPE()));
- EXPECT_TRUE(i1->get() == 0);
+ EXPECT_EQ(0, i1->get());
delete i1;
}
TEST(EtchLongTest, Constructor_Long){
EtchLong* i1 = new EtchLong(42);
EXPECT_TRUE(i1->getObjectType()->equals(EtchLong::TYPE()));
- EXPECT_TRUE(i1->get() == 42);
+ EXPECT_EQ(42, i1->get());
delete i1;
}
TEST(EtchLongTest, set){
EtchLong* i1 = new EtchLong();
i1->set(43000000);
- EXPECT_TRUE(i1->get() == 43000000);
+ EXPECT_EQ(43000000, i1->get());
delete i1;
}
@@ -52,10 +53,26 @@ TEST(EtchLongTest, get){
TEST(EtchLongTest, equals){
EtchLong i1, i2;
- EXPECT_TRUE(i1.get() == false);
+ EXPECT_FALSE(i1.get());
i1.set(40);
i2.set(41);
- EXPECT_TRUE(i1.equals(&i2) == false);
+ EXPECT_FALSE(i1.equals(&i2));
i2.set(40);
- EXPECT_TRUE(i1.equals(&i2) == true);
+ EXPECT_TRUE(i1.equals(&i2));
+}
+
+TEST(EtchLongTest, copyTest) {
+ EtchLong o1(2);
+ EtchLong o2(o1);
+ EtchLong o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchLongTest, isInstanceOf) {
+ EtchObject* o1 = new EtchLong(2);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchLong::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchObjectTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchObjectTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchObjectTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchObjectTest.cpp Wed Oct 17 06:48:53 2012
@@ -71,9 +71,9 @@ TEST(EtchObjectTest, getTypeTrait) {
TEST(EtchObjectTest, isInstanceOf) {
EtchObjectMy1Object* o1 = new EtchObjectMy1Object();
- EXPECT_EQ(true, o1->isInstanceOf(EtchObjectMy1Object::TYPE()));
- EXPECT_EQ(true, o1->isInstanceOf(EtchObject::TYPE()));
- EXPECT_EQ(false, o1->isInstanceOf(EtchObjectMy2Object::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchObjectMy1Object::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchObjectMy2Object::TYPE()));
delete o1;
-}
\ No newline at end of file
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchRuntimeExceptionTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchRuntimeExceptionTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchRuntimeExceptionTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchRuntimeExceptionTest.cpp Wed Oct 17 06:48:53 2012
@@ -59,3 +59,20 @@ TEST(EtchRuntimeExceptionTest, equalsTes
delete test2;
delete test3;
}
+
+TEST(EtchRuntimeExceptionTest, copyTest) {
+ EtchRuntimeException o1(EtchString("Message"), ETCH_ERROR);
+ EtchRuntimeException o2(o1);
+ EtchRuntimeException o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchRuntimeExceptionTest, isInstanceOf) {
+ EtchObject* o1 = new EtchRuntimeException(EtchString("Message"), ETCH_ERROR);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchException::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchRuntimeException::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchShortTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchShortTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchShortTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchShortTest.cpp Wed Oct 17 06:48:53 2012
@@ -18,44 +18,61 @@
#include <gtest/gtest.h>
#include "common/EtchShort.h"
+#include "common/EtchString.h"
// Tests positive input.
TEST(EtchShortTest, Constructor_Default){
EtchShort* i1 = new EtchShort();
EXPECT_TRUE(i1->getObjectType()->equals(EtchShort::TYPE()));
- EXPECT_TRUE(i1->get() == 0);
+ EXPECT_EQ(0, i1->get());
delete i1;
}
TEST(EtchShortTest, Constructor_Short){
EtchShort* i1 = new EtchShort(42);
EXPECT_TRUE(i1->getObjectType()->equals(EtchShort::TYPE()));
- EXPECT_TRUE(i1->get() == 42);
+ EXPECT_EQ(42, i1->get());
delete i1;
}
TEST(EtchShortTest, set){
EtchShort* i1 = new EtchShort();
i1->set(43);
- EXPECT_TRUE(i1->get() == 43);
+ EXPECT_EQ(43, i1->get());
delete i1;
}
TEST(EtchShortTest, get){
EtchShort* i1 = new EtchShort();
- EXPECT_TRUE(i1->get() == 0);
+ EXPECT_EQ(0, i1->get());
i1->set(41);
- EXPECT_TRUE(i1->get() == 41);
+ EXPECT_EQ(41, i1->get());
delete i1;
}
TEST(EtchShortTest, equals){
EtchShort i1, i2;
- EXPECT_TRUE(i1.get() == false);
+ EXPECT_FALSE(i1.get());
i1.set(40);
i2.set(41);
- EXPECT_TRUE(i1.equals(&i2) == false);
+ EXPECT_FALSE(i1.equals(&i2));
i2.set(40);
- EXPECT_TRUE(i1.equals(&i2) == true);
+ EXPECT_TRUE(i1.equals(&i2));
+}
+
+TEST(EtchShortTest, copyTest) {
+ EtchShort o1(2);
+ EtchShort o2(o1);
+ EtchShort o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchShortTest, isInstanceOf) {
+ EtchObject* o1 = new EtchShort(2);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchShort::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchStringTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchStringTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchStringTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchStringTest.cpp Wed Oct 17 06:48:53 2012
@@ -18,13 +18,14 @@
#include <gtest/gtest.h>
#include "common/EtchString.h"
+#include "common/EtchInt32.h"
// Tests positive input.
TEST(EtchStringTest, Constructor_Default) {
EtchString* s1 = new EtchString();
EXPECT_TRUE(s1->getObjectType()->equals(EtchString::TYPE()));
- EXPECT_TRUE(s1->c_str() == NULL);
+ EXPECT_EQ(NULL, s1->c_str());
delete s1;
}
@@ -198,4 +199,19 @@ TEST(EtchStringTest, UTF8_substringTest)
status_t result;
result = str1.substring(0, 5, &tmp);
EXPECT_TRUE(result == ETCH_EUNIMPL);
-}
\ No newline at end of file
+}
+TEST(EtchStringTest, copyTest) {
+ EtchString o1("2");
+ EtchString o2(o1);
+ EtchString o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST(EtchStringTest, isInstanceOf) {
+ EtchObject* o1 = new EtchString("2");
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchString::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchInt32::TYPE()));
+ delete o1;
+}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchBinaryTaggedDataInputOutputTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchBinaryTaggedDataInputOutputTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchBinaryTaggedDataInputOutputTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchBinaryTaggedDataInputOutputTest.cpp Wed Oct 17 06:48:53 2012
@@ -208,7 +208,7 @@ public:
}
static void bytes2msg(capu::int8_t* buf, capu::uint32_t length, capu::SmartPointer<EtchMessage> &msg, MyValueFactory &vf) {
- return bytes2msg(buf, length, msg, LEVEL_FULL, vf);
+ bytes2msg(buf, length, msg, LEVEL_FULL, vf);
}
static void bytes2msg(capu::int8_t* buf, capu::uint32_t length, capu::SmartPointer<EtchMessage> &msg, EtchLevel level, MyValueFactory &vf) {
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDefaultValueFactoryTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDefaultValueFactoryTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDefaultValueFactoryTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDefaultValueFactoryTest.cpp Wed Oct 17 06:48:53 2012
@@ -195,7 +195,7 @@ TEST_F(EtchDefaultValueFactoryTest, expo
EtchStructValue* sv_unknown;
//TRY UNKNOWN VALUE
- capu::SmartPointer<EtchObject> unknown = new EtchObject(EtchObject::TYPE());
+ capu::SmartPointer<EtchObject> unknown = new EtchObject();
EXPECT_TRUE(test->exportCustomValue(unknown, sv_unknown) == ETCH_EINVAL);
//clear the added types
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchHashTableSerializerTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchHashTableSerializerTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchHashTableSerializerTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchHashTableSerializerTest.cpp Wed Oct 17 06:48:53 2012
@@ -92,7 +92,7 @@ TEST_F(EtchHashTableSerializerTest, init
EtchClass2TypeMap* c2type = new EtchClass2TypeMap();
EtchString typeName("type1");
EtchType* type = new EtchType(10, typeName);
- EtchType* result;
+ EtchType* result = 0;
EXPECT_TRUE(EtchHashTableSerializer::Init(type, c2type) == ETCH_OK);
c2type->get(EtchNativeArray<capu::SmartPointer<EtchObject> >::TYPE(), &result);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchStructValueTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchStructValueTest.cpp?rev=1399111&r1=1399110&r2=1399111&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchStructValueTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchStructValueTest.cpp Wed Oct 17 06:48:53 2012
@@ -498,3 +498,15 @@ TEST_F(EtchStructValueTest, removeTest)
delete factory;
}
+TEST_F(EtchStructValueTest, isInstanceOf) {
+ EtchString typeName("comp");
+ EtchType* comp = new EtchType(90, typeName);
+ EtchValueFactory* factory = new MockValueFactory_FULL();
+ EtchObject* o1 = new EtchStructValue(comp, factory);
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchStructValue::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchInt32::TYPE()));
+ delete o1;
+ delete comp;
+ delete factory;
+}
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=1399111&r1=1399110&r2=1399111&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:48:53 2012
@@ -164,3 +164,20 @@ TEST_F(EtchTypeTest, lockTest) {
EXPECT_TRUE(t.getSuperType() == NULL);
delete t2;
}
+
+TEST_F(EtchTypeTest, copyTest) {
+ EtchType o1(EtchString("test"));
+ EtchType o2(o1);
+ EtchType o3 = o2;
+ EXPECT_TRUE(o1.equals(&o2));
+ EXPECT_TRUE(o2.equals(&o3));
+}
+
+TEST_F(EtchTypeTest, isInstanceOf) {
+ EtchObject* o1 = new EtchType(EtchString("test"));
+ EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
+ EXPECT_TRUE(o1->isInstanceOf(EtchType::TYPE()));
+ EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));
+ delete o1;
+}
+
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=1399111&r1=1399110&r2=1399111&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:48:53 2012
@@ -26,8 +26,8 @@
class MockGeneratedClass : public EtchObject {
public:
- MockGeneratedClass()
- : EtchObject(MockGeneratedClass::TYPE()) {
+ MockGeneratedClass() {
+ addObjectType(MockGeneratedClass::TYPE());
}
virtual ~MockGeneratedClass() {
@@ -144,7 +144,7 @@ TEST_F(EtchValidatorCustomTest, validate
capu::SmartPointer<EtchObject> integer2 = new EtchInt32(5);
capu::SmartPointer<EtchObject> integer3 = new EtchInt32(127);
capu::SmartPointer<EtchObject> byte2 = new EtchByte(3);
-
+
capu::SmartPointer<EtchValidator> ptr = NULL;
capu::SmartPointer<EtchObject> generatedClass = new MockGeneratedClass();
@@ -165,7 +165,7 @@ TEST_F(EtchValidatorCustomTest, validate
TEST_F(EtchValidatorCustomTest, elementValidatorTest) {
status_t status;
capu::SmartPointer<EtchValidator> ptr = NULL;
-
+
status = EtchValidatorCustom::Get(1, MockGeneratedClass::TYPE(), true, ptr);
EXPECT_EQ(ETCH_OK, status);
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=1399111&r1=1399110&r2=1399111&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:48:53 2012
@@ -136,7 +136,7 @@ TEST_F(EtchMessageTest, getTypeTest) {
//Create Value Factory
EtchValueFactory* factory = new MockValueFactory7();
-
+
//create message
EtchMessage *sv = new EtchMessage(comp, factory);
EXPECT_TRUE(sv->getType()->equals(comp));