geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [03/23] geode-native git commit: GEODE-2441: Remove pdx auto serializer from core sources
Date Wed, 22 Feb 2017 22:18:31 GMT
http://git-wip-us.apache.org/repos/asf/geode-native/blob/7c7f73cc/src/tests/cpp/testobject/PdxAutoMegaType.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PdxAutoMegaType.cpp b/src/tests/cpp/testobject/PdxAutoMegaType.cpp
deleted file mode 100644
index 837c8b7..0000000
--- a/src/tests/cpp/testobject/PdxAutoMegaType.cpp
+++ /dev/null
@@ -1,535 +0,0 @@
-/*
- * 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 "PdxAutoMegaType.hpp"
-
-using namespace apache::geode::client;
-using namespace PdxAutoTests;
-
-// CTOR
-PdxAutoMegaType::PdxAutoMegaType() {}
-
-// DTOR
-PdxAutoMegaType::~PdxAutoMegaType() {}
-
-void PdxAutoMegaType::populatePrimitives() {
-  pdxType_Char = 'a';
-  pdxType_Wchar = L'a';
-  pdxType_Boolean = true;
-  pdxType_Byte = 0x74;
-  pdxType_Short = 0xab;
-  pdxType_Int = 32;
-  pdxType_Long = 324897980;
-  pdxType_Float = 23324.324f;
-  pdxType_Double = 3243298498.00;
-
-  int64_t d = 1310447869154L;
-  pdxType_Date = CacheableDate::create(CacheableDate::duration(d));
-
-  pdxType_String = (char*)"gfestring";
-  pdxType_WideString = (wchar_t*)L"gfestring";
-}
-
-bool PdxAutoMegaType::verifyPrimitives(PdxSerializablePtr obj) {
-  PdxAutoMegaTypePtr other = dynCast<PdxAutoMegaTypePtr>(obj);
-  if (other == NULLPTR) return false;
-  LOGINFO("PdxAutoMegaType::equals::[char]");
-  if (this->pdxType_Char != other->pdxType_Char) {
-    LOGINFO("PdxAutoMegaType::equals::[char] type values mismatch");
-    return false;
-  }
-
-  LOGINFO("PdxAutoMegaType::equals::[wchar]");
-  if (this->pdxType_Wchar != other->pdxType_Wchar) {
-    LOGINFO("PdxAutoMegaType::equals::[wchar] type values mismatch");
-    return false;
-  }
-
-  LOGINFO("PdxAutoMegaType::equals::[bool]");
-  if (this->pdxType_Boolean != other->pdxType_Boolean) {
-    LOGINFO("PdxAutoMegaType::equals::[bool] type values mismatch");
-    return false;
-  }
-
-  LOGINFO("PdxAutoMegaType::equals::[byte]");
-  if (this->pdxType_Byte != other->pdxType_Byte) {
-    LOGINFO("PdxAutoMegaType::equals::[byte] type values mismatch");
-    return false;
-  }
-
-  LOGINFO("PdxAutoMegaType::equals::[int]");
-  if (this->pdxType_Int != other->pdxType_Int) {
-    LOGINFO("PdxAutoMegaType::equals::[int] type values mismatch");
-    return false;
-  }
-
-  LOGINFO("PdxAutoMegaType::equals::[long]");
-  if (this->pdxType_Long != other->pdxType_Long) {
-    LOGINFO("PdxAutoMegaType::equals::[long] type values mismatch");
-    return false;
-  }
-
-  LOGINFO("PdxAutoMegaType::equals::[short]");
-  if (this->pdxType_Short != other->pdxType_Short) {
-    LOGINFO("PdxAutoMegaType::equals::[short] type values mismatch");
-    return false;
-  }
-  LOGINFO("PdxAutoMegaType::equals::[float]");
-  if (this->pdxType_Float != other->pdxType_Float) {
-    LOGINFO("PdxAutoMegaType::equals::[float] type values mismatch");
-    return false;
-  }
-
-  LOGINFO("PdxAutoMegaType::equals::[double]");
-  if (this->pdxType_Double != other->pdxType_Double) {
-    LOGINFO("PdxAutoMegaType::equals::[double] type values mismatch");
-    return false;
-  }
-  LOGINFO("PdxAutoMegaType::equals::[CacheableDate]");
-  if (!(*(this->pdxType_Date.ptr()) == *(other->pdxType_Date.ptr()))) {
-    LOGINFO("PdxAutoMegaType::equals::[CacheableDate] type values mismatch");
-    return false;
-  }
-
-  LOGINFO("PdxAutoMegaType::equals::[string]");
-  if (strcmp(this->pdxType_String, other->pdxType_String) != 0) {
-    LOGINFO("PdxAutoMegaType::equals::[string] type values mismatch");
-    return false;
-  }
-
-  LOGINFO("PdxAutoMegaType::equals::[wide string]");
-  if (wcscmp(this->pdxType_WideString, other->pdxType_WideString) != 0) {
-    LOGINFO("PdxAutoMegaType::equals::[wide string] type values mismatch");
-    return false;
-  }
-  return true;
-}
-
-void PdxAutoMegaType::populateArrays() {
-  pdxType_BoolArray = new bool[3];
-  pdxType_BoolArray[0] = true;
-  pdxType_BoolArray[1] = false;
-  pdxType_BoolArray[2] = true;
-  pdxType_BoolArray_Size = 3;
-
-  pdxType_WideCharArray = new wchar_t[2];
-  pdxType_WideCharArray[0] = L'c';
-  pdxType_WideCharArray[1] = L'v';
-  pdxType_WideCharArray_Size = 2;
-
-  pdxType_CharArray = new char*[2];
-  const char* str1 = "one";
-  const char* str2 = "two";
-
-  int size = static_cast<int>(strlen(str1));
-  for (int i = 0; i < 2; i++) {
-    pdxType_CharArray[i] = new char[size];
-  }
-  pdxType_CharArray[0] = const_cast<char*>(str1);
-  pdxType_CharArray[1] = const_cast<char*>(str2);
-  pdxType_CharArray_Size = 2;
-
-  pdxType_ByteArray = new int8_t[2];
-  pdxType_ByteArray[0] = 0x34;
-  pdxType_ByteArray[1] = 0x64;
-  pdxType_ByteArray_Size = 2;
-
-  pdxType_ShortArray = new int16_t[2];
-  pdxType_ShortArray[0] = 0x2332;
-  pdxType_ShortArray[1] = 0x4545;
-  pdxType_ShortArray_Size = 2;
-
-  pdxType_Int32Array = new int32_t[4];
-  pdxType_Int32Array[0] = 23;
-  pdxType_Int32Array[1] = 676868;
-  pdxType_Int32Array[2] = 34343;
-  pdxType_Int32Array[3] = 2323;
-  pdxType_Int32Array_Size = 4;
-
-  pdxType_LongArray = new int64_t[2];
-  pdxType_LongArray[0] = 324324L;
-  pdxType_LongArray[1] = 23434545L;
-  pdxType_LongArray_Size = 2;
-
-  pdxType_FloatArray = new float[2];
-  pdxType_FloatArray[0] = 232.565f;
-  pdxType_FloatArray[1] = 2343254.67f;
-  pdxType_FloatArray_Size = 2;
-
-  pdxType_DoubleArray = new double[2];
-  pdxType_DoubleArray[0] = 23423432;
-  pdxType_DoubleArray[1] = 4324235435.00;
-  pdxType_DoubleArray_Size = 2;
-
-  pdxType_WideStringArray = new wchar_t*[2];
-  const wchar_t* str11 = L"one";
-  const wchar_t* str21 = L"two";
-
-  size_t sizeWide = wcslen(str11);
-  for (int i = 0; i < 2; i++) {
-    pdxType_WideStringArray[i] = new wchar_t[sizeWide];
-  }
-  pdxType_WideStringArray[0] = const_cast<wchar_t*>(str11);
-  pdxType_WideStringArray[1] = const_cast<wchar_t*>(str21);
-  pdxType_WideStringArray_Size = 2;
-}
-
-bool PdxAutoMegaType::verifyArrays(PdxSerializablePtr obj) {
-  PdxAutoMegaTypePtr other = dynCast<PdxAutoMegaTypePtr>(obj);
-  if (other == NULLPTR) return false;
-  LOGINFO("PdxAutoMegaType::equals::[Boolean Array]");
-  if (other->pdxType_BoolArray[0] != true) {
-    LOGINFO("PdxAutoMegaType::equals::[Boolean Array] type values mismatch");
-    return false;
-  }
-  if (other->pdxType_BoolArray[1] != false) {
-    LOGINFO("PdxAutoMegaType::equals::[Boolean Array] type values mismatch");
-    return false;
-  }
-  if (other->pdxType_BoolArray[2] != true) {
-    LOGINFO("PdxAutoMegaType::equals::[Boolean Array] type values mismatch");
-    return false;
-  }
-
-  LOGINFO("PdxAutoMegaType::equals::[WideChar Array]");
-  if (other->pdxType_WideCharArray[0] != L'c') {
-    LOGINFO("PdxAutoMegaType::equals::[WideChar Array] type values mismatch");
-    return false;
-  }
-  if (other->pdxType_WideCharArray[1] != L'v') {
-    LOGINFO("PdxAutoMegaType::equals::[WideChar Array] type values mismatch");
-    return false;
-  }
-
-  LOGINFO("PdxAutoMegaType::equals::[Char Array]");
-  if (strcmp(this->pdxType_CharArray[0], "one") != 0) {
-    LOGINFO("PdxAutoMegaType::equals::[Char Array] type values mismatch");
-    return false;
-  }
-  if (strcmp(this->pdxType_CharArray[1], "two") != 0) {
-    LOGINFO("PdxAutoMegaType::equals::[Char Array] type values mismatch");
-    return false;
-  }
-
-  LOGINFO("PdxAutoMegaType::equals::[Byte Array]");
-  if (other->pdxType_ByteArray[0] != 0x34) {
-    LOGINFO("PdxAutoMegaType::equals::[Byte Array] type values mismatch");
-    return false;
-  }
-  if (other->pdxType_ByteArray[1] != 0x64) {
-    LOGINFO("PdxAutoMegaType::equals::[Byte Array] type values mismatch");
-    return false;
-  }
-
-  LOGINFO("PdxAutoMegaType::equals::[Short Array]");
-  if (other->pdxType_ShortArray[0] != 0x2332) {
-    LOGINFO("PdxAutoMegaType::equals::[Short Array] type values mismatch");
-    return false;
-  }
-  if (other->pdxType_ShortArray[1] != 0x4545) {
-    LOGINFO("PdxAutoMegaType::equals::[Short Array] type values mismatch");
-    return false;
-  }
-
-  LOGINFO("PdxAutoMegaType::equals::[Int Array]");
-  if (other->pdxType_Int32Array[0] != 23) {
-    LOGINFO("PdxAutoMegaType::equals::[Int Array][0] type values mismatch");
-    return false;
-  }
-  if (other->pdxType_Int32Array[1] != 676868) {
-    LOGINFO("PdxAutoMegaType::equals::[Int Array][1] type values mismatch");
-    return false;
-  }
-  if (other->pdxType_Int32Array[2] != 34343) {
-    LOGINFO("PdxAutoMegaType::equals::[Int Array][2] type values mismatch");
-    return false;
-  }
-  if (other->pdxType_Int32Array[3] != 2323) {
-    LOGINFO("PdxAutoMegaType::equals::[Int Array][3] type values mismatch");
-    return false;
-  }
-
-  LOGINFO("PdxAutoMegaType::equals::[Long Array]");
-  if (other->pdxType_LongArray[0] != 324324L) {
-    LOGINFO("PdxAutoMegaType::equals::[Long Array][0] type values mismatch");
-    return false;
-  }
-  if (other->pdxType_LongArray[1] != 23434545L) {
-    LOGINFO("PdxAutoMegaType::equals::[Long Array][1] type values mismatch");
-    return false;
-  }
-
-  LOGINFO("PdxAutoMegaType::equals::[Float Array]");
-  if (other->pdxType_FloatArray[0] != 232.565f) {
-    LOGINFO("PdxAutoMegaType::equals::[Float Array][0] type values mismatch");
-    return false;
-  }
-  if (other->pdxType_FloatArray[1] != 2343254.67f) {
-    LOGINFO("PdxAutoMegaType::equals::[Float Array][1] type values mismatch");
-    return false;
-  }
-
-  LOGINFO("PdxAutoMegaType::equals::[Double Array]");
-  if (other->pdxType_DoubleArray[0] != 23423432) {
-    LOGINFO("PdxAutoMegaType::equals::[Double Array][0] type values mismatch");
-    return false;
-  }
-  if (other->pdxType_DoubleArray[1] != 4324235435.00) {
-    LOGINFO("PdxAutoMegaType::equals::[Double Array][1] type values mismatch");
-    return false;
-  }
-
-  LOGINFO("PdxAutoMegaType::equals::[Wide Character Array]");
-  if (wcscmp(other->pdxType_WideStringArray[0], L"one") != 0) {
-    LOGINFO(
-        "PdxAutoMegaType::equals::[Wide Character Array][0] type values "
-        "mismatch");
-    return false;
-  }
-  if (wcscmp(other->pdxType_WideStringArray[1], L"two") != 0) {
-    LOGINFO(
-        "PdxAutoMegaType::equals::[Wide Character Array][1] type values "
-        "mismatch");
-    return false;
-  }
-  return true;
-}
-
-void PdxAutoMegaType::populateCacheableContainers() {
-  pdxType_CacheableArrayListPtr = CacheableArrayList::create();
-  pdxType_CacheableArrayListPtr->push_back(CacheableInt32::create(1));
-  pdxType_CacheableArrayListPtr->push_back(CacheableInt32::create(2));
-
-  pdxType_CacheableHashMapPtr = CacheableHashMap::create();
-  pdxType_CacheableHashMapPtr->insert(CacheableInt32::create(1),
-                                      CacheableInt32::create(1));
-  pdxType_CacheableHashMapPtr->insert(CacheableInt32::create(2),
-                                      CacheableInt32::create(2));
-
-  PdxType_CacheableHashTablePtr = CacheableHashTable::create();
-  PdxType_CacheableHashTablePtr->insert(
-      CacheableInt32::create(1), CacheableString::create("1111111111111111"));
-  PdxType_CacheableHashTablePtr->insert(
-      CacheableInt32::create(2),
-      CacheableString::create("2222222222221111111111111111"));
-
-  pdxType_CacheableVectorPtr = CacheableVector::create();
-  pdxType_CacheableVectorPtr->push_back(CacheableInt32::create(1));
-  pdxType_CacheableVectorPtr->push_back(CacheableInt32::create(2));
-  pdxType_CacheableVectorPtr->push_back(CacheableInt32::create(3));
-
-  pdxType_CacheableHashSetPtr = CacheableHashSet::create();
-  pdxType_CacheableHashSetPtr->insert(CacheableInt32::create(1));
-
-  pdxType_CacheableLinkedHashSetPtr = CacheableLinkedHashSet::create();
-  pdxType_CacheableLinkedHashSetPtr->insert(CacheableInt32::create(1));
-  pdxType_CacheableLinkedHashSetPtr->insert(CacheableInt32::create(2));
-}
-bool PdxAutoMegaType::verifyCacheableContainers(PdxSerializablePtr obj) {
-  PdxAutoMegaTypePtr other = dynCast<PdxAutoMegaTypePtr>(obj);
-  if (other == NULLPTR) return false;
-  LOGINFO("PdxAutoMegaType::equals::[CacheableArrayList]");
-  if (other->pdxType_CacheableArrayListPtr == NULLPTR) {
-    LOGINFO("CacheableArrayListPtr should not be NULL");
-    return false;
-  }
-  // CacheableArrayList
-  LOGINFO("PdxAutoMegaType::equals::[CacheableArrayList]  Size Check");
-  if (this->pdxType_CacheableArrayListPtr->size() !=
-      other->pdxType_CacheableArrayListPtr->size()) {
-    LOGINFO("CacheableArrayListPtr size should be equal");
-    return false;
-  }
-
-  LOGINFO(
-      "PdxAutoMegaType::equals::[CacheableArrayList][0] element Value Check");
-  int32_t valLeft = CacheableInt32::create(1)->value();
-  int32_t valRight =
-      dynCast<CacheableInt32Ptr>(other->pdxType_CacheableArrayListPtr->at(0))
-          ->value();
-
-  if (valLeft != valRight) {
-    LOGINFO(
-        "PdxAutoMegaType::equals::[CacheableArrayList][0] type values "
-        "mismatch");
-    return false;
-  }
-
-  valLeft = CacheableInt32::create(2)->value();
-  valRight =
-      dynCast<CacheableInt32Ptr>(other->pdxType_CacheableArrayListPtr->at(1))
-          ->value();
-
-  LOGINFO(
-      "PdxAutoMegaType::equals::[CacheableArrayList][1] element Value Check");
-  if (valLeft != valRight) {
-    LOGINFO(
-        "PdxAutoMegaType::equals::[CacheableArrayList][1] type values "
-        "mismatch");
-    return false;
-  }
-
-  // CacheableHashMap
-  LOGINFO("PdxAutoMegaType::equals::[CacheableHashMap]");
-  if (other->pdxType_CacheableHashMapPtr == NULLPTR) {
-    LOGINFO("CacheableHashMap should not be NULL");
-    return false;
-  }
-  LOGINFO("PdxAutoMegaType::equals::[CacheableHashMap]  Size Check");
-  if (this->pdxType_CacheableHashMapPtr->size() !=
-      other->pdxType_CacheableHashMapPtr->size()) {
-    LOGINFO("CacheableHashMap size should be equal");
-    return false;
-  }
-
-  valLeft = CacheableInt32::create(1)->value();
-  CacheableInt32Ptr mapValRight =
-      pdxType_CacheableHashMapPtr->operator[](CacheableInt32::create(1));
-  valRight = mapValRight->value();
-
-  LOGINFO("PdxAutoMegaType::equals::[CacheableHashMap][0] element Value Check");
-  if (valLeft != valRight) {
-    LOGINFO(
-        "PdxAutoMegaType::equals::[CacheableHashMap][0] type values mismatch");
-    return false;
-  }
-
-  valLeft = CacheableInt32::create(2)->value();
-  mapValRight =
-      pdxType_CacheableHashMapPtr->operator[](CacheableInt32::create(2));
-  valRight = mapValRight->value();
-
-  LOGINFO("PdxAutoMegaType::equals::[CacheableHashMap][1] element Value Check");
-  if (valLeft != valRight) {
-    LOGINFO(
-        "PdxAutoMegaType::equals::[CacheableHashMap][1] type values mismatch");
-    return false;
-  }
-
-  // CacheableHashTable
-  LOGINFO("PdxAutoMegaType::equals::[CacheableHashTable]");
-  if (other->PdxType_CacheableHashTablePtr == NULLPTR) {
-    LOGINFO("CacheableHashTable should not be NULL");
-    return false;
-  }
-  LOGINFO("PdxAutoMegaType::equals::[CacheableHashTable] Size Check");
-  if (this->PdxType_CacheableHashTablePtr->size() !=
-      other->PdxType_CacheableHashTablePtr->size()) {
-    LOGINFO("CacheableHashTable size should be equal");
-    return false;
-  }
-
-  for (CacheableHashTable::Iterator iter =
-           this->PdxType_CacheableHashTablePtr->begin();
-       iter != this->PdxType_CacheableHashTablePtr->end(); iter++) {
-    if (!other->PdxType_CacheableHashTablePtr->contains(iter.first())) {
-      LOGINFO(
-          "PdxAutoMegaType::equals::[CacheableHashTable] expected key missing");
-      return false;
-    }
-  }
-
-  // CacheableVector
-  LOGINFO("PdxAutoMegaType::equals::[CacheableVector]");
-  if (other->pdxType_CacheableVectorPtr == NULLPTR) {
-    LOGINFO("CacheableVector should not be NULL");
-    return false;
-  }
-  LOGINFO("PdxAutoMegaType::equals::[CacheableVector] Size Check");
-  if (this->pdxType_CacheableVectorPtr->size() !=
-      other->pdxType_CacheableVectorPtr->size()) {
-    LOGINFO("CacheableVector size should be equal");
-    return false;
-  }
-  LOGINFO("PdxAutoMegaType::equals::[CacheableVector] Element Check");
-  int index = 1;
-  for (CacheableVector::Iterator itr =
-           other->pdxType_CacheableVectorPtr->begin();
-       itr != other->pdxType_CacheableVectorPtr->end(); ++itr) {
-    valLeft = CacheableInt32::create(index)->value();
-    valRight = dynCast<CacheableInt32Ptr>(*itr)->value();
-    if (valLeft != valRight) {
-      LOGINFO("PdxAutoMegaType::equals::[CacheableVector]type values mismatch");
-    }
-    index++;
-  }
-
-  // CacheableHashSet
-  LOGINFO("PdxAutoMegaType::equals::[CacheableHashSet]");
-  if (other->pdxType_CacheableHashSetPtr == NULLPTR) {
-    LOGINFO("CacheableHashSet should not be NULL");
-    return false;
-  }
-  LOGINFO("PdxAutoMegaType::equals::[CacheableHashSet] Size Check");
-  if (this->pdxType_CacheableHashSetPtr->size() !=
-      other->pdxType_CacheableHashSetPtr->size()) {
-    LOGINFO("CacheableHashSet size should be equal");
-    return false;
-  }
-
-  LOGINFO("PdxAutoMegaType::equals::[CacheableHashSet] Element Check");
-  for (CacheableHashSet::Iterator iter =
-           this->pdxType_CacheableHashSetPtr->begin();
-       iter != this->pdxType_CacheableHashSetPtr->end(); iter++) {
-    if (!other->pdxType_CacheableHashSetPtr->contains(*iter)) {
-      LOGINFO("PdxAutoMegaType::equals::[CacheableHashSet] values mismatch");
-      return false;
-    }
-  }
-
-  // CacheableLinkedHashSet
-  LOGINFO("PdxAutoMegaType::equals::[CacheableLinkedHashSet]");
-  if (other->pdxType_CacheableLinkedHashSetPtr == NULLPTR) {
-    LOGINFO("CacheableLinkedHashSet should not be NULL");
-    return false;
-  }
-  LOGINFO("PdxAutoMegaType::equals::[CacheableLinkedHashSet] Size Check");
-  if (this->pdxType_CacheableLinkedHashSetPtr->size() !=
-      other->pdxType_CacheableLinkedHashSetPtr->size()) {
-    LOGINFO("CacheableLinkedHashSet size should be equal");
-    return false;
-  }
-  LOGINFO("PdxAutoMegaType::equals::[CacheableLinkedHashSet] Element Check");
-  for (CacheableLinkedHashSet::Iterator iter =
-           this->pdxType_CacheableLinkedHashSetPtr->begin();
-       iter != this->pdxType_CacheableLinkedHashSetPtr->end(); iter++) {
-    if (!other->pdxType_CacheableLinkedHashSetPtr->contains(*iter)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-void PdxAutoMegaType::initPdxAutoMegaType() {
-  populatePrimitives();
-  populateArrays();
-  populateCacheableContainers();
-}
-
-bool PdxAutoMegaType::equals(PdxSerializablePtr obj) {
-  if (obj == NULLPTR) return false;
-
-  if (true != verifyPrimitives(obj)) {
-    return false;
-  }
-  if (true != verifyArrays(obj)) {
-    return false;
-  }
-  if (true != verifyCacheableContainers(obj)) {
-    return false;
-  }
-  return true;
-}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/7c7f73cc/src/tests/cpp/testobject/PdxAutoMegaType.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PdxAutoMegaType.hpp b/src/tests/cpp/testobject/PdxAutoMegaType.hpp
deleted file mode 100644
index b33eb27..0000000
--- a/src/tests/cpp/testobject/PdxAutoMegaType.hpp
+++ /dev/null
@@ -1,129 +0,0 @@
-#pragma once
-
-#ifndef GEODE_TESTOBJECT_PDXAUTOMEGATYPE_H_
-#define GEODE_TESTOBJECT_PDXAUTOMEGATYPE_H_
-
-/*
- * 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 <geode/PdxSerializable.hpp>
-#include <geode/GeodeCppCache.hpp>
-#include <geode/PdxWriter.hpp>
-#include <geode/PdxReader.hpp>
-
-#ifdef _WIN32
-#ifdef BUILD_TESTOBJECT
-#define TESTOBJECT_EXPORT LIBEXP
-#else
-#define TESTOBJECT_EXPORT LIBIMP
-#endif
-#else
-#define TESTOBJECT_EXPORT
-#endif
-
-using namespace apache::geode::client;
-
-#define GFIGNORE(X) X
-#define GFID
-#define GFARRAYSIZE(X)
-
-namespace PdxAutoTests {
-class GFIGNORE(TESTOBJECT_EXPORT) PdxAutoMegaType : public PdxSerializable {
- private:
-  GFID char pdxType_Char;
-  GFID wchar_t pdxType_Wchar;
-  GFID bool pdxType_Boolean;
-  GFID int8_t pdxType_Byte;
-  GFID int16_t pdxType_Short;
-  GFID int32_t pdxType_Int;
-  GFID int64_t pdxType_Long;
-  GFID float pdxType_Float;
-  GFID double pdxType_Double;
-  GFID CacheableDatePtr pdxType_Date;
-  GFID char* pdxType_String;
-  GFID wchar_t* pdxType_WideString;
-
-  GFID bool* pdxType_BoolArray;
-  GFARRAYSIZE(pdxType_BoolArray) int32_t pdxType_BoolArray_Size;
-
-  GFID wchar_t* pdxType_WideCharArray;
-  GFARRAYSIZE(pdxType_WideCharArray) int32_t pdxType_WideCharArray_Size;
-
-  GFID char** pdxType_CharArray;
-  GFARRAYSIZE(pdxType_CharArray) int32_t pdxType_CharArray_Size;
-
-  GFID int8_t* pdxType_ByteArray;
-  GFARRAYSIZE(pdxType_ByteArray) int32_t pdxType_ByteArray_Size;
-
-  GFID int16_t* pdxType_ShortArray;
-  GFARRAYSIZE(pdxType_ShortArray) int32_t pdxType_ShortArray_Size;
-
-  GFID int32_t* pdxType_Int32Array;
-  GFARRAYSIZE(pdxType_Int32Array) int32_t pdxType_Int32Array_Size;
-
-  GFID int64_t* pdxType_LongArray;
-  GFARRAYSIZE(pdxType_LongArray) int32_t pdxType_LongArray_Size;
-
-  GFID float* pdxType_FloatArray;
-  GFARRAYSIZE(pdxType_FloatArray) int32_t pdxType_FloatArray_Size;
-
-  GFID double* pdxType_DoubleArray;
-  GFARRAYSIZE(pdxType_DoubleArray) int32_t pdxType_DoubleArray_Size;
-
-  GFID wchar_t** pdxType_WideStringArray;
-  GFARRAYSIZE(pdxType_WideStringArray) int32_t pdxType_WideStringArray_Size;
-
-  CacheableArrayListPtr pdxType_CacheableArrayListPtr;
-  CacheableHashMapPtr pdxType_CacheableHashMapPtr;
-  CacheableHashTablePtr PdxType_CacheableHashTablePtr;
-  CacheableVectorPtr pdxType_CacheableVectorPtr;
-  CacheableHashSetPtr pdxType_CacheableHashSetPtr;
-  CacheableLinkedHashSetPtr pdxType_CacheableLinkedHashSetPtr;
-
- public:
-  PdxAutoMegaType();
-  ~PdxAutoMegaType();
-  bool equals(PdxSerializablePtr obj);
-
-  // Decleare following methods.
-  // Do not write any implementation for the same.
-  // These will be generated in a file
-  // <ClassName>Serializer.cpp
-  const char* getClassName() const;
-  using PdxSerializable::toData;
-  using PdxSerializable::fromData;
-  virtual void toData(PdxWriterPtr pw);
-  virtual void fromData(PdxReaderPtr pr);
-  static PdxSerializable* createDeserializable();
-
-  void initPdxAutoMegaType();
-
- private:
-  void populatePrimitives();
-  bool verifyPrimitives(PdxSerializablePtr);
-
-  void populateArrays();
-  bool verifyArrays(PdxSerializablePtr);
-
-  void populateCacheableContainers();
-  bool verifyCacheableContainers(PdxSerializablePtr);
-};
-
-typedef SharedPtr<PdxAutoMegaType> PdxAutoMegaTypePtr;
-}  // namespace PdxAutoTests
-
-#endif  // GEODE_TESTOBJECT_PDXAUTOMEGATYPE_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/7c7f73cc/src/tests/cpp/testobject/PdxClassV1WithAuto.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PdxClassV1WithAuto.cpp b/src/tests/cpp/testobject/PdxClassV1WithAuto.cpp
deleted file mode 100644
index 9a1fe55..0000000
--- a/src/tests/cpp/testobject/PdxClassV1WithAuto.cpp
+++ /dev/null
@@ -1,781 +0,0 @@
-/*
- * 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 "PdxClassV1WithAuto.hpp"
-
-using namespace apache::geode::client;
-using namespace PdxTestsAuto;
-
-/************************************************************
- *  PdxType1V1
- * *********************************************************/
-int32_t PdxType1V1::m_diffInSameFields = 0;
-bool PdxType1V1::m_useWeakHashMap = false;
-
-PdxType1V1::PdxType1V1() {
-  m_i1 = 34324;
-  m_i2 = 2144;
-  m_i3 = 4645734;
-  m_i4 = 73567;
-}
-
-PdxType1V1::~PdxType1V1() {
-  // TODO Auto-generated destructor stub
-}
-
-void PdxType1V1::reset(bool useWeakHashMap) {
-  m_diffInSameFields = 0;
-  m_useWeakHashMap = useWeakHashMap;
-}
-
-int PdxType1V1::getHashCode() {
-  // TODO:Implement It.
-  return 1;
-}
-
-bool PdxType1V1::equals(PdxSerializablePtr obj) {
-  if (obj == NULLPTR) return false;
-
-  PdxType1V1Ptr pap = dynCast<PdxType1V1Ptr>(obj);
-  if (pap == NULLPTR) return false;
-
-  if (pap == this) return true;
-
-  if (m_i1 + m_diffInSameFields <= pap->m_i1 &&
-      m_i2 + m_diffInSameFields <= pap->m_i2 &&
-      m_i3 + m_diffInSameFields <= pap->m_i3 &&
-      m_i4 + m_diffInSameFields <= pap->m_i4) {
-    return true;
-  }
-
-  return false;
-}
-
-// void PdxType1V1::toData( PdxWriterPtr pw )  {
-//
-//	if (!m_useWeakHashMap)
-//    pw->writeUnreadFields(m_pdxUreadFields);
-//
-//	pw->writeInt("i1", m_i1 + 1);
-//	pw->markIdentityField("i1");
-//	pw->writeInt("i2", m_i2 + 1);
-//	pw->writeInt("i3", m_i3 + 1);
-//	pw->writeInt("i4", m_i4 + 1);
-//
-//	m_diffInSameFields++;
-//
-//	/*
-//	pw->writeBoolean("m_bool", m_bool);
-//	pw->writeByte("m_byte", m_byte);
-//	pw->writeShort("m_int16", m_int16);
-//	pw->writeInt("m_int32", m_int32);
-//	pw->writeLong("m_long", m_long);
-//	pw->writeFloat("m_float", m_float);
-//	pw->writeDouble("m_double", m_double);
-//	pw->writeString("m_string", m_string);
-//	pw->writeBooleanArray("m_boolArray", m_boolArray, 3);
-//	pw->writeByteArray("m_byteArray",m_byteArray, 2);
-//	pw->writeShortArray("m_int16Array", m_int16Array, 2);
-//	pw->writeIntArray("m_int32Array", m_int32Array, 4);
-//	pw->writeLongArray("m_longArray", m_longArray, 2);
-//	pw->writeFloatArray("m_floatArray", m_floatArray, 2);
-//	pw->writeDoubleArray("m_doubleArray", m_doubleArray, 2);
-//  */
-//	//LOGDEBUG("PdxObject::toData() Done......");
-//
-//}
-//
-// void  PdxType1V1::fromData( PdxReaderPtr pr )
-//{
-//	//LOGDEBUG("PdxObject::fromData() start...");
-//
-//  if (!m_useWeakHashMap)
-//    m_pdxUreadFields = pr->readUnreadFields();
-//
-//	m_i1 = pr->readInt("i1");
-//	m_i2 = pr->readInt("i2");
-//	m_i3 = pr->readInt("i3");
-//	m_i4 = pr->readInt("i4");
-//
-//  bool hasField = pr->hasField("i7");
-//
-//  if (hasField)
-//    throw Exception("i7 is not an valid field");
-//
-//  hasField = pr->hasField("i4");
-//
-//	if (!hasField)
-//    throw Exception("i4 is an valid field");
-//
-//	/*
-//	m_bool = pr->readBoolean("m_bool");
-//	//LOGDEBUG("PdxObject::fromData() -1 m_bool = %d", m_bool);
-//	m_byte = pr->readByte("m_byte");
-//	//LOGDEBUG("PdxObject::fromData() -2 m_byte =%d", m_byte);
-//	m_int16 = pr->readShort("m_int16");
-//	//LOGDEBUG("PdxObject::fromData() -3 m_int16=%d", m_int16);
-//	m_int32 = pr->readInt("m_int32");
-//	//LOGDEBUG("PdxObject::fromData() -4 m_int32=%d", m_int32);
-//	m_long = pr->readLong("m_long");
-//	//LOGDEBUG("PdxObject::fromData() -5 m_long=%lld", m_long);
-//	m_float = pr->readFloat("m_float");
-//	//LOGDEBUG("PdxObject::fromData() -6 m_float = %f", m_float);
-//	m_double = pr->readDouble("m_double");
-//	//LOGDEBUG("PdxObject::fromData() -7  m_double=%llf", m_double);
-//	m_string = pr->readString("m_string");
-//	//LOGDEBUG("PdxObject::fromData() -8  m_string=%s", m_string);
-//	m_boolArray = pr->readBooleanArray("m_boolArray");
-//	m_byteArray = pr->readByteArray("m_byteArray");
-//	m_int16Array = pr->readShortArray("m_int16Array");
-//	m_int32Array = pr->readIntArray("m_int32Array");
-//	m_longArray = pr->readLongArray("m_longArray");
-//	m_floatArray = pr->readFloatArray("m_floatArray");
-//	m_doubleArray = pr->readDoubleArray("m_doubleArray");
-//	//LOGDEBUG("PdxObject::fromData() -8  m_boolArray[0]=%d",
-// m_boolArray[0]);
-//	//m_int32 = pr->readInt("m_int32");
-//	*/
-//	LOGDEBUG("PdxObject::fromData() End...");
-//}
-
-CacheableStringPtr PdxType1V1::toString() const {
-  char idbuf[4096];
-  // sprintf(idbuf,"PdxObject: [ m_bool=%d ] [m_byte=%d] [m_int16=%d]
-  // [m_int32=%d] [m_long=%lld] [m_float=%f] [ m_string=%s ]",m_bool, m_byte,
-  // m_int16, m_int32, m_long, m_float, m_string);
-  // sprintf(idbuf,"PdxObject: [ m_bool=%d ] [m_byte=%d] [m_int16=%d]
-  // [m_int32=%d] [m_long=%lld] [m_float=%f] [m_double=%Lf] [ m_string=%s
-  // ]",m_bool, m_byte, m_int16, m_int32, m_long, m_float, m_double, m_string);
-  // sprintf(idbuf,"PdxObject: [ m_bool=%d ] [m_byte=%d] [m_int16=%d]
-  // [m_int32=%d] [m_float=%f] [m_double=%lf] [ m_string=%s ]",m_bool, m_byte,
-  // m_int16, m_int32, m_float, m_double, m_string);
-  sprintf(idbuf, "PdxType1V1:[ m_i1=%d ] [ m_i2=%d ] [ m_i3=%d ] [ m_i4=%d ]",
-          m_i1, m_i2, m_i3, m_i4);
-  return CacheableString::create(idbuf);
-}
-
-/************************************************************
- *  PdxType2V1
- * *********************************************************/
-
-int PdxType2V1::m_diffInSameFields = 0;
-bool PdxType2V1::m_useWeakHashMap = false;
-
-PdxType2V1::PdxType2V1() {
-  m_i1 = 34324;
-  m_i2 = 2144;
-  m_i3 = 4645734;
-  m_i4 = 73567;
-}
-
-PdxType2V1::~PdxType2V1() {
-  // TODO Auto-generated destructor stub
-}
-
-void PdxType2V1::reset(bool useWeakHashMap) {
-  PdxType2V1::m_diffInSameFields = 0;
-  PdxType2V1::m_useWeakHashMap = useWeakHashMap;
-}
-
-int PdxType2V1::getHashCode() {
-  // TODO:Implement It.
-  return 1;
-}
-
-bool PdxType2V1::equals(PdxSerializablePtr obj) {
-  if (obj == NULLPTR) return false;
-
-  PdxType2V1Ptr pap = dynCast<PdxType2V1Ptr>(obj);
-  if (pap == NULLPTR) return false;
-
-  if (pap == this) return true;
-
-  if (m_i1 + m_diffInSameFields <= pap->m_i1 &&
-      m_i2 + m_diffInSameFields <= pap->m_i2 &&
-      m_i3 + m_diffInSameFields <= pap->m_i3 &&
-      m_i4 + m_diffInSameFields <= pap->m_i4) {
-    return true;
-  }
-
-  return false;
-}
-
-// void PdxType2V1::toData( PdxWriterPtr pw )  {
-//
-//	if (!m_useWeakHashMap)
-//    pw->writeUnreadFields(m_unreadFields);
-//
-//	pw->writeInt("i1", m_i1 + 1);
-//	pw->writeInt("i2", m_i2 + 1);
-//	pw->writeInt("i3", m_i3 + 1);
-//	pw->writeInt("i4", m_i4 + 1);
-//}
-//
-// void  PdxType2V1::fromData( PdxReaderPtr pr )
-//{
-//	//LOGDEBUG("PdxObject::fromData() start...");
-//
-//	if (!m_useWeakHashMap)
-//    m_unreadFields = pr->readUnreadFields();
-//
-//	m_i1 = pr->readInt("i1");
-//	m_i2 = pr->readInt("i2");
-//	m_i3 = pr->readInt("i3");
-//	m_i4 = pr->readInt("i4");
-//}
-
-CacheableStringPtr PdxType2V1::toString() const {
-  char idbuf[4096];
-  sprintf(idbuf, "PdxType2V1:[ m_i1=%d ] [ m_i2=%d ] [ m_i3=%d ] [ m_i4=%d ]",
-          m_i1, m_i2, m_i3, m_i4);
-  return CacheableString::create(idbuf);
-}
-
-/************************************************************
- *  PdxType3V1
- * *********************************************************/
-
-int PdxType3V1::m_diffInSameFields = 0;
-int PdxType3V1::m_diffInExtraFields = 0;
-bool PdxType3V1::m_useWeakHashMap = false;
-
-PdxType3V1::PdxType3V1() {
-  m_i1 = 1;
-  m_i2 = 21;
-  m_str1 = (char *)"common";
-  m_i3 = 31;
-  m_i4 = 41;
-  m_i5 = 0;
-  m_str2 = (char *)"0";
-}
-
-PdxType3V1::~PdxType3V1() {
-  // TODO Auto-generated destructor stub
-}
-
-void PdxType3V1::reset(bool useWeakHashMap) {
-  PdxType3V1::m_diffInSameFields = 0;
-  PdxType3V1::m_diffInExtraFields = 0;
-  PdxType3V1::m_useWeakHashMap = useWeakHashMap;
-}
-
-int PdxType3V1::getHashCode() {
-  // TODO:Implement It.
-  return 1;
-}
-
-bool PdxType3V1::equals(PdxSerializablePtr obj) {
-  if (obj == NULLPTR) return false;
-
-  PdxType3V1Ptr pap = dynCast<PdxType3V1Ptr>(obj);
-  if (pap == NULLPTR) return false;
-
-  if (pap == this) return true;
-
-  if (m_i1 + m_diffInSameFields <= pap->m_i1 &&
-      m_i2 + m_diffInSameFields <= pap->m_i2 &&
-      m_i3 + m_diffInSameFields <= pap->m_i3 &&
-      m_i4 + m_diffInSameFields <= pap->m_i4 &&
-      m_i5 + m_diffInExtraFields == pap->m_i5) {
-    if (strcmp(m_str1, pap->m_str1) == 0 && strcmp(m_str2, pap->m_str2) <= 0) {
-      return true;
-    }
-  }
-  return false;
-}
-
-// void PdxType3V1::toData( PdxWriterPtr pw ) {
-//
-//  if (!m_useWeakHashMap)
-//    pw->writeUnreadFields(m_unreadFields);
-//
-//  pw->writeInt("i1", m_i1 + 1);
-//  pw->writeInt("i2", m_i2 + 1);
-//  pw->writeString("m_str1", m_str1);
-//  pw->writeInt("i3", m_i3 + 1);
-//  pw->writeInt("i4", m_i4 + 1);
-//  pw->writeInt("i5", m_i5 + 1);
-//  pw->writeString("m_str2", m_str2);
-//
-//  m_diffInSameFields++;
-//  m_diffInExtraFields++;
-//}
-//
-// void PdxType3V1::fromData( PdxReaderPtr pr )
-//{
-//	//LOGDEBUG("PdxObject::fromData() start...");
-//
-//    if (!m_useWeakHashMap)
-//    	m_unreadFields = pr->readUnreadFields();
-//
-//	m_i1 = pr->readInt("i1");
-//	m_i2 = pr->readInt("i2");
-//	m_str1 = pr->readString("m_str1");
-//	m_i3 = pr->readInt("i3");
-//	m_i4 = pr->readInt("i4");
-//	m_i5 = pr->readInt("i5");
-//	char* tmp = pr->readString("m_str2");
-//
-//  char extraFieldsStr[20];
-//  if (tmp == NULL) {
-//	sprintf(extraFieldsStr, "%d", m_diffInExtraFields);
-//	size_t strSize = strlen(extraFieldsStr) + 1;
-//	m_str2 = new char[strSize];
-//	memcpy(m_str2, extraFieldsStr, strSize);
-//  } else {
-//	 sprintf(extraFieldsStr, "%d" "%s", m_diffInExtraFields, m_str2);
-//	 size_t strSize = strlen(extraFieldsStr) + 1;
-//	 m_str2 = new char[strSize];
-//	 memcpy(m_str2, extraFieldsStr, strSize);
-//  }
-//}
-
-CacheableStringPtr PdxType3V1::toString() const {
-  char idbuf[4096];
-  sprintf(idbuf,
-          "PdxType2V1:[ m_i1=%d ] [ m_i2=%d ] [m_str1=%s] [ m_i3=%d ] [ "
-          "m_i4=%d ] [ m_i5=%d ] [m_str2=%s]",
-          m_i1, m_i2, m_str1, m_i3, m_i4, m_i5, m_str2);
-  return CacheableString::create(idbuf);
-}
-
-/************************************************************
- *  PdxTypesV1R1
- * *********************************************************/
-int PdxTypesV1R1::m_diffInSameFields = 0;
-bool PdxTypesV1R1::m_useWeakHashMap = false;
-
-PdxTypesV1R1::PdxTypesV1R1() {
-  m_i1 = 34324;
-  m_i2 = 2144;
-  m_i3 = 4645734;
-  m_i4 = 73567;
-}
-
-PdxTypesV1R1::~PdxTypesV1R1() {
-  // TODO Auto-generated destructor stub
-}
-
-void PdxTypesV1R1::reset(bool useWeakHashMap) {
-  PdxTypesV1R1::m_diffInSameFields = 0;
-  PdxTypesV1R1::m_useWeakHashMap = useWeakHashMap;
-}
-
-int PdxTypesV1R1::getHashCode() {
-  // TODO:Implement It.
-  return 1;
-}
-
-bool PdxTypesV1R1::equals(PdxSerializablePtr obj) {
-  if (obj == NULLPTR) return false;
-
-  PdxTypesV1R1Ptr pap = dynCast<PdxTypesV1R1Ptr>(obj);
-  if (pap == NULLPTR) return false;
-
-  if (pap == this) return true;
-
-  if (m_i1 + m_diffInSameFields <= pap->m_i1 &&
-      m_i2 + m_diffInSameFields <= pap->m_i2 &&
-      m_i3 + m_diffInSameFields <= pap->m_i3 &&
-      m_i4 + m_diffInSameFields <= pap->m_i4) {
-    return true;
-  }
-  return false;
-}
-
-// void PdxTypesV1R1::toData( PdxWriterPtr pw )  {
-//
-//	if (!m_useWeakHashMap)
-//    pw->writeUnreadFields(m_pdxUreadFields);
-//
-//	pw->writeInt("i1", m_i1 + 1);
-//	pw->writeInt("i2", m_i2 + 1);
-//	pw->writeInt("i3", m_i3 + 1);
-//	pw->writeInt("i4", m_i4 + 1);
-//
-//  m_diffInSameFields++;
-//}
-//
-// void PdxTypesV1R1::fromData( PdxReaderPtr pr )
-//{
-//
-//	if (!m_useWeakHashMap)
-//    m_pdxUreadFields = pr->readUnreadFields();
-//
-//	m_i1 = pr->readInt("i1");
-//	m_i2 = pr->readInt("i2");
-//	m_i3 = pr->readInt("i3");
-//	m_i4 = pr->readInt("i4");
-//}
-
-CacheableStringPtr PdxTypesV1R1::toString() const {
-  char idbuf[4096];
-  sprintf(idbuf, "PdxTypesV1R1:[ m_i1=%d ] [ m_i2=%d ] [ m_i3=%d ] [ m_i4=%d ]",
-          m_i1, m_i2, m_i3, m_i4);
-  return CacheableString::create(idbuf);
-}
-
-/************************************************************
- *  PdxTypesV1R2
- * *********************************************************/
-int PdxTypesV1R2::m_diffInSameFields = 0;
-bool PdxTypesV1R2::m_useWeakHashMap = false;
-
-PdxTypesV1R2::PdxTypesV1R2() {
-  m_i1 = 34324;
-  m_i2 = 2144;
-  m_i3 = 4645734;
-  m_i4 = 73567;
-}
-
-PdxTypesV1R2::~PdxTypesV1R2() {
-  // TODO Auto-generated destructor stub
-}
-
-void PdxTypesV1R2::reset(bool useWeakHashMap) {
-  PdxTypesV1R2::m_diffInSameFields = 0;
-  PdxTypesV1R2::m_useWeakHashMap = useWeakHashMap;
-}
-
-int PdxTypesV1R2::getHashCode() {
-  // TODO:Implement It.
-  return 1;
-}
-
-bool PdxTypesV1R2::equals(PdxSerializablePtr obj) {
-  if (obj == NULLPTR) return false;
-
-  PdxTypesV1R2Ptr pap = dynCast<PdxTypesV1R2Ptr>(obj);
-  if (pap == NULLPTR) return false;
-
-  if (pap == this) return true;
-
-  if (m_i1 + m_diffInSameFields <= pap->m_i1 &&
-      m_i2 + m_diffInSameFields <= pap->m_i2 &&
-      m_i3 + m_diffInSameFields <= pap->m_i3 &&
-      m_i4 + m_diffInSameFields <= pap->m_i4) {
-    return true;
-  }
-  return false;
-}
-
-// void PdxTypesV1R2::toData( PdxWriterPtr pw )  {
-//
-//
-//	if (!m_useWeakHashMap)
-//    pw->writeUnreadFields(m_pdxUreadFields);
-//
-//	pw->writeInt("i1", m_i1 + 1);
-//	pw->writeInt("i2", m_i2 + 1);
-//	pw->writeInt("i3", m_i3 + 1);
-//	pw->writeInt("i4", m_i4 + 1);
-//}
-//
-// void PdxTypesV1R2::fromData( PdxReaderPtr pr )
-//{
-//	//LOGDEBUG("PdxObject::fromData() start...");
-//	if (!m_useWeakHashMap)
-//		m_pdxUreadFields = pr->readUnreadFields();
-//
-//	m_i1 = pr->readInt("i1");
-//	m_i2 = pr->readInt("i2");
-//	m_i3 = pr->readInt("i3");
-//	m_i4 = pr->readInt("i4");
-//}
-
-CacheableStringPtr PdxTypesV1R2::toString() const {
-  char idbuf[4096];
-  sprintf(idbuf, "PdxTypesV1R1:[ m_i1=%d ] [ m_i2=%d ] [ m_i3=%d ] [ m_i4=%d ]",
-          m_i1, m_i2, m_i3, m_i4);
-  return CacheableString::create(idbuf);
-}
-
-/************************************************************
- *  PdxTypesIgnoreUnreadFieldsV1
- * *********************************************************/
-int PdxTypesIgnoreUnreadFieldsV1::m_diffInSameFields = 0;
-bool PdxTypesIgnoreUnreadFieldsV1::m_useWeakHashMap = false;
-
-PdxTypesIgnoreUnreadFieldsV1::PdxTypesIgnoreUnreadFieldsV1() {
-  m_i1 = 34324;
-  m_i2 = 2144;
-  m_i3 = 4645734;
-  m_i4 = 73567;
-}
-
-PdxTypesIgnoreUnreadFieldsV1::~PdxTypesIgnoreUnreadFieldsV1() {
-  // TODO Auto-generated destructor stub
-}
-
-void PdxTypesIgnoreUnreadFieldsV1::reset(bool useWeakHashMap) {
-  PdxTypesIgnoreUnreadFieldsV1::m_diffInSameFields = 0;
-  PdxTypesIgnoreUnreadFieldsV1::m_useWeakHashMap = useWeakHashMap;
-}
-
-int PdxTypesIgnoreUnreadFieldsV1::getHashCode() {
-  // TODO:Implement It.
-  return 1;
-}
-
-bool PdxTypesIgnoreUnreadFieldsV1::equals(PdxSerializablePtr obj) {
-  if (obj == NULLPTR) return false;
-
-  PdxTypesIgnoreUnreadFieldsV1Ptr pap =
-      dynCast<PdxTypesIgnoreUnreadFieldsV1Ptr>(obj);
-  if (pap == NULLPTR) return false;
-
-  if (pap == this) return true;
-
-  if (m_i1 + m_diffInSameFields <= pap->m_i1 &&
-      m_i2 + m_diffInSameFields <= pap->m_i2 &&
-      m_i3 + m_diffInSameFields <= pap->m_i3 &&
-      m_i4 + m_diffInSameFields <= pap->m_i4) {
-    return true;
-  }
-  return false;
-}
-
-// void PdxTypesIgnoreUnreadFieldsV1::toData( PdxWriterPtr pw )  {
-//
-//  if (!m_useWeakHashMap)
-//    pw->writeUnreadFields(m_unreadFields);
-//
-//	pw->writeInt("i1", m_i1 + 1);
-//	pw->markIdentityField("i1");
-//	pw->writeInt("i2", m_i2 + 1);
-//	pw->writeInt("i3", m_i3 + 1);
-//	pw->writeInt("i4", m_i4 + 1);
-//
-//  m_diffInSameFields++;
-//}
-//
-// void PdxTypesIgnoreUnreadFieldsV1::fromData( PdxReaderPtr pr )
-//{
-//	//LOGDEBUG("PdxObject::fromData() start...");
-//
-//	if (!m_useWeakHashMap)
-//    m_unreadFields = pr->readUnreadFields();
-//
-//	m_i1 = pr->readInt("i1");
-//	m_i2 = pr->readInt("i2");
-//	m_i3 = pr->readInt("i3");
-//	m_i4 = pr->readInt("i4");
-//
-//	bool hasField = pr->hasField("i7");
-//	if(hasField)
-//		throw Exception("i7 is not an valid field");
-//
-//	hasField = pr->hasField("i4");
-//  if(!hasField)
-//    throw Exception("i4 is an valid field");
-//
-//}
-
-CacheableStringPtr PdxTypesIgnoreUnreadFieldsV1::toString() const {
-  char idbuf[4096];
-  sprintf(idbuf, "PdxTypesV1R1:[ m_i1=%d ] [ m_i2=%d ] [ m_i3=%d ] [ m_i4=%d ]",
-          m_i1, m_i2, m_i3, m_i4);
-  return CacheableString::create(idbuf);
-}
-
-/************************************************************
- *  PdxVersionedV1
- * *********************************************************/
-
-PdxVersionedV1::PdxVersionedV1() {}
-
-void PdxVersionedV1::init(int32_t size) {
-  m_char = 'C';
-  m_bool = true;
-  m_byte = 0x74;
-  m_int16 = 0xab;
-  m_int32 = 0x2345abdc;
-  m_long = 324897980;
-  m_float = 23324.324f;
-  m_double = 3243298498;
-
-  m_string = (char *)"gfestring";
-
-  m_boolArray = new bool[3];
-  m_boolArray[0] = true;
-  m_boolArray[1] = false;
-  m_boolArray[2] = true;
-
-  m_charArray = new char[2];
-  m_charArray[0] = 'c';
-  m_charArray[1] = 'v';
-
-  m_dateTime = NULLPTR;
-
-  m_int16Array = new int16_t[size];
-  m_int32Array = new int32_t[size];
-  m_longArray = new int64_t[size];
-  m_floatArray = new float[size];
-  m_doubleArray = new double[size];
-
-  for (int i = 0; i < size; i++) {
-    m_int16Array[i] = 0x2332;
-    m_int32Array[i] = 34343 + i;
-    m_longArray[i] = 324324L + i;
-    m_floatArray[i] = 232.565f + i;
-    m_doubleArray[i] = 23423432 + i;
-    // m_stringArray[i] = String.Format("one{0}", i);
-  }
-
-  boolArrayLen = 3;
-  byteArrayLen = 0;
-  shortArrayLen = size;
-  intArrayLen = size;
-  longArrayLen = size;
-  doubleArrayLen = size;
-  floatArrayLen = size;
-  strLenArray = 0;
-}
-
-PdxVersionedV1::PdxVersionedV1(int32_t size) {
-  init(size);
-  LOGDEBUG("PdxVersioned 1");
-}
-
-PdxVersionedV1::~PdxVersionedV1() {
-  // TODO Auto-generated destructor stub
-}
-
-// void PdxVersionedV1::toData( PdxWriterPtr pw )  {
-//  //pw->writeChar("m_char", m_char);
-//  pw->writeBoolean("m_bool", m_bool);
-//  pw->writeByte("m_byte", m_byte);
-//  pw->writeShort("m_int16", m_int16);
-//  pw->writeInt("m_int32", m_int32);
-//  pw->writeLong("m_long", m_long);
-//  pw->writeFloat("m_float", m_float);
-//  pw->writeDouble("m_double", m_double);
-//  pw->writeString("m_string", m_string);
-//  pw->writeBooleanArray("m_boolArray", m_boolArray, 3);
-//  //pw->writeCharArray("m_charArray", m_charArray, 2);
-//  pw->writeDate("m_dateTime", m_dateTime);
-//  pw->writeShortArray("m_int16Array", m_int16Array, 2);
-//  pw->writeIntArray("m_int32Array", m_int32Array, 2);
-//  pw->writeLongArray("m_longArray", m_longArray, 2);
-//  pw->writeFloatArray("m_floatArray", m_floatArray, 2);
-//  pw->writeDoubleArray("m_doubleArray", m_doubleArray, 2);
-//}
-//
-// void PdxVersionedV1::fromData( PdxReaderPtr pr )
-//{
-//	//m_char = pr->readChar("m_char");
-//	m_bool = pr->readBoolean("m_bool");
-//  m_byte = pr->readByte("m_byte");
-//  m_int16 = pr->readShort("m_int16");
-//  m_int32 = pr->readInt("m_int32");
-//  m_long = pr->readLong("m_long");
-//  m_float = pr->readFloat("m_float");
-//  m_double = pr->readDouble("m_double");
-//  m_string = pr->readString("m_string");
-//  m_boolArray = pr->readBooleanArray("m_boolArray", boolArrayLen);
-//  //m_charArray = pr->readCharArray("m_charArray");
-//  m_dateTime = pr->readDate("m_dateTime");
-//  m_int16Array = pr->readShortArray("m_int16Array", shortArrayLen);
-//  m_int32Array = pr->readIntArray("m_int32Array", intArrayLen);
-//  m_longArray = pr->readLongArray("m_longArray", longArrayLen);
-//  m_floatArray = pr->readFloatArray("m_floatArray", floatArrayLen);
-//  m_doubleArray = pr->readDoubleArray("m_doubleArray", doubleArrayLen);
-//}
-
-CacheableStringPtr PdxVersionedV1::toString() const {
-  char idbuf[4096];
-  // sprintf(idbuf,"PdxTypesV1R1:[ m_i1=%d ] [ m_i2=%d ] [ m_i3=%d ] [ m_i4=%d
-  // ]", m_i1, m_i2, m_i3, m_i4 );
-  return CacheableString::create(idbuf);
-}
-
-/************************************************************
- *  TestKey
- * *********************************************************/
-
-TestKeyV1::TestKeyV1() {}
-
-TestKeyV1::TestKeyV1(char *id) {
-  size_t strSize = strlen(id) + 1;
-  _id = new char[strSize];
-  memcpy(_id, id, strSize);
-}
-
-/************************************************************
- *  TestDiffTypePdxSV1
- * *********************************************************/
-
-TestDiffTypePdxSV1::TestDiffTypePdxSV1() {}
-
-TestDiffTypePdxSV1::TestDiffTypePdxSV1(bool init) {
-  if (init) {
-    _id = (char *)"id:100";
-    _name = (char *)"HK";
-  }
-}
-
-bool TestDiffTypePdxSV1::equals(TestDiffTypePdxSV1 *obj) {
-  if (obj == NULL) return false;
-
-  TestDiffTypePdxSV1 *other = dynamic_cast<TestDiffTypePdxSV1 *>(obj);
-  if (other == NULL) return false;
-
-  if (strcmp(other->_id, _id) == 0 && strcmp(other->_name, _name) == 0) {
-    return true;
-  }
-
-  return false;
-}
-
-/************************************************************
- *  TestEqualsV1
- * *********************************************************/
-
-TestEqualsV1::TestEqualsV1() {
-  i1 = 1;
-  i2 = 0;
-  s1 = (char *)"s1";
-  // TODO: Uncomment it.
-  // sArr = ;
-  // intArr = ;
-}
-
-// void TestEqualsV1::toData( PdxWriterPtr pw )  {
-//	pw->writeInt("i1", i1);
-//	pw->writeInt("i2", i2);
-//	pw->writeString("s1", s1);
-//	//pw->writeStringArray("sArr", sArr, 2);
-//	//pw->writeIntArray("intArr", intArr, 2);
-//	//pw->writeObject("intArrObject", intArr);
-//	//pw->writeObject("sArrObject", sArr);
-//}
-//
-// void TestEqualsV1::fromData( PdxReaderPtr pr )
-//{
-//  i1 = pr->readInt("i1");
-//  i2 = pr->readInt("i2");
-//  s1 = pr->readString("s1");
-//  //sArr = pr->readStringArray("sArr");
-//  //intArr = pr->readIntArray("intArr");
-//  //intArr = (int[]) reader.ReadObject("intArrObject");
-//  //sArr = (string[]) reader.ReadObject("sArrObject");
-//}
-
-CacheableStringPtr TestEqualsV1::toString() const {
-  char idbuf[1024];
-  sprintf(idbuf, "TestEqualsV1:[i1=%d ] [i2=%d] ", i1, i2);
-  return CacheableString::create(idbuf);
-}

