Changeset 180

Timestamp:

09/01/08 11:27:21 (4 months ago)

Author:

zork

Message:

list elements was added to first element member instead of list node

Files:

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

trunk/dba/dba/xmlostream.cpp

@@ -232 +232 @@
-    if (iterator->hasNext()) {
-      if (pMember.getFKeyName() != NULL) {
-
-
+
-      };
-      while(iterator->hasNext()) {

trunk/dba/test/main.cpp

@@ -151 +151 @@
-  //runner.addTest(new CppUnit::TestCaller<SQLite3SQLArchiveTestCase>("debug_test",&SQLite3SQLArchiveTestCase::transactions_rollback));
-  //runner.addTest(dba_tests::XMLTestCase::suite());
-2
+3
-  //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

@@ -19 +19 @@
-#include "dba/stdlist.h"
-#include "dba/single.h"
+#include "dba/bool_filter.h"
-
-#include <fstream>
@@ -958 +959 @@
-};
-
+struct StoreBug3A : public dba::Storeable {
+  DECLARE_STORE_TABLE();
+}; 
+BEGIN_STORE_TABLE(StoreBug3A, dba::Storeable, "ris_examparamval")
+END_STORE_TABLE()
+
+struct StoreBug3B : public dba::Storeable {
+  StoreBug3B() : mIsRemoved(false) {};
+  bool mIsRemoved;
+  DECLARE_STORE_TABLE();
+};
+BEGIN_STORE_TABLE(StoreBug3B, dba::Storeable, NULL)
+BIND_INT(mIsRemoved, dba::Bool, "is_removed")
+END_STORE_TABLE()
+
+struct StoreBug3C : public dba::Storeable {
+  StoreBug3C() {
+    for (int i=0; i<2; ++i)
+      mVals.push_back(StoreBug3A());
+  }
+  DECLARE_STORE_TABLE();
+  StoreBug3B mRemoveable;
+  std::list<StoreBug3A> mVals;
+};
+BEGIN_STORE_TABLE(StoreBug3C, dba::Storeable, "ris_examparam")
+BIND_STB(StoreBug3C::mRemoveable)
+BIND_COL(StoreBug3C::mVals, dba::stdList<StoreBug3A>, "examparam_id")
+END_STORE_TABLE()
+
+void
+XMLTestCase::storeBug3() {
+  /* bug: the result is:
+  <?xml version="1.0" encoding="utf-8"?>
+  <ris_examparam>
+    <is_removed>
+      <ris_examparamval/>
+      <ris_examparamval/>
+      0
+    </is_removed>
+    <examparam_id/>
+  </ris_examparam>
+  */
+
+  const char* result = 
+    "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+    "<ris_examparam>\n"
+    "  <is_removed>0</is_removed>\n"
+    "  <examparam_id>\n"
+    "    <ris_examparamval/>\n"
+    "    <ris_examparamval/>\n"
+    "  </examparam_id>\n"
+    "</ris_examparam>\n"
+    ;
+  {
+    dba::XMLArchive ar;
+    ar.setRootNodeName(NULL);
+    ar.useElements();
+    unlink("storebug3.xml");
+    ar.open("storebug3.xml");
+    StoreBug3C obj;
+    dba::XMLOStream stream(ar.getOStream());
+    stream.enableDebug();
+    stream.open();
+    stream.put(&obj);
+  }
+  CPPUNIT_ASSERT(compareXML("storebug3.xml",result));
+};
+
+
-} //namespace
-

trunk/dba/test/xmltestcase.h

@@ -54 +54 @@
-      CPPUNIT_TEST(storeToElements);
-      CPPUNIT_TEST(storeBug2);
+      CPPUNIT_TEST(storeBug3);
-    CPPUNIT_TEST_SUITE_END();
-  public:
@@ -92 +93 @@
-    void storeBug1();
-    void storeBug2();
+    void storeBug3();
-  private:
-    bool compareXML(const char* pFilename, const char* pData);