Changeset 181

Timestamp:

09/02/08 11:54:14 (4 months ago)

Author:

zork

Message:

last added node was not reset after collection store

Files:

• trunk/dba/dba/xmlostream.cpp (modified) (1 diff)
• trunk/dba/test/main.cpp (modified) (1 diff)
• trunk/dba/test/xmltestcase.cpp (modified) (1 diff)
• trunk/dba/test/xmltestcase.h (modified) (2 diffs)

trunk/dba/dba/xmlostream.cpp

@@ -197 +197 @@
-  if (mParentNode != xmlDocGetRootElement(mDocument)) {
-    debug("up from mParent '%s'", (const char*)mParentNode->name);
+    mLastAddedNode = mParentNode;
-    mParentNode = mParentNode->parent;
-  };

trunk/dba/test/main.cpp

@@ -151 +151 @@
-  //runner.addTest(new CppUnit::TestCaller<SQLite3SQLArchiveTestCase>("debug_test",&SQLite3SQLArchiveTestCase::transactions_rollback));
-  //runner.addTest(dba_tests::XMLTestCase::suite());
-3
+4
-  //runner.addTest(new CppUnit::TestCaller<dba_tests::XMLTestCase>("debug_test",&dba_tests::XMLTestCase::store_two));
-  //runner.addTest(new CppUnit::TestCaller<OdbcPluginTestCase>("debug_test",&OdbcPluginTestCase::dbConnection));

trunk/dba/test/xmltestcase.cpp

@@ -1028 +1028 @@
-
-
+struct bug4_A : public dba::Storeable {
+  DECLARE_STORE_TABLE();
+}; 
+BEGIN_STORE_TABLE(bug4_A, dba::Storeable, "A")
+END_STORE_TABLE()
+
+struct bug4_B : public dba::Storeable {
+  DECLARE_STORE_TABLE();
+};
+BEGIN_STORE_TABLE(bug4_B, dba::Storeable, "B")
+END_STORE_TABLE()
+
+struct bug4_B_Full : public bug4_B {
+  std::list<bug4_A> mAItems;
+  DECLARE_STORE_TABLE();
+};
+BEGIN_STORE_TABLE(bug4_B_Full, bug4_B, "B")
+BIND_COL(bug4_B_Full::mAItems, dba::stdList<bug4_A>, NULL)
+END_STORE_TABLE()
+
+struct bug4_C : public dba::Storeable {
+  bug4_B_Full mB;
+  DECLARE_STORE_TABLE();
+};
+BEGIN_STORE_TABLE(bug4_C, dba::Storeable, "C")
+BIND_COL(mB, dba::Single, NULL)
+END_STORE_TABLE()
+
+struct bug4_D : public dba::Storeable {
+  bug4_D() {
+    bug4_C c1;
+    bug4_A c1a1;
+    bug4_A c1a2;
+    c1.mB.mAItems.push_back(c1a1);
+    c1.mB.mAItems.push_back(c1a2);
+    mCItems.push_back(c1);
+    bug4_C c2;
+    mCItems.push_back(c2);
+    bug4_C c3;
+    mCItems.push_back(c3);
+  }
+  std::list<bug4_C> mCItems;
+  DECLARE_STORE_TABLE();
+}; 
+BEGIN_STORE_TABLE(bug4_D, dba::Storeable, "D")
+BIND_COL(mCItems, dba::stdList<bug4_C>, NULL)
+END_STORE_TABLE()
+
+void
+XMLTestCase::storeBug4() {
+  /* bug: the result is:
+  <D>
+    <C>
+      <C>
+        <B/>
+      </C>
+      <C>
+        <B/>
+      </C>
+      <B>
+        <A/>
+        <A/>
+      </B>
+    </C>
+  </D>
+  */
+
+  /**
+    Note: the problem is caused by the fact that B is splitted (bug3_B & bug3_B_Full)
+  */
+
+  const char* result = 
+    "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+    "<D>\n"
+    "  <C>\n"
+    "    <B/>\n"
+    "  </C>\n"
+    "  <C>\n"
+    "    <B/>\n"
+    "  </C>\n"
+    "  <C>\n"
+    "    <B>\n"
+    "      <A/>\n"
+    "      <A/>\n"
+    "    </B>\n"
+    "  </C>\n"
+    "</D>\n"
+    ;
+  {
+    dba::XMLArchive ar;
+    ar.setRootNodeName(NULL);
+    ar.useElements();
+    bug4_D obj;
+    unlink("storebug4.xml");
+    ar.open("storebug4.xml");
+    dba::XMLOStream stream(ar.getOStream());
+    stream.enableDebug();
+    stream.open();
+    stream.put(&obj);
+  }
+  CPPUNIT_ASSERT(compareXML("storebug4.xml",result));
+};
+
+
-} //namespace
-
-#endif //TEST_XML
-
+

trunk/dba/test/xmltestcase.h

@@ -55 +55 @@
-      CPPUNIT_TEST(storeBug2);
-      CPPUNIT_TEST(storeBug3);
+      CPPUNIT_TEST(storeBug4);
-    CPPUNIT_TEST_SUITE_END();
-  public:
@@ -94 +95 @@
-    void storeBug2();
-    void storeBug3();
+    void storeBug4();
-  private:
-    bool compareXML(const char* pFilename, const char* pData);