Changeset 8714

Timestamp:

02/17/09 15:13:06 (4 years ago)

Author:

mcarrick

Message:

improved testing

Files:

• ossiedev/branches/mcarrick/DPD/testApp.cpp (modified) (3 diffs)

ossiedev/branches/mcarrick/DPD/testApp.cpp

@@ -29 +29 @@
 
 
-                // print xml tags ...
-                std::cout << "******************************" << std::endl;
-                std::cout << "DevicePkg: " << std::endl;
-                std::cout << "<devicepkg id=" << parse.getDevPkgID() << " version=" << parse.getDevPkgVersion() << " name=" << parse.getDevPkgName() << ">" << std::endl;
-                std::cout << "  <title>" << parse.getDevPkgTitle() << "</title>" << std::endl;
+                std::cout << std::endl << std::endl;
+                std::cout << "<devpkg id=" << parse.getDevPkgID() << " version=" << parse.getDevPkgVersion();
+                        std::cout << " name=" << parse.getDevPkgName() << ">" << std::endl;
                 std::cout << "  <author>" << parse.getDevPkgAuthor() << "</author>" << std::endl;
                 std::cout << "  <description>" << parse.getDevPkgDescription() << "</description>" << std::endl;
+                std::cout << "  <title>" << parse.getDevPkgTitle() << "</title>" << std::endl;
                 std::cout << "  <hwdeviceregistration id=" << parse.getHWDevRegID() << " version=" << parse.getHWDevRegVersion();
                         std::cout << " name=" << parse.getHWDevRegName() << ">" << std::endl;
+
                 std::cout << "          <propertyfile type=" << parse.getPropFileType() << ">" << std::endl;
                 std::cout << "                  <localfile name=" << parse.getPropFileLocalFile() << "/>" << std::endl;
@@ -54 +54 @@
                 {
                 std::cout << "          <childhwdevice>" << std::endl;
-                std::cout << "                  <hwdeviceregistration id=" << parse.getChildHWDevice()[i]  << std::endl;
-                std::cout << "          </childhwdevice>" << std::endl;
+                std::cout << "                  <hwdeviceregistration id=" << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getHWDevRegID();
+                        std::cout << " version=" << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getHWDevRegVersion();
+                        std::cout << " name=" << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getHWDevRegName() << ">" << std::endl;
+                std::cout << "                          <propertyfile type=" << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getPropFileType();
+                        std::cout << ">" << std::endl;
+                std::cout << "                                  <localfile name=" << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getPropFileLocalFile();
+                        std::cout << "/>" << std::endl;
+                std::cout << "                          </propertyfile>" << std::endl;
+
+                std::cout << "                          <description>" << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getHWDevRegDescription();
+                        std::cout << "</descripton>" << std::endl;
+                std::cout << "                          <manufacturer>" << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getHWDevRegManufacturer();
+                        std::cout << "</manufacturer>" << std::endl;
+                std::cout << "                          <modelnumber>" << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getHWDevRegModelNumber();
+                        std::cout << "</modelnumber>" << std::endl;
+                std::cout << "                          <deviceclass>" << std::endl;
+                for (int k = 0; k < parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getDeviceClass().size(); k++)
+                {
+                std::cout << "                                  <class>" << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getDeviceClass()[k];
+                        std::cout << "</class>" << std::endl;
+                }
+                std::cout << "                          </deviceclass>" << std::endl;
+
+
+                for (int j = 0; j < parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getChildHWDevice().size(); j++)
+                {
+                std::cout << "                          <childhwdevice>" << std::endl;
+                std::cout << "                                  <hwdeviceregistration id=";
+                        std::cout << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getChildHWDevice()[j]->getHWDeviceRegistration()->getHWDevRegID();
+                        std::cout << " version=";
+                        std::cout << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getChildHWDevice()[j]->getHWDeviceRegistration()->getHWDevRegVersion();
+                        std::cout << " name=";
+                        std::cout << parse.getChildHWDevice()[i]->getHWDeviceRegistration()->getChildHWDevice()[j]->getHWDeviceRegistration()->getHWDevRegName();
+                        std::cout << ">" << std::endl;
+                        std::cout << "                                  ..." << std::endl;
+                std::cout << "                                  </hwdeviceregistration>" << std::endl;
+                std::cout << "                          </childhwdevice>" << std::endl;
+                }
+
                 }
                 std::cout << "  </hwdeviceregistration>" << std::endl;
+                std::cout << "</devpkg>" << std::endl;
 
-
-
-                std::cout << "</devicepkg>" << std::endl;
         }
         else
@@ -72 +107 @@
 
 
-
-
-