[Opensync-commits] r184 - in wbxmlTestSuite/trunk: . ddf

[<dg...@su...>]

Author: bellmich
Date: Thu Feb  5 11:15:37 2009
New Revision: 184
URL: http://libwbxml.opensync.org/changeset/184

Log:
fixed DDF tests

Added:
   wbxmlTestSuite/trunk/ddf/ddf-001.ddf   (props changed)
      - copied unchanged from r182, wbxmlTestSuite/trunk/ddf/ddf-001.xml
Deleted:
   wbxmlTestSuite/trunk/ddf/ddf-001.xml
Modified:
   wbxmlTestSuite/trunk/launchTests.sh

Copied: wbxmlTestSuite/trunk/ddf/ddf-001.ddf (from r182, wbxmlTestSuite/trunk/ddf/ddf-001.xml)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ wbxmlTestSuite/trunk/ddf/ddf-001.ddf	Thu Feb  5 11:15:37 2009	(r184, copy of r182, wbxmlTestSuite/trunk/ddf/ddf-001.xml)
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+<!DOCTYPE MgmtTree PUBLIC "-//OMA//DTD-DM-DDF 1.2//EN" "http://www.openmobilealliance.org/tech/DTD/dm_ddf-v1_2.dtd">
+            <MgmtTree xmlns="syncml:dmddf1.2">
+              <VerDTD>1.2</VerDTD>
+              <Node>
+                <NodeName>E-Mail</NodeName>
+                <RTProperties>
+                  <Format>
+                    <node/>
+                  </Format>
+                  <Type>
+                    <DDFName>com.operatorX.dm/1.0/EMail</DDFName>
+                  </Type>
+                </RTProperties>
+                <Node>
+                  <NodeName>POP3</NodeName>
+                  <Node>
+                    <NodeName>POPServer</NodeName>
+                    <RTProperties>
+                      <Format>
+                        <chr/>
+                      </Format>
+                      <Type>
+                        <MIME>text/plain</MIME>
+                      </Type>
+                    </RTProperties>
+                    <Value>mail.Operatorx.com</Value>
+                  </Node>
+                  <Node>
+                    <NodeName>UserID</NodeName>
+                    <RTProperties>
+                      <Format>
+                        <chr/>
+                      </Format>
+                      <Type>
+                        <MIME>text/plain</MIME>
+                      </Type>
+                    </RTProperties>
+                    <Value>UserName</Value>
+                  </Node>
+                  <Node>
+                    <NodeName>PWD</NodeName>
+                    <RTProperties>
+                      <Format>
+                        <chr/>
+                      </Format>
+                      <Type>
+                        <MIME>text/plain</MIME>
+                      </Type>
+                    </RTProperties>
+                    <Value>4571F7C34A9876B3</Value>
+                  </Node>
+                </Node>
+              </Node>
+            </MgmtTree>

Modified: wbxmlTestSuite/trunk/launchTests.sh
==============================================================================
--- wbxmlTestSuite/trunk/launchTests.sh	Fri Jan 23 15:50:38 2009	(r183)
+++ wbxmlTestSuite/trunk/launchTests.sh	Thu Feb  5 11:15:37 2009	(r184)
@@ -146,8 +146,10 @@
     else if [ "$TESTDIR" = "airsync" ];
     then
         PARAMS="-l AIRSYNC"
-    else if [ "$TESTDIR" != `basename $i ddf` ];
+    else if [ "$TESTDIR" = "ddf" -a `basename $j` != `basename $j ddf` ];
     then
+	# only pure DDF documents need this option
+	# embedded DDF documents do not need this option
         PARAMS="-l DMDDF12"
     else
         PARAMS=""