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/06/01 15:06:16 UTC
svn commit: r1345149 [2/2] - in /incubator/etch/trunk/binding-cpp/runtime:
include/serialization/ src/main/serialization/ src/test/serialization/
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=1345149&r1=1345148&r2=1345149&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 Fri Jun 1 13:06:15 2012
@@ -41,32 +41,32 @@ TEST(EtchValidatorLongTest, createTest)
}
TEST(EtchValidatorLongTest, validateTest) {
- EtchObject* byte = NULL;
+ capu::SmartPointer<EtchObject> byte = NULL;
- EtchObject* integer = new EtchInt32(capu::NumericLimitMin<capu::int32_t>());
- EtchObject* integer2 = new EtchInt32(0);
- EtchObject* integer3 = new EtchInt32(capu::NumericLimitMax<capu::int32_t>());
- EtchObject* integer4 = new EtchInt32(897);
-
- EtchObject* longInteger = new EtchLong(capu::NumericLimitMin<capu::int32_t>());
- EtchObject* longInteger2 = new EtchLong(0);
- EtchObject* longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int32_t>());
- EtchObject* longInteger4 = new EtchLong(897);
+ capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int32_t>());
+ capu::SmartPointer<EtchObject> integer2 = new EtchInt32(0);
+ capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimitMax<capu::int32_t>());
+ capu::SmartPointer<EtchObject> integer4 = new EtchInt32(897);
+
+ capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimitMin<capu::int32_t>());
+ capu::SmartPointer<EtchObject> longInteger2 = new EtchLong(0);
+ capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int32_t>());
+ capu::SmartPointer<EtchObject> longInteger4 = new EtchLong(897);
//exceed limits of integer
- EtchObject* longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int32_t>() + (capu::int64_t)2);
+ capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int32_t>() + (capu::int64_t)2);
- EtchObject* shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
- EtchObject* shortInteger2 = new EtchShort(0);
- EtchObject* shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
- EtchObject* shortInteger4 = new EtchShort();
+ capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
+ capu::SmartPointer<EtchObject> shortInteger2 = new EtchShort(0);
+ capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
+ capu::SmartPointer<EtchObject> shortInteger4 = new EtchShort();
//incompatible type
- EtchObject* str = new EtchString();
+ capu::SmartPointer<EtchObject> str = new EtchString();
- EtchObject* byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
- EtchObject* byte2 = new EtchByte(0);
- EtchObject* byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
- EtchObject* byte4 = new EtchByte(32);
+ capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
+ capu::SmartPointer<EtchObject> byte2 = new EtchByte(0);
+ 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((capu::smartpointer_cast<EtchTypeValidator>(ptr))->getNDims() == 0);
@@ -89,57 +89,26 @@ TEST(EtchValidatorLongTest, validateTest
EXPECT_TRUE(ptr->validate(integer4));
EXPECT_TRUE(ptr->validate(longInteger4));
EXPECT_TRUE(ptr->validate(shortInteger4));
-
- delete integer;
- delete integer2;
- delete integer3;
- delete integer4;
-
- delete longInteger;
- delete longInteger2;
- delete longInteger3;
- delete longInteger4;
- delete longInteger5;
-
- delete shortInteger;
- delete shortInteger2;
- delete shortInteger3;
- delete shortInteger4;
-
- delete str;
- delete byte1;
- delete byte2;
- delete byte3;
- delete byte4;
-
}
TEST(EtchValidatorLongTest, validateValueTest) {
- EtchObject* byte = NULL;
- EtchObject* result;
- EtchObject* integer = new EtchInt32(-128);
- EtchObject* integer2 = new EtchInt32(5);
- EtchObject* integer3 = new EtchInt32(127);
- EtchObject* byte2 = new EtchByte(3);
+ capu::SmartPointer<EtchObject> byte = NULL;
+ capu::SmartPointer<EtchObject> result;
+ capu::SmartPointer<EtchObject> integer = new EtchInt32(-128);
+ 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;
EXPECT_TRUE(EtchValidatorLong::Get(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() == ((EtchInt32*) integer)->get());
- delete result;
+ EXPECT_TRUE(((EtchLong*) result.get())->get() == ((EtchInt32*) integer.get())->get());
EXPECT_TRUE(ptr->validateValue(integer2, result) == ETCH_OK);
- EXPECT_TRUE(((EtchLong*) result)->get() == ((EtchInt32*) integer2)->get());
- delete result;
+ EXPECT_TRUE(((EtchLong*) result.get())->get() == ((EtchInt32*) integer2.get())->get());
EXPECT_TRUE(ptr->validateValue(integer3, result) == ETCH_OK);
- EXPECT_TRUE(((EtchLong*) result)->get() == ((EtchInt32*) integer3)->get());
- delete result;
+ EXPECT_TRUE(((EtchLong*) result.get())->get() == ((EtchInt32*) integer3.get())->get());
EXPECT_TRUE(ptr->validateValue(byte2, result) == ETCH_OK);
- EXPECT_TRUE(((EtchLong*) result)->get() == ((EtchByte*) byte2)->get());
- delete result;
- delete integer;
- delete integer2;
- delete integer3;
- delete byte2;
+ EXPECT_TRUE(((EtchLong*) result.get())->get() == ((EtchByte*) byte2.get())->get());
}
TEST(EtchValidatorLongTest, elementValidatorTest) {
@@ -148,30 +117,30 @@ TEST(EtchValidatorLongTest, elementValid
capu::SmartPointer<EtchValidator> elementValidator;
ptr->getElementValidator(elementValidator);
- EtchObject* integer = new EtchInt32(capu::NumericLimitMin<capu::int32_t>());
- EtchObject* integer2 = new EtchInt32(0);
- EtchObject* integer3 = new EtchInt32(capu::NumericLimitMax<capu::int32_t>());
- EtchObject* integer4 = new EtchInt32(897);
-
- EtchObject* longInteger = new EtchLong(capu::NumericLimitMin<capu::int32_t>());
- EtchObject* longInteger2 = new EtchLong(0);
- EtchObject* longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int32_t>());
- EtchObject* longInteger4 = new EtchLong(897);
+ capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int32_t>());
+ capu::SmartPointer<EtchObject> integer2 = new EtchInt32(0);
+ capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimitMax<capu::int32_t>());
+ capu::SmartPointer<EtchObject> integer4 = new EtchInt32(897);
+
+ capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimitMin<capu::int32_t>());
+ capu::SmartPointer<EtchObject> longInteger2 = new EtchLong(0);
+ capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int32_t>());
+ capu::SmartPointer<EtchObject> longInteger4 = new EtchLong(897);
//exceed limits of integer
- EtchObject* longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int32_t>() + (capu::int64_t)2);
+ capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int32_t>() + (capu::int64_t)2);
- EtchObject* shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
- EtchObject* shortInteger2 = new EtchShort(0);
- EtchObject* shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
- EtchObject* shortInteger4 = new EtchShort();
+ capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
+ capu::SmartPointer<EtchObject> shortInteger2 = new EtchShort(0);
+ capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
+ capu::SmartPointer<EtchObject> shortInteger4 = new EtchShort();
//incompatible type
- EtchObject* str = new EtchString();
+ capu::SmartPointer<EtchObject> str = new EtchString();
- EtchObject* byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
- EtchObject* byte2 = new EtchByte(0);
- EtchObject* byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
- EtchObject* byte4 = new EtchByte(32);
+ capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
+ capu::SmartPointer<EtchObject> byte2 = new EtchByte(0);
+ capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
+ capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
EXPECT_FALSE(elementValidator->validate(str));
EXPECT_TRUE(elementValidator->validate(longInteger5));
@@ -191,28 +160,6 @@ TEST(EtchValidatorLongTest, elementValid
EXPECT_TRUE(elementValidator->validate(integer4));
EXPECT_TRUE(elementValidator->validate(longInteger4));
EXPECT_TRUE(elementValidator->validate(shortInteger4));
-
- delete integer;
- delete integer2;
- delete integer3;
- delete integer4;
-
- delete longInteger;
- delete longInteger2;
- delete longInteger3;
- delete longInteger4;
- delete longInteger5;
-
- delete shortInteger;
- delete shortInteger2;
- delete shortInteger3;
- delete shortInteger4;
-
- delete str;
- delete byte1;
- delete byte2;
- delete byte3;
- delete byte4;
}
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=1345149&r1=1345148&r2=1345149&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 Fri Jun 1 13:06:15 2012
@@ -42,49 +42,47 @@ TEST(EtchValidatorObjectTest, createTest
}
TEST(EtchValidatorObjectTest, validateTest) {
- EtchObject* boolean = NULL;
- EtchObject* integer = new EtchInt32(4);
- EtchObject* boolean2 = new EtchBool(false);
+ capu::SmartPointer<EtchObject> boolean = NULL;
+ 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((capu::smartpointer_cast<EtchTypeValidator>(ptr))->getNDims() == 0);
EXPECT_FALSE(ptr->validate(boolean));
EXPECT_TRUE(ptr->validate(integer));
EXPECT_TRUE(ptr->validate(boolean2));
- delete integer;
- delete boolean2;
}
TEST(EtchValidatorObjectTest, validateValueTest) {
- EtchObject* byte = NULL;
- EtchObject* result = NULL;
- EtchObject* integer = new EtchInt32(capu::NumericLimitMin<capu::int16_t > ());
- EtchObject* integer2 = new EtchInt32(0);
- EtchObject* integer3 = new EtchInt32(capu::NumericLimitMax<capu::int16_t > ());
- EtchObject* integer4 = new EtchInt32(897);
+ capu::SmartPointer<EtchObject> byte = NULL;
+ capu::SmartPointer<EtchObject> result = NULL;
+ capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int16_t > ());
+ capu::SmartPointer<EtchObject> integer2 = new EtchInt32(0);
+ capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimitMax<capu::int16_t > ());
+ capu::SmartPointer<EtchObject> integer4 = new EtchInt32(897);
//exceed limits of integer
- EtchObject* integer5 = new EtchInt32(capu::NumericLimitMax<capu::int16_t > () + 2);
+ capu::SmartPointer<EtchObject> integer5 = new EtchInt32(capu::NumericLimitMax<capu::int16_t > () + 2);
- EtchObject* longInteger = new EtchLong(capu::NumericLimitMin<capu::int16_t > ());
- EtchObject* longInteger2 = new EtchLong(0);
- EtchObject* longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int16_t > ());
- EtchObject* longInteger4 = new EtchLong(897);
+ capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimitMin<capu::int16_t > ());
+ capu::SmartPointer<EtchObject> longInteger2 = new EtchLong(0);
+ capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int16_t > ());
+ capu::SmartPointer<EtchObject> longInteger4 = new EtchLong(897);
//exceed limits of integer
- EtchObject* longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int16_t > () + (capu::int64_t)2);
+ capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int16_t > () + (capu::int64_t)2);
- EtchObject* shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t > ());
- EtchObject* shortInteger2 = new EtchShort(0);
- EtchObject* shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t > ());
- EtchObject* shortInteger4 = new EtchShort();
+ capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t > ());
+ capu::SmartPointer<EtchObject> shortInteger2 = new EtchShort(0);
+ capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t > ());
+ capu::SmartPointer<EtchObject> shortInteger4 = new EtchShort();
//incompatible type
- EtchObject* str = new EtchString();
+ capu::SmartPointer<EtchObject> str = new EtchString();
- EtchObject* byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t > ());
- EtchObject* byte2 = new EtchByte(0);
- EtchObject* byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t > ());
- EtchObject* byte4 = new EtchByte(32);
+ capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t > ());
+ capu::SmartPointer<EtchObject> byte2 = new EtchByte(0);
+ 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(EtchValidatorObject::Get(0, ptr) == ETCH_OK);
@@ -108,28 +106,6 @@ TEST(EtchValidatorObjectTest, validateVa
EXPECT_TRUE(ptr->validateValue(integer4, result) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(longInteger4, result) == ETCH_OK);
EXPECT_TRUE(ptr->validateValue(shortInteger4, result) == ETCH_OK);
-
- delete integer;
- delete integer2;
- delete integer3;
- delete integer4;
- delete integer5;
- delete longInteger;
- delete longInteger2;
- delete longInteger3;
- delete longInteger4;
- delete longInteger5;
-
- delete shortInteger;
- delete shortInteger2;
- delete shortInteger3;
- delete shortInteger4;
-
- delete str;
- delete byte1;
- delete byte2;
- delete byte3;
- delete byte4;
}
TEST(EtchValidatorObjectTest, elementValidatorTest) {
@@ -139,33 +115,33 @@ TEST(EtchValidatorObjectTest, elementVal
ptr->getElementValidator(elementValidator);
- EtchObject* integer = new EtchInt32(capu::NumericLimitMin<capu::int16_t > ());
- EtchObject* integer2 = new EtchInt32(0);
- EtchObject* integer3 = new EtchInt32(capu::NumericLimitMax<capu::int16_t > ());
- EtchObject* integer4 = new EtchInt32(897);
+ capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int16_t > ());
+ capu::SmartPointer<EtchObject> integer2 = new EtchInt32(0);
+ capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimitMax<capu::int16_t > ());
+ capu::SmartPointer<EtchObject> integer4 = new EtchInt32(897);
//exceed limits of integer
- EtchObject* integer5 = new EtchInt32(capu::NumericLimitMax<capu::int16_t > () + 2);
+ capu::SmartPointer<EtchObject> integer5 = new EtchInt32(capu::NumericLimitMax<capu::int16_t > () + 2);
- EtchObject* longInteger = new EtchLong(capu::NumericLimitMin<capu::int16_t > ());
- EtchObject* longInteger2 = new EtchLong(0);
- EtchObject* longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int16_t > ());
- EtchObject* longInteger4 = new EtchLong(897);
+ capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimitMin<capu::int16_t > ());
+ capu::SmartPointer<EtchObject> longInteger2 = new EtchLong(0);
+ capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int16_t > ());
+ capu::SmartPointer<EtchObject> longInteger4 = new EtchLong(897);
//exceed limits of integer
- EtchObject* longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int16_t > () + (capu::int64_t)2);
+ capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int16_t > () + (capu::int64_t)2);
- EtchObject* shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t > ());
- EtchObject* shortInteger2 = new EtchShort(0);
- EtchObject* shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t > ());
- EtchObject* shortInteger4 = new EtchShort();
+ capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t > ());
+ capu::SmartPointer<EtchObject> shortInteger2 = new EtchShort(0);
+ capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t > ());
+ capu::SmartPointer<EtchObject> shortInteger4 = new EtchShort();
//incompatible type
- EtchObject* str = new EtchString();
+ capu::SmartPointer<EtchObject> str = new EtchString();
- EtchObject* byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t > ());
- EtchObject* byte2 = new EtchByte(0);
- EtchObject* byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t > ());
- EtchObject* byte4 = new EtchByte(32);
+ capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t > ());
+ capu::SmartPointer<EtchObject> byte2 = new EtchByte(0);
+ capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t > ());
+ capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
EXPECT_TRUE(elementValidator->validate(str));
EXPECT_TRUE(elementValidator->validate(longInteger5));
@@ -186,26 +162,4 @@ TEST(EtchValidatorObjectTest, elementVal
EXPECT_TRUE(elementValidator->validate(integer4));
EXPECT_TRUE(elementValidator->validate(longInteger4));
EXPECT_TRUE(elementValidator->validate(shortInteger4));
-
- delete integer;
- delete integer2;
- delete integer3;
- delete integer4;
- delete integer5;
- delete longInteger;
- delete longInteger2;
- delete longInteger3;
- delete longInteger4;
- delete longInteger5;
-
- delete shortInteger;
- delete shortInteger2;
- delete shortInteger3;
- delete shortInteger4;
-
- delete str;
- delete byte1;
- delete byte2;
- delete byte3;
- delete byte4;
}
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=1345149&r1=1345148&r2=1345149&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 Fri Jun 1 13:06:15 2012
@@ -31,30 +31,27 @@ TEST(EtchValidatorRuntimeExceptionTest,
TEST(EtchValidatorRuntimeExceptionTest, validateTest) {
EtchString excepmess("test");
- EtchObject* boolean = NULL;
- EtchObject* integer = new EtchInt32(4);
- EtchObject* exc = new EtchRuntimeException(excepmess, ETCH_ERROR);
+ capu::SmartPointer<EtchObject> boolean = NULL;
+ 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_FALSE(ptr->validate(boolean));
EXPECT_FALSE(ptr->validate(integer));
EXPECT_TRUE(ptr->validate(exc));
- delete integer;
- delete exc;
}
TEST(EtchValidatorRuntimeExceptionTest, validateValueTest) {
EtchString excepmess("test");
- EtchObject* boolean = NULL;
- EtchObject* result;
- EtchObject* integer = new EtchInt32(4);
- EtchObject* exc = new EtchRuntimeException(excepmess, ETCH_ERROR);
+
+ capu::SmartPointer<EtchObject> boolean = NULL;
+ capu::SmartPointer<EtchObject> result;
+ 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(ptr->validateValue(boolean, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(integer, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(exc, result) == ETCH_OK);
- delete integer;
- delete exc;
}
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=1345149&r1=1345148&r2=1345149&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 Fri Jun 1 13:06:15 2012
@@ -38,35 +38,35 @@ TEST(EtchValidatorShortTest, createTest)
}
TEST(EtchValidatorShortTest, validateTest) {
- EtchObject* byte = NULL;
+ capu::SmartPointer<EtchObject> byte = NULL;
- EtchObject* integer = new EtchInt32(capu::NumericLimitMin<capu::int16_t>());
- EtchObject* integer2 = new EtchInt32(0);
- EtchObject* integer3 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>());
- EtchObject* integer4 = new EtchInt32(897);
+ capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int16_t>());
+ capu::SmartPointer<EtchObject> integer2 = new EtchInt32(0);
+ capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>());
+ capu::SmartPointer<EtchObject> integer4 = new EtchInt32(897);
//exceed limits of integer
- EtchObject* integer5 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>() + 2);
+ capu::SmartPointer<EtchObject> integer5 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>() + 2);
- EtchObject* longInteger = new EtchLong(capu::NumericLimitMin<capu::int16_t>());
- EtchObject* longInteger2 = new EtchLong(0);
- EtchObject* longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int16_t>());
- EtchObject* longInteger4 = new EtchLong(897);
+ capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimitMin<capu::int16_t>());
+ capu::SmartPointer<EtchObject> longInteger2 = new EtchLong(0);
+ capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int16_t>());
+ capu::SmartPointer<EtchObject> longInteger4 = new EtchLong(897);
//exceed limits of integer
- EtchObject* longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int16_t>() + (capu::int64_t)2);
+ capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int16_t>() + (capu::int64_t)2);
- EtchObject* shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
- EtchObject* shortInteger2 = new EtchShort(0);
- EtchObject* shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
- EtchObject* shortInteger4 = new EtchShort();
+ capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
+ capu::SmartPointer<EtchObject> shortInteger2 = new EtchShort(0);
+ capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
+ capu::SmartPointer<EtchObject> shortInteger4 = new EtchShort();
//incompatible type
- EtchObject* str = new EtchString();
+ capu::SmartPointer<EtchObject> str = new EtchString();
- EtchObject* byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
- EtchObject* byte2 = new EtchByte(0);
- EtchObject* byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
- EtchObject* byte4 = new EtchByte(32);
+ capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
+ capu::SmartPointer<EtchObject> byte2 = new EtchByte(0);
+ 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((capu::smartpointer_cast<EtchTypeValidator>(ptr))->getNDims() == 0);
@@ -90,58 +90,26 @@ TEST(EtchValidatorShortTest, validateTes
EXPECT_TRUE(ptr->validate(integer4));
EXPECT_TRUE(ptr->validate(longInteger4));
EXPECT_TRUE(ptr->validate(shortInteger4));
-
- delete integer;
- delete integer2;
- delete integer3;
- delete integer4;
- delete integer5;
-
- delete longInteger;
- delete longInteger2;
- delete longInteger3;
- delete longInteger4;
- delete longInteger5;
-
- delete shortInteger;
- delete shortInteger2;
- delete shortInteger3;
- delete shortInteger4;
-
- delete byte1;
- delete byte2;
- delete byte3;
- delete byte4;
-
- delete str;
}
TEST(EtchValidatorShortTest, validateValueTest) {
- EtchObject* byte = NULL;
- EtchObject* result;
- EtchObject* integer = new EtchInt32(-128);
- EtchObject* integer2 = new EtchInt32(5);
- EtchObject* integer3 = new EtchInt32(127);
- EtchObject* byte2 = new EtchByte(3);
+ capu::SmartPointer<EtchObject> byte = NULL;
+ capu::SmartPointer<EtchObject> result;
+ capu::SmartPointer<EtchObject> integer = new EtchInt32(-128);
+ 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;
EXPECT_TRUE(EtchValidatorShort::Get(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() == ((EtchInt32*) integer)->get());
- delete result;
+ EXPECT_TRUE(((EtchShort*) result.get())->get() == ((EtchInt32*) integer.get())->get());
EXPECT_TRUE(ptr->validateValue(integer2, result) == ETCH_OK);
- EXPECT_TRUE(((EtchShort*) result)->get() == ((EtchInt32*) integer2)->get());
- delete result;
+ EXPECT_TRUE(((EtchShort*) result.get())->get() == ((EtchInt32*) integer2.get())->get());
EXPECT_TRUE(ptr->validateValue(integer3, result) == ETCH_OK);
- EXPECT_TRUE(((EtchShort*) result)->get() == ((EtchInt32*) integer3)->get());
- delete result;
+ EXPECT_TRUE(((EtchShort*) result.get())->get() == ((EtchInt32*) integer3.get())->get());
EXPECT_TRUE(ptr->validateValue(byte2, result) == ETCH_OK);
- EXPECT_TRUE(((EtchShort*) result)->get() == ((EtchByte*) byte2)->get());
- delete result;
- delete integer;
- delete integer2;
- delete integer3;
- delete byte2;
+ EXPECT_TRUE(((EtchShort*) result.get())->get() == ((EtchByte*) byte2.get())->get());
}
TEST(EtchValidatorShortTest, elementValidatorTest) {
@@ -150,33 +118,33 @@ TEST(EtchValidatorShortTest, elementVali
capu::SmartPointer<EtchValidator> elementValidator;
ptr->getElementValidator(elementValidator);
- EtchObject* integer = new EtchInt32(capu::NumericLimitMin<capu::int16_t>());
- EtchObject* integer2 = new EtchInt32(0);
- EtchObject* integer3 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>());
- EtchObject* integer4 = new EtchInt32(897);
+ capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int16_t>());
+ capu::SmartPointer<EtchObject> integer2 = new EtchInt32(0);
+ capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>());
+ capu::SmartPointer<EtchObject> integer4 = new EtchInt32(897);
//exceed limits of integer
- EtchObject* integer5 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>() + 2);
+ capu::SmartPointer<EtchObject> integer5 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>() + 2);
- EtchObject* longInteger = new EtchLong(capu::NumericLimitMin<capu::int16_t>());
- EtchObject* longInteger2 = new EtchLong(0);
- EtchObject* longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int16_t>());
- EtchObject* longInteger4 = new EtchLong(897);
+ capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimitMin<capu::int16_t>());
+ capu::SmartPointer<EtchObject> longInteger2 = new EtchLong(0);
+ capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int16_t>());
+ capu::SmartPointer<EtchObject> longInteger4 = new EtchLong(897);
//exceed limits of integer
- EtchObject* longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int16_t>() + (capu::int64_t)2);
+ capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int16_t>() + (capu::int64_t)2);
- EtchObject* shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
- EtchObject* shortInteger2 = new EtchShort(0);
- EtchObject* shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
- EtchObject* shortInteger4 = new EtchShort();
+ capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
+ capu::SmartPointer<EtchObject> shortInteger2 = new EtchShort(0);
+ capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
+ capu::SmartPointer<EtchObject> shortInteger4 = new EtchShort();
//incompatible type
- EtchObject* str = new EtchString();
+ capu::SmartPointer<EtchObject> str = new EtchString();
- EtchObject* byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
- EtchObject* byte2 = new EtchByte(0);
- EtchObject* byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
- EtchObject* byte4 = new EtchByte(32);
+ capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
+ capu::SmartPointer<EtchObject> byte2 = new EtchByte(0);
+ capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
+ capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
EXPECT_FALSE(elementValidator->validate(str));
EXPECT_FALSE(elementValidator->validate(longInteger5));
@@ -197,27 +165,4 @@ TEST(EtchValidatorShortTest, elementVali
EXPECT_TRUE(elementValidator->validate(integer4));
EXPECT_TRUE(elementValidator->validate(longInteger4));
EXPECT_TRUE(elementValidator->validate(shortInteger4));
- delete integer;
- delete integer2;
- delete integer3;
- delete integer4;
- delete integer5;
-
- delete longInteger;
- delete longInteger2;
- delete longInteger3;
- delete longInteger4;
- delete longInteger5;
-
- delete shortInteger;
- delete shortInteger2;
- delete shortInteger3;
- delete shortInteger4;
-
- delete byte1;
- delete byte2;
- delete byte3;
- delete byte4;
-
- delete str;
}
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=1345149&r1=1345148&r2=1345149&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 Fri Jun 1 13:06:15 2012
@@ -41,32 +41,28 @@ TEST(EtchValidatorStringTest, createTest
}
TEST(EtchValidatorStringTest, validateTest) {
- EtchObject* str = NULL;
- EtchObject* integer = new EtchInt32(4);
- EtchObject* str2 = new EtchString("hello");
+ capu::SmartPointer<EtchObject> str = NULL;
+ 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(((EtchTypeValidator*) ptr.get())->getNDims() == 0);
EXPECT_FALSE(ptr->validate(str));
EXPECT_FALSE(ptr->validate(integer));
EXPECT_TRUE(ptr->validate(str2));
- delete integer;
- delete str2;
}
TEST(EtchValidatorStringTest, validateValueTest) {
- EtchObject* str = NULL;
- EtchObject* result;
- EtchObject* integer = new EtchInt32(4);
- EtchObject* str2 = new EtchString("hello");
+ capu::SmartPointer<EtchObject> str = NULL;
+ capu::SmartPointer<EtchObject> result;
+ 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(ptr->validateValue(str, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(integer, result) == ETCH_ERROR);
EXPECT_TRUE(ptr->validateValue(str2, result) == ETCH_OK);
- EXPECT_TRUE(((EtchString*) result)->equals((EtchString*) str2));
- delete integer;
- delete str2;
+ EXPECT_TRUE(((EtchString*) result.get())->equals((EtchString*) str2.get()));
}
TEST(EtchValidatorStringTest, elementValidatorTest) {
@@ -75,13 +71,11 @@ TEST(EtchValidatorStringTest, elementVal
capu::SmartPointer<EtchValidator> elementValidator;
ptr->getElementValidator(elementValidator);
- EtchObject* str = NULL;
- EtchObject* integer = new EtchInt32(4);
- EtchObject* str2 = new EtchString("hello");
+ capu::SmartPointer<EtchObject> str = NULL;
+ capu::SmartPointer<EtchObject> integer = new EtchInt32(4);
+ capu::SmartPointer<EtchObject> str2 = new EtchString("hello");
EXPECT_FALSE(elementValidator->validate(str));
EXPECT_FALSE(elementValidator->validate(integer));
EXPECT_TRUE(elementValidator->validate(str2));
- delete integer;
- delete str2;
}
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=1345149&r1=1345148&r2=1345149&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 Fri Jun 1 13:06:15 2012
@@ -114,33 +114,33 @@ TEST(EtchValidatorStructValueTest, eleme
val->getElementValidator(elementValidator);
- EtchObject* integer = new EtchInt32(capu::NumericLimitMin<capu::int16_t>());
- EtchObject* integer2 = new EtchInt32(0);
- EtchObject* integer3 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>());
- EtchObject* integer4 = new EtchInt32(897);
+ capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int16_t>());
+ capu::SmartPointer<EtchObject> integer2 = new EtchInt32(0);
+ capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>());
+ capu::SmartPointer<EtchObject> integer4 = new EtchInt32(897);
//exceed limits of integer
- EtchObject* integer5 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>() + 2);
+ capu::SmartPointer<EtchObject> integer5 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>() + 2);
- EtchObject* longInteger = new EtchLong(capu::NumericLimitMin<capu::int16_t>());
- EtchObject* longInteger2 = new EtchLong(0);
- EtchObject* longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int16_t>());
- EtchObject* longInteger4 = new EtchLong(897);
+ capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimitMin<capu::int16_t>());
+ capu::SmartPointer<EtchObject> longInteger2 = new EtchLong(0);
+ capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int16_t>());
+ capu::SmartPointer<EtchObject> longInteger4 = new EtchLong(897);
//exceed limits of integer
- EtchObject* longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int16_t>() + (capu::int64_t)2);
+ capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int16_t>() + (capu::int64_t)2);
- EtchObject* shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
- EtchObject* shortInteger2 = new EtchShort(0);
- EtchObject* shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
- EtchObject* shortInteger4 = new EtchShort();
+ capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
+ capu::SmartPointer<EtchObject> shortInteger2 = new EtchShort(0);
+ capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
+ capu::SmartPointer<EtchObject> shortInteger4 = new EtchShort();
//incompatible type
- EtchObject* str2 = new EtchString();
+ capu::SmartPointer<EtchObject> str2 = new EtchString();
- EtchObject* byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
- EtchObject* byte2 = new EtchByte(0);
- EtchObject* byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
- EtchObject* byte4 = new EtchByte(32);
- EtchObject* structValueval = new EtchStructValue(type, fac);
+ capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
+ capu::SmartPointer<EtchObject> byte2 = new EtchByte(0);
+ capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
+ capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
+ capu::SmartPointer<EtchObject> structValueval = new EtchStructValue(type, fac);
EXPECT_FALSE(elementValidator->validate(str2));
EXPECT_FALSE(elementValidator->validate(longInteger5));
@@ -163,31 +163,6 @@ TEST(EtchValidatorStructValueTest, eleme
EXPECT_FALSE(elementValidator->validate(shortInteger4));
EXPECT_FALSE(elementValidator->validate(NULL));
EXPECT_TRUE(elementValidator->validate(structValueval));
-
- delete integer;
- delete integer2;
- delete integer3;
- delete integer4;
- delete integer5;
-
- delete longInteger;
- delete longInteger2;
- delete longInteger3;
- delete longInteger4;
- delete longInteger5;
-
- delete shortInteger;
- delete shortInteger2;
- delete shortInteger3;
- delete shortInteger4;
-
- delete byte1;
- delete byte2;
- delete byte3;
- delete byte4;
- delete structValueval;
- delete str2;
-
delete fac;
delete type;
}
@@ -201,35 +176,35 @@ TEST(EtchValidatorStructValueTest, valid
EXPECT_TRUE(EtchValidatorStructValue::Get(type, 0, ptr) == ETCH_OK);
- EtchObject* byte = NULL;
+ capu::SmartPointer<EtchObject> byte = NULL;
- EtchObject* integer = new EtchInt32(capu::NumericLimitMin<capu::int16_t>());
- EtchObject* integer2 = new EtchInt32(0);
- EtchObject* integer3 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>());
- EtchObject* integer4 = new EtchInt32(897);
+ capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int16_t>());
+ capu::SmartPointer<EtchObject> integer2 = new EtchInt32(0);
+ capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>());
+ capu::SmartPointer<EtchObject> integer4 = new EtchInt32(897);
//exceed limits of integer
- EtchObject* integer5 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>() + 2);
+ capu::SmartPointer<EtchObject> integer5 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>() + 2);
- EtchObject* longInteger = new EtchLong(capu::NumericLimitMin<capu::int16_t>());
- EtchObject* longInteger2 = new EtchLong(0);
- EtchObject* longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int16_t>());
- EtchObject* longInteger4 = new EtchLong(897);
+ capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimitMin<capu::int16_t>());
+ capu::SmartPointer<EtchObject> longInteger2 = new EtchLong(0);
+ capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int16_t>());
+ capu::SmartPointer<EtchObject> longInteger4 = new EtchLong(897);
//exceed limits of integer
- EtchObject* longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int16_t>() + (capu::int64_t)2);
+ capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int16_t>() + (capu::int64_t)2);
- EtchObject* shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
- EtchObject* shortInteger2 = new EtchShort(0);
- EtchObject* shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
- EtchObject* shortInteger4 = new EtchShort();
+ capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
+ capu::SmartPointer<EtchObject> shortInteger2 = new EtchShort(0);
+ capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
+ capu::SmartPointer<EtchObject> shortInteger4 = new EtchShort();
//incompatible type
- EtchObject* str2 = new EtchString();
+ capu::SmartPointer<EtchObject> str2 = new EtchString();
- EtchObject* byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
- EtchObject* byte2 = new EtchByte(0);
- EtchObject* byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
- EtchObject* byte4 = new EtchByte(32);
+ capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
+ capu::SmartPointer<EtchObject> byte2 = new EtchByte(0);
+ capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
+ capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
EtchStructValue * value = new EtchStructValue(type, fac);
@@ -256,33 +231,8 @@ TEST(EtchValidatorStructValueTest, valid
EXPECT_FALSE(ptr->validate(shortInteger4));
EXPECT_FALSE(ptr->validate(NULL));
EXPECT_TRUE(ptr->validate(value));
-
- delete integer;
- delete integer2;
- delete integer3;
- delete integer4;
- delete integer5;
-
- delete longInteger;
- delete longInteger2;
- delete longInteger3;
- delete longInteger4;
- delete longInteger5;
-
- delete shortInteger;
- delete shortInteger2;
- delete shortInteger3;
- delete shortInteger4;
-
- delete byte1;
- delete byte2;
- delete byte3;
- delete byte4;
-
- delete value;
delete fac;
delete type;
- delete str2;
}
TEST(EtchValidatorStructValueTest, validateValueTest) {
@@ -295,11 +245,11 @@ TEST(EtchValidatorStructValueTest, valid
EXPECT_TRUE(((EtchTypeValidator*)ptr.get())->getExpectedType()->equals(EtchStructValue::TYPE()));
EXPECT_TRUE(((EtchTypeValidator*)ptr.get())->getNDims() == 0);
- EtchObject* byte = NULL;
- EtchObject* result;
- EtchObject* integer = new EtchInt32(-128);
- EtchObject* byte2 = new EtchByte(3);
- EtchObject* structValue = new EtchStructValue(type, fac);
+ capu::SmartPointer<EtchObject> byte = NULL;
+ capu::SmartPointer<EtchObject> result;
+ capu::SmartPointer<EtchObject> integer = new EtchInt32(-128);
+ capu::SmartPointer<EtchObject> byte2 = new EtchByte(3);
+ capu::SmartPointer<EtchObject> structValue = new EtchStructValue(type, fac);
EXPECT_TRUE(ptr->validateValue(byte, result) == ETCH_ERROR);
@@ -309,10 +259,6 @@ TEST(EtchValidatorStructValueTest, valid
EXPECT_TRUE(ptr->validateValue(structValue, result) == ETCH_OK);
- delete integer;
- delete structValue;
- delete byte2;
-
delete type;
delete fac;
}