You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by fi...@apache.org on 2012/06/01 13:48:00 UTC
svn commit: r1345087 [2/2] - in /incubator/etch/trunk/binding-cpp/runtime:
include/common/ include/serialization/ include/transport/ src/main/
src/main/common/ src/main/serialization/ src/test/ src/test/common/
src/test/serialization/
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=1345087&r1=1345086&r2=1345087&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 Fri Jun 1 11:47:57 2012
@@ -23,14 +23,14 @@
TEST(EtchBoolTest, Constructor_Default){
EtchBool* i1 = new EtchBool();
- EXPECT_TRUE(i1->getObjectType()->equals(&EtchBool::TYPE));
+ EXPECT_TRUE(i1->getObjectType()->equals(EtchBool::TYPE()));
EXPECT_TRUE(i1->get() == false);
delete i1;
}
TEST(EtchBoolTest, Constructor_Bool){
EtchBool* i1 = new EtchBool(true);
- EXPECT_TRUE(i1->getObjectType()->equals(&EtchBool::TYPE));
+ EXPECT_TRUE(i1->getObjectType()->equals(EtchBool::TYPE()));
EXPECT_TRUE(i1->get() == true);
delete i1;
}
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=1345087&r1=1345086&r2=1345087&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 Fri Jun 1 11:47:57 2012
@@ -23,14 +23,14 @@
TEST(EtchByteTest, Constructor_Default){
EtchByte* i1 = new EtchByte();
- EXPECT_TRUE(i1->getObjectType()->equals(&EtchByte::TYPE));
+ EXPECT_TRUE(i1->getObjectType()->equals(EtchByte::TYPE()));
EXPECT_TRUE(i1->get() == 0);
delete i1;
}
TEST(EtchByteTest, Constructor_Byte){
EtchByte* i1 = new EtchByte(42);
- EXPECT_TRUE(i1->getObjectType()->equals(&EtchByte::TYPE));
+ EXPECT_TRUE(i1->getObjectType()->equals(EtchByte::TYPE()));
EXPECT_TRUE(i1->get() == 42);
delete i1;
}
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=1345087&r1=1345086&r2=1345087&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 Fri Jun 1 11:47:57 2012
@@ -23,14 +23,14 @@
TEST(EtchDoubleTest, Constructor_Default){
EtchDouble* i1 = new EtchDouble();
- EXPECT_TRUE(i1->getObjectType()->equals(&EtchDouble::TYPE));
+ EXPECT_TRUE(i1->getObjectType()->equals(EtchDouble::TYPE()));
EXPECT_TRUE(i1->get() == 0.0L);
delete i1;
}
TEST(EtchDoubleTest, Constructor_Double){
EtchDouble* i1 = new EtchDouble(42.0L);
- EXPECT_TRUE(i1->getObjectType()->equals(&EtchDouble::TYPE));
+ EXPECT_TRUE(i1->getObjectType()->equals(EtchDouble::TYPE()));
EXPECT_TRUE(i1->get() == 42.0L);
delete i1;
}
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=1345087&r1=1345086&r2=1345087&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 Fri Jun 1 11:47:57 2012
@@ -23,14 +23,14 @@
TEST(EtchFloatTest, Constructor_Default){
EtchFloat* i1 = new EtchFloat();
- EXPECT_TRUE(i1->getObjectType()->equals(&EtchFloat::TYPE));
+ EXPECT_TRUE(i1->getObjectType()->equals(EtchFloat::TYPE()));
EXPECT_TRUE(i1->get() == 0.0f);
delete i1;
}
TEST(EtchFloatTest, Constructor_Float){
EtchFloat* i1 = new EtchFloat(42.0f);
- EXPECT_TRUE(i1->getObjectType()->equals(&EtchFloat::TYPE));
+ EXPECT_TRUE(i1->getObjectType()->equals(EtchFloat::TYPE()));
EXPECT_TRUE(i1->get() == 42.0f);
delete i1;
}
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=1345087&r1=1345086&r2=1345087&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 Fri Jun 1 11:47:57 2012
@@ -23,14 +23,14 @@
TEST(EtchInt32Test, Constructor_Default){
EtchInt32* i1 = new EtchInt32();
- EtchInt32(i1->getObjectType()->equals(&EtchInt32::TYPE));
+ EtchInt32(i1->getObjectType()->equals(EtchInt32::TYPE()));
EtchInt32(i1->get() == 0);
delete i1;
}
TEST(EtchInt32Test, Constructor_Int){
EtchInt32* i1 = new EtchInt32(42);
- EXPECT_TRUE(i1->getObjectType()->equals(&EtchInt32::TYPE));
+ EXPECT_TRUE(i1->getObjectType()->equals(EtchInt32::TYPE()));
EXPECT_TRUE(i1->get() == 42);
delete i1;
}
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=1345087&r1=1345086&r2=1345087&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 Fri Jun 1 11:47:57 2012
@@ -23,14 +23,14 @@
TEST(EtchLongTest, Constructor_Default){
EtchLong* i1 = new EtchLong();
- EXPECT_TRUE(i1->getObjectType()->equals(&EtchLong::TYPE));
+ EXPECT_TRUE(i1->getObjectType()->equals(EtchLong::TYPE()));
EXPECT_TRUE(i1->get() == 0);
delete i1;
}
TEST(EtchLongTest, Constructor_Long){
EtchLong* i1 = new EtchLong(42);
- EXPECT_TRUE(i1->getObjectType()->equals(&EtchLong::TYPE));
+ EXPECT_TRUE(i1->getObjectType()->equals(EtchLong::TYPE()));
EXPECT_TRUE(i1->get() == 42);
delete i1;
}
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchNativeArrayTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchNativeArrayTest.cpp?rev=1345087&r1=1345086&r2=1345087&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchNativeArrayTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/common/EtchNativeArrayTest.cpp Fri Jun 1 11:47:57 2012
@@ -21,8 +21,7 @@
#include "common/EtchNativeArray.h"
TEST(EtchNativeArrayTest, Constructor_Default) {
- EtchNativeArray<EtchInt32*>* na =
- new EtchNativeArray<EtchInt32*>(10, &EtchInt32::TYPE);
+ EtchNativeArray<EtchInt32*>* na = new EtchNativeArray<EtchInt32*>(10, EtchInt32::TYPE());
delete na;
}
@@ -32,12 +31,12 @@ TEST(EtchNativeArrayTest, Constructor_Ar
EtchInt32* int2 = new EtchInt32(43);
EtchNativeArray<EtchInt32*>* na1 =
- new EtchNativeArray<EtchInt32*>(2, &EtchInt32::TYPE);
+ new EtchNativeArray<EtchInt32*>(2, EtchInt32::TYPE());
na1->set(0, int1);
na1->set(1, int2);
- EXPECT_TRUE(na1->getObjectType()->equals(&EtchNativeArray<EtchInt32*>::TYPE));
+ EXPECT_TRUE(na1->getObjectType()->equals(EtchNativeArray<EtchInt32*>::TYPE()));
EtchInt32* value = NULL;
int i = 0;
@@ -60,8 +59,8 @@ TEST(EtchNativeArrayTest, setget) {
EtchInt32* int1 = new EtchInt32(42);
EtchInt32* int2 = new EtchInt32(43);
EtchNativeArray<EtchInt32*>* na1 =
- new EtchNativeArray<EtchInt32*>(2, &EtchInt32::TYPE);
- EXPECT_TRUE(na1->getObjectType()->equals(&EtchNativeArray<EtchInt32*>::TYPE));
+ new EtchNativeArray<EtchInt32*>(2, EtchInt32::TYPE());
+ EXPECT_TRUE(na1->getObjectType()->equals(EtchNativeArray<EtchInt32*>::TYPE()));
na1->set(0, int1);
na1->set(1, int2);
@@ -83,7 +82,7 @@ TEST(EtchNativeArrayTest, setget) {
ASSERT_EQ(44, newValue->get());
//Test setget of block
- EtchNativeArray<EtchInt32*> *native_array = new EtchNativeArray<EtchInt32*> (2, &EtchInt32::TYPE);
+ EtchNativeArray<EtchInt32*> *native_array = new EtchNativeArray<EtchInt32*> (2, EtchInt32::TYPE());
EtchInt32** int3 = new EtchInt32*[2];
int3[0] = new EtchInt32();
int3[1] = new EtchInt32();
@@ -172,23 +171,23 @@ TEST(EtchNativeArrayTest, multiDimension
EtchInt32* int3 = new EtchInt32(3);
EtchInt32* int4 = new EtchInt32(4);
- EtchNativeArray<EtchInt32*>* subArray1 = new EtchNativeArray<EtchInt32*>(2, &EtchInt32::TYPE);
- EtchNativeArray<EtchInt32*>* subArray2 = new EtchNativeArray<EtchInt32*>(2, &EtchInt32::TYPE);
+ EtchNativeArray<EtchInt32*>* subArray1 = new EtchNativeArray<EtchInt32*>(2, EtchInt32::TYPE());
+ EtchNativeArray<EtchInt32*>* subArray2 = new EtchNativeArray<EtchInt32*>(2, EtchInt32::TYPE());
subArray1->set(0, int1);
subArray1->set(1, int2);
subArray2->set(0, int3);
subArray2->set(1, int4);
- EtchNativeArray<EtchNativeArray<EtchInt32*>*>* mainArray = new EtchNativeArray<EtchNativeArray<EtchInt32*>*>(2, &EtchNativeArray<EtchNativeArray<EtchInt32*>*>::TYPE);
+ EtchNativeArray<EtchNativeArray<EtchInt32*>*>* mainArray = new EtchNativeArray<EtchNativeArray<EtchInt32*>*>(2, EtchNativeArray<EtchNativeArray<EtchInt32*>*>::TYPE());
mainArray->set(0, subArray1);
mainArray->set(1, subArray2);
const EtchObjectType *ot = mainArray->getObjectType();
//get type of main array
- EXPECT_TRUE(ot->equals(&EtchNativeArray<EtchNativeArray<EtchInt32*>*>::TYPE));
+ EXPECT_TRUE(ot->equals(EtchNativeArray<EtchNativeArray<EtchInt32*>*>::TYPE()));
//get component type of main array = type of subarray
- EXPECT_TRUE(ot->getObjectComponentType()->equals(&EtchNativeArray<EtchInt32*>::TYPE));
+ EXPECT_TRUE(ot->getObjectComponentType()->equals(EtchNativeArray<EtchInt32*>::TYPE()));
//get component type of subarray
- EXPECT_TRUE(ot->getObjectComponentType()->getObjectComponentType()->equals(&EtchInt32::TYPE));
+ EXPECT_TRUE(ot->getObjectComponentType()->getObjectComponentType()->equals(EtchInt32::TYPE()));
EtchNativeArray<EtchInt32*>* result;
mainArray->get(0, &result);
@@ -207,7 +206,7 @@ TEST(EtchNativeArrayTest, multiDimension
}
TEST(EtchNativeArrayTest, DeleteModeTest) {
- EtchNativeArray<EtchInt32*>* Array1 = new EtchNativeArray<EtchInt32*>(2, &EtchInt32::TYPE);
+ EtchNativeArray<EtchInt32*>* Array1 = new EtchNativeArray<EtchInt32*>(2, EtchInt32::TYPE());
Array1->setDeleteMode(false);
EtchNativeArray<EtchInt32*>* Array2 = new EtchNativeArray<EtchInt32*>(2, new EtchObjectType(EOTID_INT32, NULL));
Array2->setDeleteMode(true);
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=1345087&r1=1345086&r2=1345087&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 Fri Jun 1 11:47:57 2012
@@ -23,14 +23,14 @@
TEST(EtchShortTest, Constructor_Default){
EtchShort* i1 = new EtchShort();
- EXPECT_TRUE(i1->getObjectType()->equals(&EtchShort::TYPE));
+ EXPECT_TRUE(i1->getObjectType()->equals(EtchShort::TYPE()));
EXPECT_TRUE(i1->get() == 0);
delete i1;
}
TEST(EtchShortTest, Constructor_Short){
EtchShort* i1 = new EtchShort(42);
- EXPECT_TRUE(i1->getObjectType()->equals(&EtchShort::TYPE));
+ EXPECT_TRUE(i1->getObjectType()->equals(EtchShort::TYPE()));
EXPECT_TRUE(i1->get() == 42);
delete i1;
}
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=1345087&r1=1345086&r2=1345087&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 Fri Jun 1 11:47:57 2012
@@ -23,14 +23,14 @@
TEST(EtchStringTest, Constructor_Default) {
EtchString* s1 = new EtchString();
- EXPECT_TRUE(s1->getObjectType()->equals(&EtchString::TYPE));
+ EXPECT_TRUE(s1->getObjectType()->equals(EtchString::TYPE()));
EXPECT_TRUE(s1->c_str() == NULL);
delete s1;
}
TEST(EtchStringTest, Constructor_Char) {
EtchString* s1 = new EtchString("test");
- EXPECT_TRUE(s1->getObjectType()->equals(&EtchString::TYPE));
+ EXPECT_TRUE(s1->getObjectType()->equals(EtchString::TYPE()));
EXPECT_TRUE(s1->c_str() != NULL);
EXPECT_TRUE(strcmp(s1->c_str(), "test") == 0);
delete s1;
Added: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchClass2TypeMapTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchClass2TypeMapTest.cpp?rev=1345087&view=auto
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchClass2TypeMapTest.cpp (added)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchClass2TypeMapTest.cpp Fri Jun 1 11:47:57 2012
@@ -0,0 +1,99 @@
+/* $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "gtest/gtest.h"
+#include "serialization/EtchClass2TypeMap.h"
+#include "serialization/EtchValueFactory.h"
+#include "common/EtchString.h"
+#include "common/EtchByte.h"
+
+TEST(EtchClass2TypeMapTest, createTest) {
+ EtchClass2TypeMap * collection = new EtchClass2TypeMap();
+ EXPECT_TRUE(collection != NULL);
+ delete collection;
+}
+
+TEST(EtchClass2TypeMapTest, getTest) {
+ EtchClass2TypeMap *test = NULL;
+ test = new EtchClass2TypeMap();
+
+ EtchType* type = new EtchType(EtchString("string"));
+ //add new field to collection
+ EXPECT_EQ(ETCH_OK, test->put(EtchString::TYPE(), type));
+
+ //get the new field
+ EtchType* tmp1 = NULL;
+ EXPECT_EQ(ETCH_OK, test->get(EtchString::TYPE(), &tmp1));
+ //check the content
+ EXPECT_TRUE(type->equals(tmp1));
+
+ //lock the collection
+ test->lock();
+ //get field
+ EXPECT_EQ(ETCH_OK, test->get(EtchString::TYPE(), &tmp1));
+ //check content
+ EXPECT_TRUE(type->equals(tmp1));
+
+ //Try to add a new field
+ EXPECT_EQ(ETCH_EINVAL, test->put(EtchByte::TYPE(), type));
+ //try to get non existing element by name
+ EXPECT_EQ(ETCH_ENOT_EXIST, test->get(EtchByte::TYPE(), &tmp1));
+
+ delete test;
+ delete type;
+}
+
+TEST(EtchClass2TypeMapTest, putTest) {
+ EtchClass2TypeMap *test = NULL;
+ test = new EtchClass2TypeMap();
+
+ EtchType* type = new EtchType(EtchString("string"));
+ //add new field to collection
+ EXPECT_EQ(ETCH_OK, test->put(EtchString::TYPE(), type));
+
+ //Try to add existing field
+ EXPECT_EQ(ETCH_OK, test->put(EtchString::TYPE(), type));
+
+ //Try to add a new field
+ EtchType* type2 = new EtchType(EtchString("string2"));
+ EXPECT_EQ(ETCH_ERANGE, test->put(EtchString::TYPE(), type2));
+
+ //lock the collection
+ test->lock();
+ //try to add new field
+ EXPECT_EQ(ETCH_EINVAL, test->put(EtchString::TYPE(), type));
+ delete test;
+ delete type;
+ delete type2;
+}
+
+TEST(EtchClass2TypeMapTest, lockTest) {
+ EtchClass2TypeMap *test = NULL;
+ test = new EtchClass2TypeMap();
+
+ EtchType* type = new EtchType(EtchString("string"));
+ //add new field to collection
+ EXPECT_EQ(ETCH_OK, test->put(EtchString::TYPE(), type));
+
+ //lock the collection
+ test->lock();
+ //try to add new field
+ EXPECT_EQ(ETCH_EINVAL, test->put(EtchString::TYPE(), type));
+ delete test;
+ delete type;
+}
+
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorBooleanTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorBooleanTest.cpp?rev=1345087&r1=1345086&r2=1345087&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorBooleanTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorBooleanTest.cpp Fri Jun 1 11:47:57 2012
@@ -28,7 +28,7 @@ TEST(EtchValidatorBooleanTest, createTes
capu::SmartPointer<EtchValidatorBoolean> val = capu::smartpointer_cast<EtchValidatorBoolean>(val2);
EXPECT_TRUE(val.get() != NULL);
- EXPECT_TRUE(val->getExpectedType()->equals(&EtchBool::TYPE));
+ EXPECT_TRUE(val->getExpectedType()->equals(EtchBool::TYPE()));
EXPECT_TRUE(val->getNDims() == 0);
EtchObjectType type1(EOTID_BOOL, NULL);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorByteTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorByteTest.cpp?rev=1345087&r1=1345086&r2=1345087&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorByteTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorByteTest.cpp Fri Jun 1 11:47:57 2012
@@ -27,7 +27,7 @@ TEST(EtchValidatorByteTest, createTest)
capu::SmartPointer<EtchValidator> val;
EXPECT_TRUE(EtchValidatorByte::Get(0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorByte>(val);
- EXPECT_TRUE(ptr->getExpectedType()->equals(&EtchByte::TYPE));
+ EXPECT_TRUE(ptr->getExpectedType()->equals(EtchByte::TYPE()));
EXPECT_TRUE(ptr->getNDims() == 0);
EtchObjectType type1(EOTID_BYTE, NULL);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorDoubleTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorDoubleTest.cpp?rev=1345087&r1=1345086&r2=1345087&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorDoubleTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorDoubleTest.cpp Fri Jun 1 11:47:57 2012
@@ -28,7 +28,7 @@ TEST(EtchValidatorDoubleTest, createTest
EXPECT_TRUE(EtchValidatorDouble::Get(0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorDouble>(val);
- EXPECT_TRUE(ptr->getExpectedType()->equals(&EtchDouble::TYPE));
+ EXPECT_TRUE(ptr->getExpectedType()->equals(EtchDouble::TYPE()));
EXPECT_TRUE(ptr->getNDims() == 0);
EtchObjectType type1(EOTID_DOUBLE, NULL);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorFloatTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorFloatTest.cpp?rev=1345087&r1=1345086&r2=1345087&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorFloatTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorFloatTest.cpp Fri Jun 1 11:47:57 2012
@@ -29,7 +29,7 @@ TEST(EtchValidatorFloatTest, createTest)
EXPECT_TRUE(EtchValidatorFloat::Get(0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorFloat>(val);
- EXPECT_TRUE(ptr->getExpectedType()->equals(&EtchFloat::TYPE));
+ EXPECT_TRUE(ptr->getExpectedType()->equals(EtchFloat::TYPE()));
EXPECT_TRUE(ptr->getNDims() == 0);
EtchObjectType type1(EOTID_FLOAT, NULL);
Modified: incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorIntTest.cpp
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorIntTest.cpp?rev=1345087&r1=1345086&r2=1345087&view=diff
==============================================================================
--- incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorIntTest.cpp (original)
+++ incubator/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorIntTest.cpp Fri Jun 1 11:47:57 2012
@@ -26,7 +26,7 @@ TEST(EtchValidatorIntTest, createTest) {
capu::SmartPointer<EtchValidator> val;
EXPECT_TRUE(EtchValidatorInt::Get(0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorInt>(val);
- EXPECT_TRUE(ptr->getExpectedType()->equals(&EtchInt32::TYPE));
+ EXPECT_TRUE(ptr->getExpectedType()->equals(EtchInt32::TYPE()));
EXPECT_TRUE(ptr->getNDims() == 0);
EtchObjectType type1(EOTID_INT32, NULL);
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=1345087&r1=1345086&r2=1345087&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 11:47:57 2012
@@ -28,7 +28,7 @@ TEST(EtchValidatorLongTest, createTest)
EXPECT_TRUE(EtchValidatorLong::Get(0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorLong>(val);
- EXPECT_TRUE(ptr->getExpectedType()->equals(&EtchLong::TYPE));
+ EXPECT_TRUE(ptr->getExpectedType()->equals(EtchLong::TYPE()));
EXPECT_TRUE(ptr->getNDims() == 0);
EtchObjectType type1(EOTID_LONG, NULL);
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=1345087&r1=1345086&r2=1345087&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 11:47:57 2012
@@ -26,7 +26,7 @@ TEST(EtchValidatorShortTest, createTest)
capu::SmartPointer<EtchValidator> val;
EXPECT_TRUE(EtchValidatorShort::Get(0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorShort>(val);
- EXPECT_TRUE(ptr->getExpectedType()->equals(&EtchShort::TYPE));
+ EXPECT_TRUE(ptr->getExpectedType()->equals(EtchShort::TYPE()));
EXPECT_TRUE(ptr->getNDims() == 0);
EtchObjectType type1(EOTID_SHORT, NULL);
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=1345087&r1=1345086&r2=1345087&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 11:47:57 2012
@@ -28,7 +28,7 @@ TEST(EtchValidatorStringTest, createTest
EXPECT_TRUE(EtchValidatorString::Get(0, val) == ETCH_OK);
ptr = capu::smartpointer_cast<EtchValidatorString>(val);
- EXPECT_TRUE(ptr->getExpectedType()->equals(&EtchString::TYPE));
+ EXPECT_TRUE(ptr->getExpectedType()->equals(EtchString::TYPE()));
EXPECT_TRUE(ptr->getNDims() == 0);
EtchObjectType type1(EOTID_STRING, NULL);