Changeset 140

Timestamp:

05/24/08 20:45:40 (8 months ago)

Author:

zork

Message:

* Fixed recursion in xml store (replaced store with put for children)
* Removed fkey node attach when collection to store is empty

Files:

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

trunk/dba/dba/xmlostream.cpp

@@ -136 +136 @@
-  bool ret = false;
-  if (!pObject->isDeleted()) {
-    if (pMember.getFKeyName() != NULL) {
-      xmlAddChild(mParentNode, xmlNewNode(NULL, (xmlChar*)pMember.getFKeyName()));
-      mParentNode = mParentNode->children;
-    };
-    std::auto_ptr<CollectionFilterIterator> iterator(pFilter.createIterator());
-while(iterator->hasNext()) {
-  Storeable& toStore = (Storeable&)(iterator->get());
-!toStore.isDeleted()
-was_changed = store(&toStore
-if (!ret) ret = was_changed
+//do not create fkey node if list is empty
+if (iterator->hasNext()) {
+pMember.getFKeyName() != NULL
+xmlAddChild(mParentNode, xmlNewNode(NULL, (xmlChar*)pMember.getFKeyName())
+mParentNode = mParentNode->children
-      };
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    };
-  };

trunk/dba/test/main.cpp

@@ -144 +144 @@
-  CppUnit::BriefTestProgressListener listener;
-  runner.eventManager().addListener(&listener);
-
+//
-  //runner.addTest(new CppUnit::TestCaller<SQLite3SQLArchiveTestCase>("debug_test",&SQLite3SQLArchiveTestCase::sqlError));
-  //runner.addTest(new CppUnit::TestCaller<PostgresSQLArchiveTestCase>("debug_test",&PostgresSQLArchiveTestCase::sqlError));
@@ -151 +151 @@
-  //runner.addTest(new CppUnit::TestCaller<SQLite3SQLArchiveTestCase>("debug_test",&SQLite3SQLArchiveTestCase::transactions_rollback));
-  //runner.addTest(dba_tests::XMLTestCase::suite());
-//runner.addTest(new CppUnit::TestCaller<dba_tests::XMLTestCase>("debug_test",&dba_tests::XMLTestCase::sublist_on
+runner.addTest(new CppUnit::TestCaller<dba_tests::XMLTestCase>("debug_test",&dba_tests::XMLTestCase::sublist_tree_stor
-  //runner.addTest(new CppUnit::TestCaller<OdbcPluginTestCase>("debug_test",&OdbcPluginTestCase::dbConnection));
-  //runner.addTest(new CppUnit::TestCaller<PostgresSQLArchiveTestCase>("debug_test",&PostgresSQLArchiveTestCase::sqlError));

trunk/dba/test/xmltestcase.cpp

@@ -353 +353 @@
-};
-
+void 
+XMLTestCase::sublist_tree_store() {
+  const char* result = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+"<dba>\n"
+"  <test_objects i_value=\"1\" f_value=\"1\" s_value=\"1\" d_value=\"2008-01-01Z00:00:00\">\n"
+"    <fk_owner>\n"
+"      <test_objects i_value=\"2\" f_value=\"2\" s_value=\"2\" d_value=\"2008-01-01Z00:00:00\">\n"
+"        <fk_owner>\n"
+"          <test_objects i_value=\"3\" f_value=\"3\" s_value=\"3\" d_value=\"2008-01-01Z00:00:00\"/>\n"
+"        </fk_owner>\n"
+"      </test_objects>\n"
+"    </fk_owner>\n"
+"  </test_objects>\n"
+"</dba>\n";
+  {
+    dba::XMLArchive ar;
+    unlink("sublist_tree.xml");
+    ar.open("sublist_tree.xml");
+    TreeObject root(1,1,"1");
+    TreeObject middle(2,2,"2");
+    TreeObject last(3,3,"3");
+    middle.mLeafs.push_back(last);
+    root.mLeafs.push_back(middle);
+
+    dba::XMLOStream stream(ar.getOStream());
+    stream.open();
+    stream.put(&root);
+  }
+  CPPUNIT_ASSERT(compareXML("sublist_tree.xml",result));
+};
+
+void 
+XMLTestCase::sublist_three_simple() {
+  const char* result = 
+"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
+"<dba>\n"
+"  <three_lists three_name=\"sub\">\n"
+"    <fk_three_owner>\n"
+"      <obj_with_list name=\"sub_0\">\n"
+"        <fk_owner>\n"
+"          <test_objects i_value=\"0\" f_value=\"0\" s_value=\"test_object\" d_value=\"2008-01-01Z00:00:00\"/>\n"
+"        </fk_owner>\n"
+"      </obj_with_list>\n"
+"    </fk_three_owner>\n"
+"  </three_lists>\n"
+"</dba>\n";
+  {
+    dba::XMLArchive ar;
+    unlink("sublist_three_simple.xml");
+    ar.open("sublist_three_simple.xml");
+    ThreeLists root("sub",1,1);
+
+    dba::XMLOStream stream(ar.getOStream());
+    stream.open();
+    stream.put(&root);
+  }
+  CPPUNIT_ASSERT(compareXML("sublist_three_simple.xml",result));
+};
+
-
-} //namespace

trunk/dba/test/xmltestcase.h

@@ -39 +39 @@
-      CPPUNIT_TEST(sublist_one_store_nofk);
-      CPPUNIT_TEST(sublist_one_load_nofk);
+      CPPUNIT_TEST(sublist_tree_store);
+      CPPUNIT_TEST(sublist_three_simple);
-    CPPUNIT_TEST_SUITE_END();
-  public:
@@ -59 +61 @@
-    void sublist_one_store_nofk();
-    void sublist_one_load_nofk();
+    void sublist_tree_store();
+    void sublist_three_simple();
-  private:
-    bool compareXML(const char* pFilename, const char* pData);