| [Dev OpenGP] [52] Adapted test files and removed deprecated methods from ogpcore |
[ Thread Index |
Date Index
| More opengp.tuxfamily.org/development Archives
]
Revision: 52
Author: alband85
Date: 2009-03-18 14:26:47 +0100 (Wed, 18 Mar 2009)
Log Message:
-----------
Adapted test files and removed deprecated methods from ogpcore
Modified Paths:
--------------
trunk/src/lib/ogp/core/ogpcore.py
trunk/src/tests/etree-test.py
trunk/src/tests/merge-test.py
trunk/src/tests/xslt/keyvalue.xml
Modified: trunk/src/lib/ogp/core/ogpcore.py
===================================================================
--- trunk/src/lib/ogp/core/ogpcore.py 2009-03-18 12:29:34 UTC (rev 51)
+++ trunk/src/lib/ogp/core/ogpcore.py 2009-03-18 13:26:47 UTC (rev 52)
@@ -55,6 +55,7 @@
self.__add(dn, attrs)
def deleteDN(self, dn):
+ #TODO
#self.__delete(dn)
pass
@@ -64,6 +65,7 @@
self.l.add_s(dn,ldif)
def __delete(self, dn):
+ #TODO
self.l.delete_s(dn)
def createMachine(self, dn, others={}):
@@ -81,12 +83,6 @@
attrs[OgpLDAPConsts.ATTR_CONFIG] = OgpLDAPConsts.VALUE_CONFIG
self.__add(dn, attrs)
- def merge(self, parent, child):
- pass
-
- def xml2conf(self, xml, xslt):
- return # TODO
-
def pullPluginConf(self, dn, pluginName, fullTree=False):
pass
Modified: trunk/src/tests/etree-test.py
===================================================================
--- trunk/src/tests/etree-test.py 2009-03-18 12:29:34 UTC (rev 51)
+++ trunk/src/tests/etree-test.py 2009-03-18 13:26:47 UTC (rev 52)
@@ -71,4 +71,5 @@
print obj.text
print obj.toString()
+print "------- TOSTRING -----------"
Modified: trunk/src/tests/merge-test.py
===================================================================
--- trunk/src/tests/merge-test.py 2009-03-18 12:29:34 UTC (rev 51)
+++ trunk/src/tests/merge-test.py 2009-03-18 13:26:47 UTC (rev 52)
@@ -11,3 +11,6 @@
print "child :\n" + child.toString()
parent.merge(child)
print "merge :\n" + parent.toString()
+
+print etree.OGP_PARSER
+print type(parent)
Modified: trunk/src/tests/xslt/keyvalue.xml
===================================================================
--- trunk/src/tests/xslt/keyvalue.xml 2009-03-18 12:29:34 UTC (rev 51)
+++ trunk/src/tests/xslt/keyvalue.xml 2009-03-18 13:26:47 UTC (rev 52)
@@ -1,5 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<conf>
- <key name="key1" type="int">1234</key>
- <key name="key2" type="string">test string value</key>
-</conf>
+<?xml version="1.0" encoding="UTF-8"?><conf><key name="key1" type="int">1234</key><key name="key2" type="string">test string value</key></conf>