From: <dg...@su...> - 2009-01-23 14:51:22
|
Author: bellmich Date: Fri Jan 23 15:50:09 2009 New Revision: 182 URL: http://libwbxml.opensync.org/changeset/182 Log: added tests for embedded OMA DM DDF management trees Added: wbxmlTestSuite/trunk/ddf/ddf-001.xml wbxmlTestSuite/trunk/ddf/syncml_with_ddf-001.xml Modified: wbxmlTestSuite/trunk/launchTests.sh Added: wbxmlTestSuite/trunk/ddf/ddf-001.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ wbxmlTestSuite/trunk/ddf/ddf-001.xml Fri Jan 23 15:50:09 2009 (r182) @@ -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> Added: wbxmlTestSuite/trunk/ddf/syncml_with_ddf-001.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ wbxmlTestSuite/trunk/ddf/syncml_with_ddf-001.xml Fri Jan 23 15:50:09 2009 (r182) @@ -0,0 +1,153 @@ +<?xml version="1.0"?> +<!DOCTYPE SyncML PUBLIC "-//SYNCML//DTD SyncML 1.2//EN" "http://www.openmobilealliance.org/tech/DTD/OMA-TS-SyncML_RepPro_DTD-V1_2.dtd"> +<SyncML> + <SyncHdr> + <VerDTD>1.2</VerDTD> + <VerProto>SyncML/1.2</VerProto> + <SessionID>1</SessionID> + <MsgID>2</MsgID> + <Target> + <LocURI>IMEI:493005100592800</LocURI> + </Target> + <Source> + <LocURI>http://www.syncml.org/sync-server</LocURI> + </Source> + </SyncHdr> + <SyncBody> + <Status> + <CmdID>1</CmdID> + <MsgRef>2</MsgRef> + <CmdRef>0</CmdRef> + <Cmd>SyncHdr</Cmd> + <TargetRef>http://www.syncml.org/sync-server</TargetRef> + <SourceRef>IMEI:493005100592800</SourceRef> + <Data>200</Data> + </Status> + <Status> + <!--This is a status for the client modifications to the server.--> + <CmdID>2</CmdID> + <MsgRef>2</MsgRef> + <CmdRef>3</CmdRef> + <Cmd>Sync</Cmd> + <TargetRef>./contacts/james_bond</TargetRef> + <SourceRef>./dev-contacts</SourceRef> + <Data>200</Data> + <!--Statuscode for Success--> + </Status> + <Status> + <CmdID>3</CmdID> + <MsgRef>2</MsgRef> + <CmdRef>4</CmdRef> + <Cmd>Replace</Cmd> + <SourceRef>1012</SourceRef> + <Data>200</Data> + <!--Statuscode for Success--> + </Status> + <Sync> + <CmdID>4</CmdID> + <Target> + <LocURI>./dev-contacts</LocURI> + </Target> + <Source> + <LocURI>./contacts/james_bond</LocURI> + </Source> + <Replace> + <CmdID>5</CmdID> + <Meta> + <Type xmlns="syncml:metinf">text/x-vcard</Type> + </Meta> + <Item> + <Target> + <LocURI>1023</LocURI> + </Target> + <!--The vCard data would be placed here.--> + <Data></Data> + </Item> + </Replace> + <Add> + <CmdID>6</CmdID> + <Meta> + <Type xmlns="syncml:metinf">text/x-vcard</Type> + </Meta> + <Item> + <Source> + <LocURI>10536681</LocURI> + </Source> + <!--The vCard data would be placed here.--> + <Data></Data> + </Item> + </Add> + <!-- This example was directly copied from the OMA DM TNDS 1.2 specification --> + <Add> + <CmdID>4</CmdID> + <Item> + <Target> + <LocURI>/OperatorX</LocURI> + </Target> + <Meta> + <Format xmlns="syncml:metinf">xml</Format> + <Type xmlns="syncml:metinf"> + application/vnd.syncml.dmtnds+xml + </Type> + </Meta> + <Data> + <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> + </Data> + </Item> + </Add> + </Sync> + <Final/> + </SyncBody> +</SyncML> Modified: wbxmlTestSuite/trunk/launchTests.sh ============================================================================== --- wbxmlTestSuite/trunk/launchTests.sh Fri Jan 23 15:48:59 2009 (r181) +++ wbxmlTestSuite/trunk/launchTests.sh Fri Jan 23 15:50:09 2009 (r182) @@ -98,7 +98,7 @@ if [ `basename $i` != 'ddf' ]; then TESTLIST=$(find $i -maxdepth 1 -type f -name "*.xml" -print | sort ) else - TESTLIST=$(find $i -maxdepth 1 -type f -name "*.ddf" -print | sort ) + TESTLIST=$(find $i -maxdepth 1 -type f \( -name "*.ddf" -or -name "*.xml" \) -print | sort ) fi if [ " $3" != " " ] then @@ -146,7 +146,7 @@ else if [ "$TESTDIR" = "airsync" ]; then PARAMS="-l AIRSYNC" - else if [ "$TESTDIR" = "ddf" ]; + else if [ "$TESTDIR" != `basename $i ddf` ]; then PARAMS="-l DMDDF12" else |