1 files changed, 33 insertions, 23 deletions

diff --git a/ca/tests/xml-parse-test.py b/ca/tests/xml-parse-test.py
index 5ea25492..90c80775 100644
--- a/ca/tests/xml-parse-test.py
+++ b/ca/tests/xml-parse-test.py
@@ -28,30 +28,34 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-import glob, lxml.etree, lxml.sax
-import rpki.up_down, rpki.left_right, rpki.publication, rpki.relaxng
+import glob
+import lxml.etree
+import rpki.up_down
+import rpki.left_right
+import rpki.publication
+import rpki.publication_control
+import rpki.relaxng
 
 verbose = False
 
-def test(fileglob, rng, sax_handler, encoding, tester = None):
+def test(fileglob, rng, parser, encoding, tester = None):
   files = glob.glob(fileglob)
   files.sort()
   for f in files:
     print "<!--", f, "-->"
-    handler = sax_handler()
     elt_in = lxml.etree.parse(f).getroot()
     if verbose:
       print "<!-- Input -->"
       print lxml.etree.tostring(elt_in, pretty_print = True, encoding = encoding, xml_declaration = True)
     rng.assertValid(elt_in)
-    lxml.sax.saxify(elt_in, handler)
-    elt_out = handler.result.toXML()
+    parsed  = parser.fromXML(elt_in)
+    elt_out = parsed.toXML()
     if verbose:
       print "<!-- Output -->"
       print lxml.etree.tostring(elt_out, pretty_print = True, encoding = encoding, xml_declaration = True)
     rng.assertValid(elt_out)
     if tester:
-      tester(elt_in, elt_out, handler.result)
+      tester(elt_in, elt_out, parsed)
     if verbose:
       print
 
@@ -79,41 +83,47 @@ def lr_tester(elt_in, elt_out, msg):
               (obj.signing_cert_crl,  "Signing certificate CRL")))
       #       (obj.pkcs10_request,    "PKCS #10 request")
     if isinstance(obj, rpki.left_right.parent_elt):
-      pprint(((obj.bpki_cms_cert,     "CMS certificate"),
-              (obj.bpki_cms_glue,     "CMS glue")))
+      pprint(((obj.bpki_cert,         "BPKI certificate"),
+              (obj.bpki_glue,         "BPKI glue")))
     if isinstance(obj, (rpki.left_right.child_elt, rpki.left_right.repository_elt)):
-      pprint(((obj.bpki_cert,         "Certificate"),
-              (obj.bpki_glue,         "Glue")))
+      pprint(((obj.bpki_cert,         "BPKI certificate"),
+              (obj.bpki_glue,         "BPKI glue")))
 
 def pp_tester(elt_in, elt_out, msg):
   assert isinstance(msg, rpki.publication.msg)
   for obj in msg:
-    if isinstance(obj, rpki.publication.client_elt):
+    if isinstance(obj, rpki.publication.publish_elt):
+      pprint(((obj.payload,          "Publish object"),))
+    if isinstance(obj, rpki.publication.withdraw_elt):
+      pprint(((None,                 "Withdraw object"),))
+
+def pc_tester(elt_in, elt_out, msg):
+  assert isinstance(msg, rpki.publication_control.msg)
+  for obj in msg:
+    if isinstance(obj, rpki.publication_control.client_elt):
       pprint(((obj.bpki_cert,         "BPKI cert"),
               (obj.bpki_glue,         "BPKI glue")))
-    if isinstance(obj, rpki.publication.certificate_elt):
-      pprint(((obj.payload,         "RPKI cert"),))
-    if isinstance(obj, rpki.publication.crl_elt):
-      pprint(((obj.payload,         "RPKI CRL"),))
-    if isinstance(obj, rpki.publication.manifest_elt):
-      pprint(((obj.payload,          "RPKI manifest"),))
-    if isinstance(obj, rpki.publication.roa_elt):
-      pprint(((obj.payload,          "ROA"),))
 
 test(fileglob = "up-down-protocol-samples/*.xml",
      rng = rpki.relaxng.up_down,
-     sax_handler = rpki.up_down.sax_handler,
+     parser = rpki.up_down.msg,
      encoding = "utf-8",
      tester = ud_tester)
 
 test(fileglob = "left-right-protocol-samples/*.xml",
      rng = rpki.relaxng.left_right,
-     sax_handler = rpki.left_right.sax_handler,
+     parser = rpki.left_right.msg,
      encoding = "us-ascii",
      tester = lr_tester)
 
 test(fileglob = "publication-protocol-samples/*.xml",
      rng = rpki.relaxng.publication,
-     sax_handler = rpki.publication.sax_handler,
+     parser = rpki.publication.msg,
      encoding = "us-ascii",
      tester = pp_tester)
+
+test(fileglob = "publication-control-protocol-samples/*.xml",
+     rng = rpki.relaxng.publication_control,
+     parser = rpki.publication_control.msg,
+     encoding = "us-ascii",
+     tester = pc_tester)