http://git-wip-us.apache.org/repos/asf/geode-native/blob/7c7f73cc/src/tests/cpp/testobject/PdxClassV1WithAuto.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PdxClassV1WithAuto.hpp b/src/tests/cpp/testobject/PdxClassV1WithAuto.hpp
deleted file mode 100644
index ad4885b..0000000
--- a/src/tests/cpp/testobject/PdxClassV1WithAuto.hpp
+++ /dev/null
@@ -1,572 +0,0 @@
-#pragma once
-
-#ifndef GEODE_TESTOBJECT_PDXCLASSV1WITHAUTO_H_
-#define GEODE_TESTOBJECT_PDXCLASSV1WITHAUTO_H_
-
-/*
- * 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 <geode/PdxSerializable.hpp>
-#include <geode/GeodeCppCache.hpp>
-#include <geode/PdxWriter.hpp>
-#include <geode/PdxReader.hpp>
-
-#ifdef _WIN32
-#ifdef BUILD_TESTOBJECT
-#define TESTOBJECT_EXPORT LIBEXP
-#else
-#define TESTOBJECT_EXPORT LIBIMP
-#endif
-#else
-#define TESTOBJECT_EXPORT
-#endif
-
-using namespace apache::geode::client;
-
-#define GFIGNORE(X) X
-#define GFID
-#define GFARRAYSIZE(X)
-#define GFARRAYELEMSIZE(X)
-#define GFEXCLUDE
-#define GFUNREAD
-
-namespace PdxTestsAuto {
-
-/************************************************************
- *  PdxType1V1
- * *********************************************************/
-class GFIGNORE(TESTOBJECT_EXPORT) PdxType1V1 : public PdxSerializable {
- private:
-  GFEXCLUDE static int32_t m_diffInSameFields;
-  GFEXCLUDE static bool m_useWeakHashMap;
-  GFUNREAD PdxUnreadFieldsPtr m_pdxUreadFields;
-
-  GFID int32_t m_i1;  // = 34324;
-  int32_t m_i2;       // = 2144;
-  int32_t m_i3;       // = 4645734;
-  int32_t m_i4;       // = 73567;
-
- public:
-  PdxType1V1();
-
-  virtual ~PdxType1V1();
-
-  static void reset(bool useWeakHashMap);
-
-  int getHashCode();
-
-  bool equals(PdxSerializablePtr obj);
-
-  CacheableStringPtr toString() const;
-
-  using PdxSerializable::toData;
-  using PdxSerializable::fromData;
-
-  virtual void fromData(PdxReaderPtr pr);
-
-  virtual void toData(PdxWriterPtr pw);
-
-  const char* getClassName() const; /* {
-     return "PdxTestsAuto::PdxTypes1V";
-   }*/
-
-  static PdxSerializable* createDeserializable(); /* {
-     return new PdxType1V1();
-   }*/
-};
-typedef SharedPtr<PdxType1V1> PdxType1V1Ptr;
-
-/************************************************************
- *  PdxType2V1
- * *********************************************************/
-class GFIGNORE(TESTOBJECT_EXPORT) PdxType2V1 : public PdxSerializable {
- private:
-  GFEXCLUDE static int m_diffInSameFields;
-  GFEXCLUDE static bool m_useWeakHashMap;
-  GFUNREAD PdxUnreadFieldsPtr m_unreadFields;
-  int32_t m_i1;
-  int32_t m_i2;
-  int32_t m_i3;
-  int32_t m_i4;
-
- public:
-  PdxType2V1();
-
-  virtual ~PdxType2V1();
-
-  static void reset(bool useWeakHashMap);
-
-  int getHashCode();
-
-  bool equals(PdxSerializablePtr obj);
-
-  CacheableStringPtr toString() const;
-
-  using PdxSerializable::toData;
-  using PdxSerializable::fromData;
-
-  virtual void fromData(PdxReaderPtr pr);
-
-  virtual void toData(PdxWriterPtr pw);
-
-  const char* getClassName() const; /* {
-      return "PdxTestsAuto::PdxTypes2V";
-          }*/
-
-  static PdxSerializable* createDeserializable(); /*{
-    return new PdxType2V1();
-  }*/
-};
-typedef SharedPtr<PdxType2V1> PdxType2V1Ptr;
-
-/************************************************************
- *  PdxType3V1
- * *********************************************************/
-
-class GFIGNORE(TESTOBJECT_EXPORT) PdxType3V1 : public PdxSerializable {
- private:
-  GFEXCLUDE static int m_diffInSameFields;
-  GFEXCLUDE static int m_diffInExtraFields;
-  GFEXCLUDE static bool m_useWeakHashMap;
-  GFUNREAD PdxUnreadFieldsPtr m_unreadFields;
-  int32_t m_i1;
-  int32_t m_i2;
-  char* m_str1;
-  int32_t m_i3;
-  int32_t m_i4;
-  int32_t m_i5;
-  char* m_str2;
-
- public:
-  PdxType3V1();
-
-  virtual ~PdxType3V1();
-
-  CacheableStringPtr toString() const;
-
-  static void reset(bool useWeakHashMap);
-
-  int getHashCode();
-
-  bool equals(PdxSerializablePtr obj);
-
-  using PdxSerializable::toData;
-  using PdxSerializable::fromData;
-
-  virtual void fromData(PdxReaderPtr pr);
-
-  virtual void toData(PdxWriterPtr pw);
-
-  const char* getClassName() const; /* {
-      return "PdxTestsAuto::PdxTypes3V";
-          }*/
-
-  static PdxSerializable* createDeserializable(); /*{
-    return new PdxType3V1();
-  }*/
-};
-typedef SharedPtr<PdxType3V1> PdxType3V1Ptr;
-
-/************************************************************
- *  PdxTypesV1R1
- * *********************************************************/
-class GFIGNORE(TESTOBJECT_EXPORT) PdxTypesV1R1 : public PdxSerializable {
- private:
-  GFEXCLUDE static int m_diffInSameFields;
-  GFEXCLUDE static bool m_useWeakHashMap;
-  GFUNREAD PdxUnreadFieldsPtr m_pdxUreadFields;
-  int32_t m_i1;
-  int32_t m_i2;
-  int32_t m_i3;
-  int32_t m_i4;
-
- public:
-  PdxTypesV1R1();
-
-  virtual ~PdxTypesV1R1();
-
-  CacheableStringPtr toString() const;
-
-  static void reset(bool useWeakHashMap);
-
-  int getHashCode();
-
-  bool equals(PdxSerializablePtr obj);
-
-  using PdxSerializable::toData;
-  using PdxSerializable::fromData;
-
-  virtual void fromData(PdxReaderPtr pr);
-
-  virtual void toData(PdxWriterPtr pw);
-
-  const char* getClassName() const; /* {
-      return "PdxTestsAuto::PdxTypesR1";
-          }*/
-
-  static PdxSerializable* createDeserializable(); /* {
-     return new PdxTypesV1R1();
-   }*/
-};
-typedef SharedPtr<PdxTypesV1R1> PdxTypesV1R1Ptr;
-
-/************************************************************
- *  PdxTypesV1R2
- * *********************************************************/
-class GFIGNORE(TESTOBJECT_EXPORT) PdxTypesV1R2 : public PdxSerializable {
- private:
-  GFEXCLUDE static int m_diffInSameFields;
-  GFEXCLUDE static bool m_useWeakHashMap;
-  GFUNREAD PdxUnreadFieldsPtr m_pdxUreadFields;
-  int32_t m_i1;
-  int32_t m_i2;
-  int32_t m_i3;
-  int32_t m_i4;
-
- public:
-  PdxTypesV1R2();
-
-  virtual ~PdxTypesV1R2();
-
-  static void reset(bool useWeakHashMap);
-
-  int getHashCode();
-
-  bool equals(PdxSerializablePtr obj);
-
-  CacheableStringPtr toString() const;
-
-  using PdxSerializable::toData;
-  using PdxSerializable::fromData;
-
-  virtual void fromData(PdxReaderPtr pr);
-
-  virtual void toData(PdxWriterPtr pw);
-
-  const char* getClassName() const; /* {
-      return "PdxTestsAuto::PdxTypesR2";
-          }*/
-
-  static PdxSerializable* createDeserializable(); /*{
-    return new PdxTypesV1R2();
-  }*/
-};
-typedef SharedPtr<PdxTypesV1R2> PdxTypesV1R2Ptr;
-
-/************************************************************
- *  PdxTypesIgnoreUnreadFieldsV1
- * *********************************************************/
-class GFIGNORE(TESTOBJECT_EXPORT) PdxTypesIgnoreUnreadFieldsV1
-    : public PdxSerializable {
- private:
-  GFEXCLUDE static int m_diffInSameFields;
-  GFEXCLUDE static bool m_useWeakHashMap;
-  GFUNREAD PdxUnreadFieldsPtr m_unreadFields;
-  int32_t m_i1;
-  int32_t m_i2;
-  int32_t m_i3;
-  int32_t m_i4;
-
- public:
-  PdxTypesIgnoreUnreadFieldsV1();
-
-  virtual ~PdxTypesIgnoreUnreadFieldsV1();
-
-  CacheableStringPtr toString() const;
-
-  static void reset(bool useWeakHashMap);
-
-  int getHashCode();
-
-  bool equals(PdxSerializablePtr obj);
-
-  using PdxSerializable::toData;
-  using PdxSerializable::fromData;
-
-  virtual void fromData(PdxReaderPtr pr);
-
-  virtual void toData(PdxWriterPtr pw);
-
-  const char* getClassName() const; /* {
-      return "PdxTestsAuto::PdxTypesIgnoreUnreadFields";
-          }*/
-
-  static PdxSerializable* createDeserializable(); /* {
-     return new PdxTypesIgnoreUnreadFieldsV1();
-   }*/
-};
-typedef SharedPtr<PdxTypesIgnoreUnreadFieldsV1> PdxTypesIgnoreUnreadFieldsV1Ptr;
-
-/************************************************************
- *  PdxVersionedV1
- * *********************************************************/
-
-class GFIGNORE(TESTOBJECT_EXPORT) PdxVersionedV1 : public PdxSerializable {
- private:
-  GFEXCLUDE char m_char;
-  bool m_bool;
-  int8_t m_byte;
-  int16_t m_int16;
-  int32_t m_int32;
-  int64_t m_long;
-  float m_float;
-  double m_double;
-  char* m_string;
-  bool* m_boolArray;
-  GFEXCLUDE char* m_charArray;
-  CacheableDatePtr m_dateTime;
-  int16_t* m_int16Array;
-  int32_t* m_int32Array;
-  int64_t* m_longArray;
-  float* m_floatArray;
-  double* m_doubleArray;
-  GFEXCLUDE int8_t** m_byteByteArray;  // byte[][]
-  char** m_stringArray;                // string[]
-
-  // IDictionary<object, object> m_map;
-  // List<object> m_list;
-
-  GFARRAYSIZE(m_boolArray) int32_t boolArrayLen;
-  GFEXCLUDE int32_t byteArrayLen;
-  GFARRAYSIZE(m_int16Array) int32_t shortArrayLen;
-  GFARRAYSIZE(m_int32Array) int32_t intArrayLen;
-  GFARRAYSIZE(m_longArray) int32_t longArrayLen;
-  GFARRAYSIZE(m_doubleArray) int32_t doubleArrayLen;
-  GFARRAYSIZE(m_floatArray) int32_t floatArrayLen;
-  GFARRAYSIZE(m_stringArray) int32_t strLenArray;
-
- public:
-  PdxVersionedV1();
-
-  PdxVersionedV1(int32_t size);
-
-  virtual ~PdxVersionedV1();
-
-  void init(int32_t size);
-
-  CacheableStringPtr toString() const;
-
-  using PdxSerializable::toData;
-  using PdxSerializable::fromData;
-
-  virtual void fromData(PdxReaderPtr pr);
-
-  virtual void toData(PdxWriterPtr pw);
-
-  const char* getClassName() const; /* {
-     return "PdxTestsAuto::PdxVersioned";
-   }*/
-
-  static PdxSerializable* createDeserializable(); /* {
-     return new PdxVersionedV1();
-   }*/
-};
-typedef SharedPtr<PdxVersionedV1> PdxVersionedV1Ptr;
-
-/************************************************************
- *  TestKey
- * *********************************************************/
-
-class GFIGNORE(TESTOBJECT_EXPORT) TestKeyV1 {
- public:
-  char* _id;
-
- public:
-  TestKeyV1();
-
-  TestKeyV1(char* id);
-};
-
-/************************************************************
- *  TestKey
- * *********************************************************/
-
-class GFIGNORE(TESTOBJECT_EXPORT) TestDiffTypePdxSV1 {
- public:
-  char* _id;
-  char* _name;
-
- public:
-  TestDiffTypePdxSV1();
-
-  TestDiffTypePdxSV1(bool init);
-
-  bool equals(TestDiffTypePdxSV1* obj);
-};
-
-/************************************************************
- *  TestPdxSerializerForV1
- * *********************************************************/
-static const char* V1CLASSNAME1 = "PdxTestsAuto.TestKey";
-static const char* V1CLASSNAME2 = "PdxTestsAuto.TestDiffTypePdxS";
-
-class TestPdxSerializerForV1 : public PdxSerializer {
- public:
-  static void deallocate(void* testObject, const char* className) {
-    // ASSERT(strcmp(className, V1CLASSNAME1) == 0 || strcmp(className,
-    // V1CLASSNAME2) == 0 , "Unexpected classname in deallocate()");
-    LOGINFO("TestPdxSerializer::deallocate called");
-    if (strcmp(className, V1CLASSNAME1) == 0) {
-      PdxTestsAuto::TestKeyV1* tkv1 =
-          reinterpret_cast<PdxTestsAuto::TestKeyV1*>(testObject);
-      delete tkv1;
-    } else if (strcmp(className, V1CLASSNAME2) == 0) {
-      PdxTestsAuto::TestDiffTypePdxSV1* dtpv1 =
-          reinterpret_cast<PdxTestsAuto::TestDiffTypePdxSV1*>(testObject);
-      delete dtpv1;
-    } else {
-      LOGINFO("TestPdxSerializerForV1::deallocate Invalid Class Name");
-    }
-  }
-
-  static uint32_t objectSize(void* testObject, const char* className) {
-    // ASSERT(strcmp(className, V1CLASSNAME1) == 0 || strcmp(className,
-    // V1CLASSNAME2) == 0, "Unexpected classname in objectSize()");
-    LOGINFO("TestPdxSerializer::objectSize called");
-    return 12345;  // dummy value
-  }
-
-  UserDeallocator getDeallocator(const char* className) {
-    // ASSERT(strcmp(className, V1CLASSNAME1) == 0 || strcmp(className,
-    // V1CLASSNAME2) == 0, "Unexpected classname in getDeallocator");
-    return deallocate;
-  }
-
-  UserObjectSizer getObjectSizer(const char* className) {
-    // ASSERT(strcmp(className, V1CLASSNAME1) == 0 || strcmp(className,
-    // V1CLASSNAME2) == 0, "Unexpected classname in getObjectSizer");
-    return objectSize;
-  }
-
-  void* fromDataForTestKeyV1(PdxReaderPtr pr) {
-    try {
-      PdxTestsAuto::TestKeyV1* tkv1 = new PdxTestsAuto::TestKeyV1;
-      tkv1->_id = pr->readString("_id");
-      return (void*)tkv1;
-    } catch (...) {
-      return NULL;
-    }
-  }
-
-  bool toDataForTestKeyV1(void* testObject, PdxWriterPtr pw) {
-    try {
-      PdxTestsAuto::TestKeyV1* tkv1 =
-          reinterpret_cast<PdxTestsAuto::TestKeyV1*>(testObject);
-      pw->writeString("_id", tkv1->_id);
-
-      return true;
-    } catch (...) {
-      return false;
-    }
-  }
-
-  void* fromDataForTestDiffTypePdxSV1(PdxReaderPtr pr) {
-    try {
-      PdxTestsAuto::TestDiffTypePdxSV1* dtpv1 =
-          new PdxTestsAuto::TestDiffTypePdxSV1;
-      dtpv1->_id = pr->readString("_id");
-      dtpv1->_name = pr->readString("_name");
-      return (void*)dtpv1;
-    } catch (...) {
-      return NULL;
-    }
-  }
-
-  bool toDataForTestDiffTypePdxSV1(void* testObject, PdxWriterPtr pw) {
-    try {
-      PdxTestsAuto::TestDiffTypePdxSV1* dtpv1 =
-          reinterpret_cast<PdxTestsAuto::TestDiffTypePdxSV1*>(testObject);
-      pw->writeString("_id", dtpv1->_id);
-      pw->writeString("_name", dtpv1->_name);
-
-      return true;
-    } catch (...) {
-      return false;
-    }
-  }
-
-  void* fromData(const char* className, PdxReaderPtr pr);
-  //{
-  //  //ASSERT(strcmp(className, V1CLASSNAME1) == 0 || strcmp(className,
-  //  V1CLASSNAME2) == 0, "Unexpected classname in fromData");
-
-  //  if (strcmp(className, V1CLASSNAME2) == 0) {
-  //    return fromDataForTestDiffTypePdxSV1(pr);
-
-  //  }else if(strcmp(className, V1CLASSNAME1) == 0){
-  //  	return fromDataForTestKeyV1(pr);
-
-  //  }else{
-  //    LOGINFO("TestPdxSerializerForV1::fromdata() Invalid Class Name");
-  //    return NULL;
-  //  }
-  //}
-
-  bool toData(void* testObject, const char* className, PdxWriterPtr pw);
-  //{
-  //  //ASSERT(strcmp(className, V1CLASSNAME1) == 0 || strcmp(className,
-  //  V1CLASSNAME2) == 0, "Unexpected classname in toData");
-
-  //  if (strcmp(className, V1CLASSNAME2) == 0) {
-  //    return toDataForTestDiffTypePdxSV1(testObject, pw);
-
-  //  } else if(strcmp(className, V1CLASSNAME1) == 0){
-  //  	return toDataForTestKeyV1(testObject, pw);
-
-  //  }else{
-  //    LOGINFO("TestPdxSerializerForV1::fromdata() Invalid Class Name");
-  //    return false;
-  //  }
-  //}
-};
-
-/************************************************************
- *  TestEqualsV1
- * *********************************************************/
-
-class GFIGNORE(TESTOBJECT_EXPORT) TestEqualsV1 : public PdxSerializable {
- private:
-  int32_t i1;
-  int32_t i2;
-  char* s1;
-  GFEXCLUDE char** sArr;
-  GFEXCLUDE int32_t* intArr;
-
- public:
-  TestEqualsV1();
-
-  CacheableStringPtr toString() const;
-
-  using PdxSerializable::toData;
-  using PdxSerializable::fromData;
-
-  virtual void fromData(PdxReaderPtr pr);
-
-  virtual void toData(PdxWriterPtr pw);
-
-  const char* getClassName() const; /* {
-      return "PdxTestsAuto::TestEquals";
-    }*/
-
-  static PdxSerializable* createDeserializable(); /* {
-     return new TestEqualsV1();
-   }*/
-};
-
-} /* namespace PdxTestsAuto */
-
-#endif  // GEODE_TESTOBJECT_PDXCLASSV1WITHAUTO_H_

