Changeset 139

Timestamp:

05/23/08 20:38:24 (8 months ago)

Author:

zork

Message:

added tests and fixed bugs for non-fkey loading

Files:

• trunk/dba/dba/xmlistream.cpp (modified) (5 diffs)
• trunk/dba/dba/xmlistream.h (modified) (1 diff)
• trunk/dba/test/testobject.cpp (modified) (1 diff)
• trunk/dba/test/testobject.h (modified) (1 diff)
• trunk/dba/test/xmltestcase.cpp (modified) (2 diffs)
• trunk/dba/test/xmltestcase.h (modified) (2 diffs)

trunk/dba/dba/xmlistream.cpp

@@ -26 +26 @@
-xmlNodePtr
-XMLIStream::setNextNode(xmlNodePtr pNode) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-  return pNode;
-};
@@ -61 +63 @@
-        if (entry->getFKeyName() == NULL) 
-          return entry;
-
+
+
+
-        return entry;
-      };
@@ -79 +83 @@
-void
-XMLIStream::getChildren(Storeable* pParent, xmlNodePtr pNode) {
-setN
+findNonT
-  //if (pNode) std::cerr << "getChildren at node " << pNode->name << std::endl;
-  //ignore all nodes that are binded to pParent class members
@@ -103 +107 @@
-      open(child,member->getTableName()); 
-
-setN
+findNonT
-      while (node != NULL) { 
-        mCurrentNode = node;
@@ -111 +115 @@
-        if (node->children != NULL)
-          getChildren(&child,node->children);
-
+
-        childFilter->updateRef((char*)pParent + member->getMemberOffset());
-        childFilter->put();

trunk/dba/dba/xmlistream.h

@@ -40 +40 @@
-    void applyFilters(Storeable* pObject);
-    xmlNodePtr setNextNode(xmlNodePtr pNode);
+    xmlNodePtr findNonTextNode(xmlNodePtr pNode);
-    ColMemberEntry* findMember(Storeable* pObject, xmlNodePtr pNode);
-    ColMemberEntry* findNullMember(Storeable* pObject);

trunk/dba/test/testobject.cpp

@@ -68 +68 @@
-END_STORE_TABLE()
-
-dba::Storeabl
-
-
+ObjWithListBas
+Base
+Base
-END_STORE_TABLE()
-

trunk/dba/test/testobject.h

@@ -302 +302 @@
-  Object that contains list of other storeable objects
-*/
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    DECLARE_STORE_TABLE();
-  public:
-    ObjWithList() {};
-    ObjWithList(const std::string& pName, int pChildrenCount) 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-};
-

trunk/dba/test/xmltestcase.cpp

@@ -14 +14 @@
-#include "dba/fileutils.h"
-#include "dba/int_filter.h"
+#include "dba/string_filter.h"
+#include "dba/stdlist.h"
-
-#include <fstream>
@@ -290 +292 @@
-};
-
+class XMLObjWithOneUnnamedList : public ObjWithListBase {
+    DECLARE_STORE_TABLE();
+  public:
+    XMLObjWithOneUnnamedList() {}
+    XMLObjWithOneUnnamedList(const char* pName, int pCount) 
+      : ObjWithListBase(pName, pCount) {}
+};
+
+BEGIN_STORE_TABLE(XMLObjWithOneUnnamedList,ObjWithListBase,"obj_with_list")
+  BIND_STR(ObjWithListBase::mName, dba::String, "name")
+  BIND_COL(ObjWithListBase::mList, dba::stdList<TestObject>, NULL)
+END_STORE_TABLE()
+
+void 
+XMLTestCase::sublist_one_store_nofk() {
+  const char* result = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+"<dba>\n"
+"  <obj_with_list name=\"sub\">\n"
+"    <test_objects i_value=\"0\" f_value=\"0\" s_value=\"test_object\" d_value=\"2008-01-01Z00:00:00\"/>\n"
+"  </obj_with_list>\n"
+"</dba>\n";
+  {
+    dba::XMLArchive ar;
+    unlink("sublist_one_nofk.xml");
+    ar.open("sublist_one_nofk.xml");
+    XMLObjWithOneUnnamedList obj1("sub",1);
+    dba::XMLOStream stream(ar.getOStream());
+    stream.open();
+    stream.put(&obj1);
+  }
+  CPPUNIT_ASSERT(compareXML("sublist_one_nofk.xml",result));
+};
+
+void 
+XMLTestCase::sublist_one_load_nofk() {
+  const char* data = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+"<dba>\n"
+"  <obj_with_list name=\"sub\">\n"
+"    <test_objects i_value=\"0\" f_value=\"0\" s_value=\"test_object\" d_value=\"2008-01-01Z00:00:00\"/>\n"
+"  </obj_with_list>\n"
+"</dba>\n";
+  { 
+    std::ofstream file("sublist_one_load_nofk.xml");
+    file << data;
+  };
+  {
+    dba::XMLArchive ar;
+    ar.open("sublist_one_load_nofk.xml");
+    XMLObjWithOneUnnamedList obj1;
+    dba::XMLIStream stream(ar.getIStream());
+
+    stream.get(&obj1);
+
+    XMLObjWithOneUnnamedList expected("sub",1);
+
+    CPPUNIT_ASSERT(obj1 == expected);
+  };
+};
+
-
-} //namespace

trunk/dba/test/xmltestcase.h

@@ -37 +37 @@
-      CPPUNIT_TEST(sublist_one_load);
-      CPPUNIT_TEST(sublist_two_load);
+      CPPUNIT_TEST(sublist_one_store_nofk);
+      CPPUNIT_TEST(sublist_one_load_nofk);
-    CPPUNIT_TEST_SUITE_END();
-  public:
@@ -55 +57 @@
-    void sublist_one_load();
-    void sublist_two_load();
+    void sublist_one_store_nofk();
+    void sublist_one_load_nofk();
-  private:
-    bool compareXML(const char* pFilename, const char* pData);