http://git-wip-us.apache.org/repos/asf/geode-native/blob/7c7f73cc/src/tests/cpp/testobject/PdxClassV2WithAuto.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cpp/testobject/PdxClassV2WithAuto.cpp b/src/tests/cpp/testobject/PdxClassV2WithAuto.cpp
deleted file mode 100644
index 60548c2..0000000
--- a/src/tests/cpp/testobject/PdxClassV2WithAuto.cpp
+++ /dev/null
@@ -1,843 +0,0 @@
-/*
- * 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 "PdxClassV2WithAuto.hpp"
-
-using namespace apache::geode::client;
-using namespace PdxTestsAuto;
-
-/************************************************************
-*  PdxType1V2
-* *********************************************************/
-int32_t PdxTypes1V2::m_diffInSameFields = 0;
-int32_t PdxTypes1V2::m_diffInExtraFields = 0;
-bool PdxTypes1V2::m_useWeakHashMap = false;
-
-PdxTypes1V2::PdxTypes1V2() {
-  m_i1 = 34324;
-  m_i2 = 2144;
-  m_i3 = 4645734;
-  m_i4 = 73567;
-  m_i5 = 0;
-  m_i6 = 0;
-}
-
-PdxTypes1V2::~PdxTypes1V2() {
-  // TODO Auto-generated destructor stub
-}
-
-void PdxTypes1V2::reset(bool useWeakHashMap) {
-  PdxTypes1V2::m_diffInSameFields = 0;
-  PdxTypes1V2::m_diffInExtraFields = 0;
-  PdxTypes1V2::m_useWeakHashMap = useWeakHashMap;
-}
-
-int PdxTypes1V2::getHashCode() {
-  // TODO:Implement It.
-  return 1;
-}
-
-bool PdxTypes1V2::equals(PdxSerializablePtr obj) {
-  if (obj == NULLPTR) return false;
-
-  PdxTypes1V2Ptr pap = dynCast<PdxTypes1V2Ptr>(obj);
-  if (pap == NULLPTR) return false;
-
-  if (pap == this) return true;
-
-  if (m_i1 + m_diffInSameFields <= pap->m_i1 &&
-      m_i2 + m_diffInSameFields <= pap->m_i2 &&
-      m_i3 + m_diffInSameFields <= pap->m_i3 &&
-      m_i4 + m_diffInSameFields <= pap->m_i4 &&
-      m_i5 + m_diffInExtraFields == pap->m_i5 &&
-      m_i6 + m_diffInExtraFields == pap->m_i6) {
-    return true;
-  }
-
-  return false;
-}
-
-// void PdxTypes1V2::toData(PdxWriterPtr pw)  {
-//	//
-//	if (!m_useWeakHashMap)
-//	  pw->writeUnreadFields(m_pdxUreadFields);
-//
-//	pw->writeInt("i1", m_i1 + 1);
-//	pw->markIdentityField("i1");
-//	pw->writeInt("i2", m_i2 + 1);
-//	pw->writeInt("i3", m_i3 + 1);
-//	pw->writeInt("i4", m_i4 + 1);
-//	pw->writeInt("i5", m_i5 + 1);
-//	pw->writeInt("i6", m_i6 + 1);
-//
-//	m_diffInSameFields++;
-//	m_diffInExtraFields++;
-//	//LOGDEBUG("PdxObject::toData() Done......");
-//}
-//
-// void PdxTypes1V2::fromData(PdxReaderPtr pr) {
-//	//LOGDEBUG("PdxObject::fromData() start...");
-//	m_i1 = pr->readInt("i1");
-//	bool isIdentity = pr->isIdentityField("i2");
-//	if (isIdentity)
-//		throw Exception("i2 is not identity field");
-//	//
-//	if (!m_useWeakHashMap)
-//		m_pdxUreadFields = pr->readUnreadFields();
-//
-//	m_i2 = pr->readInt("i2");
-//	m_i3 = pr->readInt("i3");
-//	m_i4 = pr->readInt("i4");
-//	m_i5 = pr->readInt("i5");
-//	m_i6 = pr->readInt("i6");
-//
-//	//LOGDEBUG("PdxType1V2::fromData() End...");
-//}
-
-CacheableStringPtr PdxTypes1V2::toString() const {
-  char idbuf[4096];
-  sprintf(idbuf,
-          "PdxType1V1:[ m_i1=%d ] [ m_i2=%d ] [ m_i3=%d ] [ m_i4=%d ] [ "
-          "m_i5=%d ] [ m_i6=%d ] [ m_diffInExtraFields=%d ]",
-          m_i1, m_i2, m_i3, m_i4, m_i5, m_i6, m_diffInExtraFields);
-  return CacheableString::create(idbuf);
-}
-
-/************************************************************
-*  PdxTypes2V2
-* *********************************************************/
-
-int PdxTypes2V2::m_diffInSameFields = 0;
-int PdxTypes2V2::m_diffInExtraFields = 0;
-bool PdxTypes2V2::m_useWeakHashMap = false;
-
-PdxTypes2V2::PdxTypes2V2() {
-  m_i1 = 34324;
-  m_i2 = 2144;
-  m_i3 = 4645734;
-  m_i4 = 73567;
-  m_i5 = 0;
-  m_i6 = 0;
-}
-
-PdxTypes2V2::~PdxTypes2V2() {
-  // TODO Auto-generated destructor stub
-}
-
-void PdxTypes2V2::reset(bool useWeakHashMap) {
-  PdxTypes2V2::m_diffInSameFields = 0;
-  PdxTypes2V2::m_diffInExtraFields = 0;
-  PdxTypes2V2::m_useWeakHashMap = useWeakHashMap;
-}
-
-int PdxTypes2V2::getHashCode() {
-  // TODO:Implement It.
-  return 1;
-}
-
-bool PdxTypes2V2::equals(PdxSerializablePtr obj) {
-  if (obj == NULLPTR) return false;
-
-  PdxTypes2V2Ptr pap = dynCast<PdxTypes2V2Ptr>(obj);
-  if (pap == NULLPTR) return false;
-
-  if (pap == this) return true;
-
-  if (m_i1 + m_diffInSameFields <= pap->m_i1 &&
-      m_i2 + m_diffInSameFields <= pap->m_i2 &&
-      m_i3 + m_diffInSameFields <= pap->m_i3 &&
-      m_i4 + m_diffInSameFields <= pap->m_i4 &&
-      m_i5 + m_diffInExtraFields == pap->m_i5 &&
-      m_i6 + m_diffInExtraFields == pap->m_i6) {
-    return true;
-  }
-
-  return false;
-}
-
-// void PdxTypes2V2::toData(PdxWriterPtr pw)  {
-//
-//	if (!m_useWeakHashMap)
-//	  pw->writeUnreadFields(m_unreadFields);
-//
-//	pw->writeInt("i1", m_i1 + 1);
-//	pw->writeInt("i2", m_i2 + 1);
-//	pw->writeInt("i5", m_i5 + 1);
-//	pw->writeInt("i6", m_i6 + 1);
-//	pw->writeInt("i3", m_i3 + 1);
-//	pw->writeInt("i4", m_i4 + 1);
-//
-//	m_diffInExtraFields++;
-//	m_diffInSameFields++;
-//}
-//
-// void PdxTypes2V2::fromData(PdxReaderPtr pr) {
-//	//LOGDEBUG("PdxObject::fromData() start...");
-//	//
-//	if (!m_useWeakHashMap)
-//		m_unreadFields = pr->readUnreadFields();
-//
-//	m_i1 = pr->readInt("i1");
-//	m_i2 = pr->readInt("i2");
-//	m_i5 = pr->readInt("i5");
-//	m_i6 = pr->readInt("i6");
-//	m_i3 = pr->readInt("i3");
-//	m_i4 = pr->readInt("i4");
-//}
-
-CacheableStringPtr PdxTypes2V2::toString() const {
-  char idbuf[4096];
-  sprintf(idbuf,
-          "PdxTypes2V2:[ m_i1=%d ] [ m_i2=%d ] [ m_i3=%d ] [ m_i4=%d ] [ "
-          "m_i5=%d ] [ m_i6=%d ]",
-          m_i1, m_i2, m_i3, m_i4, m_i5, m_i6);
-  return CacheableString::create(idbuf);
-}
-
-/************************************************************
-*  PdxTypes3V2
-* *********************************************************/
-
-int PdxTypes3V2::m_diffInSameFields = 0;
-int PdxTypes3V2::m_diffInExtraFields = 0;
-bool PdxTypes3V2::m_useWeakHashMap = false;
-
-PdxTypes3V2::PdxTypes3V2() {
-  m_i1 = 1;
-  m_i2 = 21;
-  m_str1 = (char *)"common";
-  m_i4 = 41;
-  m_i3 = 31;
-  m_i6 = 0;
-  m_str3 = (char *)"0";
-}
-
-PdxTypes3V2::~PdxTypes3V2() {
-  // TODO Auto-generated destructor stub
-}
-
-void PdxTypes3V2::reset(bool useWeakHashMap) {
-  PdxTypes3V2::m_diffInSameFields = 0;
-  PdxTypes3V2::m_diffInExtraFields = 0;
-  PdxTypes3V2::m_useWeakHashMap = useWeakHashMap;
-}
-
-int PdxTypes3V2::getHashCode() {
-  // TODO:Implement It.
-  return 1;
-}
-
-bool PdxTypes3V2::equals(PdxSerializablePtr obj) {
-  if (obj == NULLPTR) return false;
-
-  PdxTypes3V2Ptr pap = dynCast<PdxTypes3V2Ptr>(obj);
-  if (pap == NULLPTR) return false;
-
-  if (pap == this) return true;
-
-  char extraFieldsStr[20];
-  char *tmp = pap->m_str3;
-  if (tmp == NULL) {
-    sprintf(extraFieldsStr, "%d", m_diffInExtraFields);
-    size_t strSize = strlen(extraFieldsStr) + 1;
-    pap->m_str3 = new char[strSize];
-    memcpy(pap->m_str3, extraFieldsStr, strSize);
-  } else {
-    sprintf(extraFieldsStr,
-            "%d"
-            "%s",
-            m_diffInExtraFields, pap->m_str3);
-    size_t strSize = strlen(extraFieldsStr) + 1;
-    pap->m_str3 = new char[strSize];
-    memcpy(pap->m_str3, extraFieldsStr, strSize);
-  }
-
-  if (m_i1 + m_diffInSameFields <= pap->m_i1 &&
-      m_i2 + m_diffInSameFields <= pap->m_i2 &&
-      m_i3 + m_diffInSameFields <= pap->m_i3 &&
-      m_i4 + m_diffInSameFields <= pap->m_i4 &&
-      m_i6 + m_diffInExtraFields == pap->m_i6) {
-    if (strcmp(m_str1, pap->m_str1) == 0 && strcmp(m_str3, pap->m_str3) <= 0) {
-      return true;
-    }
-  }
-  return false;
-}
-
-// void PdxTypes3V2::toData( PdxWriterPtr pw )  {
-// //
-// if (!m_useWeakHashMap)
-//   pw->writeUnreadFields(m_unreadFields);
-//
-// pw->writeInt("i1", m_i1 + 1);
-// pw->writeInt("i2", m_i2 + 1);
-// pw->writeString("m_str1", m_str1);
-// pw->writeInt("i4", m_i4 + 1);
-// pw->writeInt("i3", m_i3 + 1);
-// pw->writeInt("i6", m_i6 + 1);
-// pw->writeString("m_str3", m_str3);
-//
-// m_diffInExtraFields++;
-// m_diffInSameFields++;
-// }
-//
-// void PdxTypes3V2::fromData( PdxReaderPtr pr )
-// {
-// //LOGDEBUG("PdxObject::fromData() start...");
-// //
-//  if (!m_useWeakHashMap)
-//	  m_unreadFields = pr->readUnreadFields();
-//
-//  m_i1 = pr->readInt("i1");
-//  m_i2 = pr->readInt("i2");
-//  m_str1 = pr->readString("m_str1");
-//  m_i4 = pr->readInt("i4");
-//  m_i3 = pr->readInt("i3");
-//  m_i6 = pr->readInt("i6");
-//  char* tmp = pr->readString("m_str3");
-//
-//  char extraFieldsStr[20];
-//  if (tmp == NULL) {
-//    sprintf(extraFieldsStr, "%d", m_diffInExtraFields);
-//    size_t strSize = strlen(extraFieldsStr) + 1;
-//    m_str3 = new char[strSize];
-//    memcpy(m_str3, extraFieldsStr, strSize);
-//  } else {
-//    sprintf(extraFieldsStr, "%d" "%s", m_diffInExtraFields, m_str3);
-//    size_t strSize = strlen(extraFieldsStr) + 1;
-//    m_str3 = new char[strSize];
-//    memcpy(m_str3, extraFieldsStr, strSize);
-//  }
-//}
-
-CacheableStringPtr PdxTypes3V2::toString() const {
-  char idbuf[4096];
-  sprintf(idbuf,
-          "PdxTypes3V2:[ m_i1=%d ] [ m_i2=%d ] [m_str1=%s] [ m_i3=%d ] [ "
-          "m_i4=%d ] [ m_i6=%d ] [m_str3=%s]",
-          m_i1, m_i2, m_str1, m_i3, m_i4, m_i6, m_str3);
-  return CacheableString::create(idbuf);
-}
-
-/************************************************************
-*  PdxTypesR1V2
-* *********************************************************/
-
-int32_t PdxTypesR1V2::m_diffInSameFields = 0;
-int32_t PdxTypesR1V2::m_diffInExtraFields = 0;
-bool PdxTypesR1V2::m_useWeakHashMap = false;
-
-PdxTypesR1V2::PdxTypesR1V2() {
-  m_i1 = 34324;
-  m_i2 = 2144;
-  m_i3 = 4645734;
-  m_i4 = 73567;
-
-  m_i5 = 721398;
-  m_i6 = 45987;
-}
-
-PdxTypesR1V2::~PdxTypesR1V2() {
-  // TODO Auto-generated destructor stub
-}
-
-void PdxTypesR1V2::reset(bool useWeakHashMap) {
-  PdxTypesR1V2::m_diffInSameFields = 0;
-  PdxTypesR1V2::m_diffInExtraFields = 0;
-  PdxTypesR1V2::m_useWeakHashMap = useWeakHashMap;
-}
-
-int PdxTypesR1V2::getHashCode() {
-  // TODO:Implement It.
-  return 1;
-}
-
-bool PdxTypesR1V2::equals(PdxSerializablePtr obj) {
-  if (obj == NULLPTR) return false;
-
-  PdxTypesR1V2Ptr pap = dynCast<PdxTypesR1V2Ptr>(obj);
-  if (pap == NULLPTR) return false;
-
-  if (pap == this) return true;
-
-  if (m_i1 + m_diffInSameFields <= pap->m_i1 &&
-      m_i2 + m_diffInSameFields <= pap->m_i2 &&
-      m_i3 + m_diffInSameFields <= pap->m_i3 &&
-      m_i4 + m_diffInSameFields <= pap->m_i4) {
-    if (((m_i5 + PdxTypesR1V2::m_diffInExtraFields == pap->m_i5) &&
-         (m_i6 + PdxTypesR1V2::m_diffInExtraFields == pap->m_i6)) ||
-        ((PdxTypesR1V2::m_diffInExtraFields == pap->m_i5) &&
-         (PdxTypesR1V2::m_diffInExtraFields == pap->m_i6))) {
-      return true;
-    }
-  }
-  return false;
-}
-
-/*void PdxTypesR1V2::toData( PdxWriterPtr pw )  {
-
-if (!m_useWeakHashMap)
-pw->writeUnreadFields(m_pdxUnreadFields);
-
-pw->writeInt("i1", m_i1 + 1);
-pw->writeInt("i2", m_i2 + 1);
-pw->writeInt("i3", m_i3 + 1);
-pw->writeInt("i4", m_i4 + 1);
-
-pw->writeInt("i5", m_i5 + 1);
-pw->writeInt("i6", m_i6 + 1);
-
-m_diffInSameFields++;
-m_diffInExtraFields++;
-}
-
-void PdxTypesR1V2::fromData( PdxReaderPtr pr )
-{
-
-if (!m_useWeakHashMap)
-m_pdxUnreadFields = pr->readUnreadFields();
-
-m_i1 = pr->readInt("i1");
-m_i2 = pr->readInt("i2");
-m_i3 = pr->readInt("i3");
-m_i4 = pr->readInt("i4");
-
-m_i5 = pr->readInt("i5");
-m_i6 = pr->readInt("i6");
-}*/
-
-CacheableStringPtr PdxTypesR1V2::toString() const {
-  char idbuf[4096];
-  sprintf(idbuf,
-          "PdxTypesR1V2:[ m_i1=%d ] [ m_i2=%d ] [ m_i3=%d ] [ m_i4=%d ] [ "
-          "m_i5=%d ] [ m_i6=%d ]",
-          m_i1, m_i2, m_i3, m_i4, m_i5, m_i6);
-  return CacheableString::create(idbuf);
-}
-
-/************************************************************
-*  PdxTypesR2V2
-* *********************************************************/
-
-int PdxTypesR2V2::m_diffInSameFields = 0;
-int PdxTypesR2V2::m_diffInExtraFields = 0;
-bool PdxTypesR2V2::m_useWeakHashMap = false;
-
-PdxTypesR2V2::PdxTypesR2V2() {
-  m_i1 = 34324;
-  m_i2 = 2144;
-  m_i3 = 4645734;
-  m_i4 = 73567;
-  m_i5 = 798243;
-  m_i6 = 9900;
-
-  m_str1 = (char *)"0";
-}
-
-PdxTypesR2V2::~PdxTypesR2V2() {
-  // TODO Auto-generated destructor stub
-}
-
-void PdxTypesR2V2::reset(bool useWeakHashMap) {
-  PdxTypesR2V2::m_diffInSameFields = 0;
-  PdxTypesR2V2::m_diffInExtraFields = 0;
-  PdxTypesR2V2::m_useWeakHashMap = useWeakHashMap;
-}
-
-int PdxTypesR2V2::getHashCode() {
-  // TODO:Implement It.
-  return 1;
-}
-
-bool PdxTypesR2V2::equals(PdxSerializablePtr obj) {
-  if (obj == NULLPTR) return false;
-
-  PdxTypesR2V2Ptr pap = dynCast<PdxTypesR2V2Ptr>(obj);
-  if (pap == NULLPTR) return false;
-
-  if (pap == this) return true;
-
-  if (m_i1 + m_diffInSameFields <= pap->m_i1 &&
-      m_i2 + m_diffInSameFields <= pap->m_i2 &&
-      m_i3 + m_diffInSameFields <= pap->m_i3 &&
-      m_i4 + m_diffInSameFields <= pap->m_i4) {
-    char tmp[20] = {0};
-    sprintf(tmp, "%d", m_diffInExtraFields);
-    if (strcmp(pap->m_str1, tmp) == 0) {
-      if (m_i5 + m_diffInExtraFields == pap->m_i5 &&
-          m_i6 + m_diffInExtraFields == pap->m_i6) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-// void PdxTypesR2V2::toData( PdxWriterPtr pw )  {
-//
-//
-//  if (!m_useWeakHashMap)
-//    pw->writeUnreadFields(m_pdxunreadFields);
-//
-//  pw->writeInt("i1", m_i1 + 1);
-//  pw->writeInt("i2", m_i2 + 1);
-//  pw->writeInt("i5", m_i5 + 1);
-//  pw->writeInt("i6", m_i6 + 1);
-//  pw->writeInt("i3", m_i3 + 1);
-//  pw->writeInt("i4", m_i4 + 1);
-//
-//  m_diffInExtraFields++;
-//  m_diffInSameFields++;
-//
-//  char tmpBuf[512]= {0};
-//  sprintf(tmpBuf, "%d", m_diffInExtraFields);
-//  pw->writeString("m_str1",tmpBuf);
-//}
-//
-// void PdxTypesR2V2::fromData( PdxReaderPtr pr )
-// {
-// LOGDEBUG("PdxObject::fromData() start...");
-//
-//  if (!m_useWeakHashMap)
-//	  m_pdxunreadFields = pr->readUnreadFields();
-//
-//  m_i1 = pr->readInt("i1");
-//  m_i2 = pr->readInt("i2");
-//  m_i5 = pr->readInt("i5");
-//  m_i6 = pr->readInt("i6");
-//  m_i3 = pr->readInt("i3");
-//  m_i4 = pr->readInt("i4");
-//  m_str1 = pr->readString("m_str1");
-//}
-
-CacheableStringPtr PdxTypesR2V2::toString() const {
-  char idbuf[4096];
-  sprintf(idbuf,
-          "PdxTypesR2V2:[ m_i1=%d ] [m_i2=%d] [ m_i3=%d ] [ m_i4=%d ] "
-          "[m_i5=%d] [m_i6=%d] [m_str1=%s]",
-          m_i1, m_i2, m_i3, m_i4, m_i5, m_i6, m_str1);
-  return CacheableString::create(idbuf);
-}
-
-/************************************************************
-*  PdxTypesIgnoreUnreadFieldsV2
-* *********************************************************/
-
-int PdxTypesIgnoreUnreadFieldsV2::m_diffInSameFields = 0;
-int PdxTypesIgnoreUnreadFieldsV2::m_diffInExtraFields = 0;
-bool PdxTypesIgnoreUnreadFieldsV2::m_useWeakHashMap = false;
-
-PdxTypesIgnoreUnreadFieldsV2::PdxTypesIgnoreUnreadFieldsV2() {
-  m_i1 = 34324;
-  m_i2 = 2144;
-  m_i3 = 4645734;
-  m_i4 = 73567;
-  m_i5 = 0;
-  m_i6 = 0;
-}
-
-PdxTypesIgnoreUnreadFieldsV2::~PdxTypesIgnoreUnreadFieldsV2() {
-  // TODO Auto-generated destructor stub
-}
-
-void PdxTypesIgnoreUnreadFieldsV2::reset(bool useWeakHashMap) {
-  PdxTypesIgnoreUnreadFieldsV2::m_diffInSameFields = 0;
-  PdxTypesIgnoreUnreadFieldsV2::m_diffInExtraFields = 0;
-  PdxTypesIgnoreUnreadFieldsV2::m_useWeakHashMap = useWeakHashMap;
-}
-
-int PdxTypesIgnoreUnreadFieldsV2::getHashCode() {
-  // TODO:Implement It.
-  return 1;
-}
-
-bool PdxTypesIgnoreUnreadFieldsV2::equals(PdxSerializablePtr obj) {
-  if (obj == NULLPTR) return false;
-
-  PdxTypesIgnoreUnreadFieldsV2Ptr pap =
-      dynCast<PdxTypesIgnoreUnreadFieldsV2Ptr>(obj);
-  if (pap == NULLPTR) return false;
-
-  if (pap == this) return true;
-
-  LOGINFO("PdxTypesIgnoreUnreadFieldsV2::equals");
-  LOGINFO("m_i1 =%d m_diffInSameFields=%d pap->m_i1=%d", m_i1,
-          m_diffInSameFields, pap->m_i1);
-  LOGINFO("m_i2 =%d m_diffInSameFields=%d pap->m_i2=%d", m_i2,
-          m_diffInSameFields, pap->m_i2);
-  LOGINFO("m_i3 =%d m_diffInSameFields=%d pap->m_i3=%d", m_i3,
-          m_diffInSameFields, pap->m_i3);
-  LOGINFO("m_i4 =%d m_diffInSameFields=%d pap->m_i4=%d", m_i4,
-          m_diffInSameFields, pap->m_i4);
-  LOGINFO("m_i5 =%d  pap->m_i5=%d", m_i5, pap->m_i5);
-  LOGINFO("m_i6 =%d  pap->m_i6=%d", m_i6, pap->m_i6);
-
-  if (m_i1 + m_diffInSameFields <= pap->m_i1 &&
-      m_i2 + m_diffInSameFields <= pap->m_i2 &&
-      m_i3 + m_diffInSameFields <= pap->m_i3 &&
-      m_i4 + m_diffInSameFields <= pap->m_i4 && m_i5 == pap->m_i5 &&
-      m_i6 == pap->m_i6) {
-    return true;
-  }
-
-  return false;
-}
-
-void PdxTypesIgnoreUnreadFieldsV2::updateMembers() {
-  m_i5 = (int32_t)m_diffInExtraFields;
-  m_i6 = (int32_t)m_diffInExtraFields;
-}
-
-// void PdxTypesIgnoreUnreadFieldsV2::toData( PdxWriterPtr pw )  {
-// if (!m_useWeakHashMap)
-//   pw->writeUnreadFields(m_unreadFields);
-//
-//  pw->writeInt("i1", m_i1 + 1);
-//  pw->markIdentityField("i1");
-//  pw->writeInt("i2", m_i2 + 1);
-//  pw->writeInt("i3", m_i3 + 1);
-//  pw->writeInt("i4", m_i4 + 1);
-//  pw->writeInt("i5", m_diffInExtraFields);
-//  pw->writeInt("i6", m_diffInExtraFields);
-//
-//  m_i5 = (int32_t)m_diffInExtraFields;
-//  m_i6 = (int32_t)m_diffInExtraFields;
-//
-//  m_diffInSameFields++;
-//  m_diffInExtraFields++;
-//}
-//
-// void PdxTypesIgnoreUnreadFieldsV2::fromData( PdxReaderPtr pr )
-//{
-//  m_i1 = pr->readInt("i1");
-//  bool isIdentity = pr->isIdentityField("i2");
-//
-//  if(isIdentity){
-//  	throw Exception("i2 is not identity field");
-//  }
-//
-//  if (!m_useWeakHashMap)
-//    m_unreadFields = pr->readUnreadFields();
-//
-//  m_i2 = pr->readInt("i2");
-//  m_i3 = pr->readInt("i3");
-//  m_i4 = pr->readInt("i4");
-//  m_i5 = pr->readInt("i5");
-//  m_i6 = pr->readInt("i6");
-//
-// }
-
-CacheableStringPtr PdxTypesIgnoreUnreadFieldsV2::toString() const {
-  char idbuf[4096];
-  sprintf(idbuf,
-          "PdxTypesV1R1:[m_i1=%d] [m_i2=%d] [m_i3=%d] [m_i4=%d] [m_i5=%d] "
-          "[m_i6=%d]",
-          m_i1, m_i2, m_i3, m_i4, m_i5, m_i6);
-  return CacheableString::create(idbuf);
-}
-
-/************************************************************
-*  PdxVersionedV2
-* *********************************************************/
-PdxVersionedV2::PdxVersionedV2() {}
-
-void PdxVersionedV2::init(int32_t size) {
-  m_char = 'C';
-  m_bool = true;
-  m_byte = 0x74;
-  m_int16 = 0xab;
-  m_int32 = 0x2345abdc;
-  m_long = 324897980;
-  m_float = 23324.324f;
-  m_double = 3243298498;
-
-  m_string = (char *)"gfestring";
-
-  m_boolArray = new bool[3];
-  m_boolArray[0] = true;
-  m_boolArray[1] = false;
-  m_boolArray[2] = true;
-
-  m_charArray = new char[2];
-  m_charArray[0] = 'c';
-  m_charArray[1] = 'v';
-
-  m_dateTime = NULLPTR;
-
-  m_int16Array = new int16_t[size];
-  m_int32Array = new int32_t[size];
-  m_longArray = new int64_t[size];
-  m_floatArray = new float[size];
-  m_doubleArray = new double[size];
-
-  for (int i = 0; i < size; i++) {
-    m_int16Array[i] = 0x2332;
-    m_int32Array[i] = 34343 + i;
-    m_longArray[i] = 324324L + i;
-    m_floatArray[i] = 232.565f + i;
-    m_doubleArray[i] = 23423432 + i;
-    // m_stringArray[i] = String.Format("one{0}", i);
-  }
-  boolArrayLen = 0;
-  byteArrayLen = 0;
-  shortArrayLen = 0;
-  intArrayLen = 0;
-  longArrayLen = 0;
-  doubleArrayLen = 0;
-  floatArrayLen = 0;
-  strLenArray = 0;
-}
-
-PdxVersionedV2::PdxVersionedV2(int32_t size) {
-  init(size);
-  LOGDEBUG("PdxVersioned 1");
-}
-
-PdxVersionedV2::~PdxVersionedV2() {
-  // TODO Auto-generated destructor stub
-}
-
-// void PdxVersionedV2::toData( PdxWriterPtr pw )  {
-////pw->writeChar("m_char", m_char);
-// pw->writeBoolean("m_bool", m_bool);
-// pw->writeByte("m_byte", m_byte);
-// pw->writeShort("m_int16", m_int16);
-// pw->writeInt("m_int32", m_int32);
-// pw->writeLong("m_long", m_long);
-// pw->writeFloat("m_float", m_float);
-// pw->writeDouble("m_double", m_double);
-// pw->writeString("m_string", m_string);
-// pw->writeBooleanArray("m_boolArray", m_boolArray, 3);
-////pw->writeCharArray("m_charArray", m_charArray, 2);
-// pw->writeDate("m_dateTime", m_dateTime);
-// pw->writeShortArray("m_int16Array", m_int16Array, 2);
-// pw->writeIntArray("m_int32Array", m_int32Array, 2);
-// pw->writeLongArray("m_longArray", m_longArray, 2);
-// pw->writeFloatArray("m_floatArray", m_floatArray, 2);
-// pw->writeDoubleArray("m_doubleArray", m_doubleArray, 2);
-//}
-
-// void PdxVersionedV2::fromData( PdxReaderPtr pr )
-//{
-////m_char = pr->readChar("m_char");
-// m_bool = pr->readBoolean("m_bool");
-// m_byte = pr->readByte("m_byte");
-// m_int16 = pr->readShort("m_int16");
-// m_int32 = pr->readInt("m_int32");
-// m_long = pr->readLong("m_long");
-// m_float = pr->readFloat("m_float");
-// m_double = pr->readDouble("m_double");
-// m_string = pr->readString("m_string");
-// m_boolArray = pr->readBooleanArray("m_boolArray", boolArrayLen);
-////m_charArray = pr->readCharArray("m_charArray");
-// m_dateTime = pr->readDate("m_dateTime");
-// m_int16Array = pr->readShortArray("m_int16Array", shortArrayLen);
-// m_int32Array = pr->readIntArray("m_int32Array", intArrayLen);
-// m_longArray = pr->readLongArray("m_longArray", longArrayLen);
-// m_floatArray = pr->readFloatArray("m_floatArray", floatArrayLen);
-// m_doubleArray = pr->readDoubleArray("m_doubleArray", doubleArrayLen);
-//}
-
-CacheableStringPtr PdxVersionedV2::toString() const {
-  char idbuf[4096];
-  // sprintf(idbuf,"PdxTypesV1R1:[ m_i1=%d ] [ m_i2=%d ] [ m_i3=%d ] [ m_i4=%d
-  // ]", m_i1, m_i2, m_i3, m_i4 );
-  return CacheableString::create(idbuf);
-}
-
-/************************************************************
-*  TestKeyV2
-* *********************************************************/
-
-TestKeyV2::TestKeyV2() {}
-
-TestKeyV2::TestKeyV2(char *id) { _id = id; }
-
-/************************************************************
-*  TestDiffTypePdxSV2
-* *********************************************************/
-
-TestDiffTypePdxSV2::TestDiffTypePdxSV2() {}
-
-TestDiffTypePdxSV2::TestDiffTypePdxSV2(bool init) {
-  if (init) {
-    _id = (char *)"id:100";
-    _name = (char *)"HK";
-    _count = 100;
-  }
-}
-
-bool TestDiffTypePdxSV2::equals(TestDiffTypePdxSV2 *obj) {
-  if (obj == NULL) return false;
-
-  TestDiffTypePdxSV2 *other = dynamic_cast<TestDiffTypePdxSV2 *>(obj);
-  if (other == NULL) return false;
-
-  LOGINFO("TestDiffTypePdxSV2 other->_coun = %d and _count = %d ",
-          other->_count, _count);
-  LOGINFO("TestDiffTypePdxSV2 other->_id = %s and _id = %s ", other->_id, _id);
-  LOGINFO("TestDiffTypePdxSV2 other->_name = %s and _name = %s ", other->_name,
-          _name);
-
-  if (other->_count == _count && strcmp(other->_id, _id) == 0 &&
-      strcmp(other->_name, _name) == 0) {
-    return true;
-  }
-
-  return false;
-}
-
-/************************************************************
-*  TestEqualsV1
-* *********************************************************/
-/****
-TestEqualsV1::TestEqualsV1(){
-i1 = 1;
-i2 = 0;
-s1 = "s1";
-//TODO: Uncomment it.
-//sArr = ;
-//intArr = ;
-}
-
-void TestEqualsV1::toData( PdxWriterPtr pw )  {
-pw->writeInt("i1", i1);
-pw->writeInt("i2", i2);
-pw->writeString("s1", s1);
-//pw->writeStringArray("sArr", sArr, 2);
-//pw->writeIntArray("intArr", intArr, 2);
-//pw->writeObject("intArrObject", intArr);
-//pw->writeObject("sArrObject", sArr);
-}
-
-void TestEqualsV1::fromData( PdxReaderPtr pr )
-{
-i1 = pr->readInt("i1");
-i2 = pr->readInt("i2");
-s1 = pr->readString("s1");
-//sArr = pr->readStringArray("sArr");
-//intArr = pr->readIntArray("intArr");
-//intArr = (int[]) reader.ReadObject("intArrObject");
-//sArr = (string[]) reader.ReadObject("sArrObject");
-}
-
-CacheableStringPtr TestEqualsV1::toString() const {
-char idbuf[1024];
-sprintf(idbuf,"TestEqualsV1:[i1=%d ] [i2=%d] ", i1, i2 );
-return CacheableString::create( idbuf );
-}
-****/


Mime
View raw message