From: <svn...@op...> - 2009-03-05 14:15:00
|
Author: bellmich Date: Thu Mar 5 15:14:52 2009 New Revision: 191 URL: http://libwbxml.opensync.org/changeset/191 Log: - The normalization code supports now expected conversion values. The example defines that the next text data must be replaced with 1234567890. Please note that case and blanks are strictly required. <!-- EXPECTED ::= 1234567890 --> - Several tests with hexadecimal numbers were fixed. - Some new datetime tests were added because the code is buggy. Added: wbxmlTestSuite/trunk/wv/wv-106-datetime.xml wbxmlTestSuite/trunk/wv/wv-107-datetime.xml wbxmlTestSuite/trunk/wv/wv-108-datetime.xml wbxmlTestSuite/trunk/wv/wv-109-datetime.xml wbxmlTestSuite/trunk/wv/wv-110-datetime.xml wbxmlTestSuite/trunk/wv/wv-111-datetime.xml wbxmlTestSuite/trunk/wv/wv-112-datetime.xml wbxmlTestSuite/trunk/wv/wv-113-datetime.xml wbxmlTestSuite/trunk/wv/wv-114-datetime.xml wbxmlTestSuite/trunk/wv/wv-115-datetime.xml wbxmlTestSuite/trunk/wv/wv-116-datetime.xml Modified: wbxmlTestSuite/trunk/launchTests.sh wbxmlTestSuite/trunk/normalize_xml.pl wbxmlTestSuite/trunk/wv/wv-021.xml wbxmlTestSuite/trunk/wv/wv-022.xml wbxmlTestSuite/trunk/wv/wv-023.xml wbxmlTestSuite/trunk/wv/wv-024.xml Modified: wbxmlTestSuite/trunk/launchTests.sh ============================================================================== --- wbxmlTestSuite/trunk/launchTests.sh Thu Feb 19 18:11:58 2009 (r190) +++ wbxmlTestSuite/trunk/launchTests.sh Thu Mar 5 15:14:52 2009 (r191) @@ -169,11 +169,6 @@ then # SyncML CDATA fix makes comparing sometimes impossible echo CDATA_ENCAPSULATION - else if [ `basename $j` = "wv-021.xml" -o `basename $j` = "wv-022.xml" -o `basename $j` = "wv-023.xml" -o `basename $j` = "wv-024.xml" ] - then - # WV tests which test hexadecimal numbers can only executed - # because libwbxml always outputs decimal numbers - echo HEX_CONVERSION else $PERL_BIN $NORMALIZE_SCRIPT --delete-attribute xmlns $j $OUT_XML.org $PERL_BIN $NORMALIZE_SCRIPT --delete-attribute xmlns $OUT_XML $OUT_XML.new @@ -185,7 +180,7 @@ else echo SUCCEEDED fi - fi fi fi + fi fi done fi Modified: wbxmlTestSuite/trunk/normalize_xml.pl ============================================================================== --- wbxmlTestSuite/trunk/normalize_xml.pl Thu Feb 19 18:11:58 2009 (r190) +++ wbxmlTestSuite/trunk/normalize_xml.pl Thu Mar 5 15:14:52 2009 (r191) @@ -123,6 +123,7 @@ my $char = ""; my $text = ""; my $element = ""; +my $expected = ""; $state = "NEUTRAL"; while (1) { ## $line works line oriented @@ -149,6 +150,11 @@ # handle comment or element which starts in a text line if ($state eq "TEXT" and $char eq "<") { + if (length($expected)) { + # the original text must be replaced for test validation + $text = $expected; + $expected = ""; + } $text =~ s{\s*$}{}; print $NEW_FD "${text}\n"; $state = "NEUTRAL"; @@ -167,6 +173,7 @@ $char = substr($line, 0, 2); $line = substr($line, 2); $state = "COMMENT"; + $text = ""; } elsif ($line =~ q{^\[CDATA\[}) { ## CDATA section detected for (my $i = 0; $i < $indent; $i++) { @@ -209,7 +216,16 @@ # end of comment $line = substr($line, 2); $state = "NEUTRAL"; - } + # check if this is a special action configuration + if ($text =~ m{^\sEXPECTED\s::=\s.*\s$}) { + # This is the value for the next text data. + $expected = $text; + $expected =~ s{^\sEXPECTED\s::=\s(.*)\s$}{$1}; + $text = ""; + } + } else { + $text .= $char; + } next; } Modified: wbxmlTestSuite/trunk/wv/wv-021.xml ============================================================================== --- wbxmlTestSuite/trunk/wv/wv-021.xml Thu Feb 19 18:11:58 2009 (r190) +++ wbxmlTestSuite/trunk/wv/wv-021.xml Thu Mar 5 15:14:52 2009 (r191) @@ -19,6 +19,7 @@ <TransactionContent xmlns="http://www.wireless-village.org/TRC1.1"> <Search-Response> + <!-- EXPECTED ::= 595760001 --> <SearchID>0x23829381</SearchID> <SearchFindings>7</SearchFindings> Modified: wbxmlTestSuite/trunk/wv/wv-022.xml ============================================================================== --- wbxmlTestSuite/trunk/wv/wv-022.xml Thu Feb 19 18:11:58 2009 (r190) +++ wbxmlTestSuite/trunk/wv/wv-022.xml Thu Mar 5 15:14:52 2009 (r191) @@ -17,6 +17,7 @@ <TransactionContent xmlns="http://www.wireless-village.org/TRC1.1"> <Search-Request> + <!-- EXPECTED ::= 595760001 --> <SearchID>0x23829381</SearchID> <SearchIndex>6</SearchIndex> Modified: wbxmlTestSuite/trunk/wv/wv-023.xml ============================================================================== --- wbxmlTestSuite/trunk/wv/wv-023.xml Thu Feb 19 18:11:58 2009 (r190) +++ wbxmlTestSuite/trunk/wv/wv-023.xml Thu Mar 5 15:14:52 2009 (r191) @@ -19,6 +19,7 @@ <TransactionContent xmlns="http://www.wireless-village.org/TRC1.1"> <Search-Response> + <!-- EXPECTED ::= 595760001 --> <SearchID>0x23829381</SearchID> <SearchFindings>7</SearchFindings> Modified: wbxmlTestSuite/trunk/wv/wv-024.xml ============================================================================== --- wbxmlTestSuite/trunk/wv/wv-024.xml Thu Feb 19 18:11:58 2009 (r190) +++ wbxmlTestSuite/trunk/wv/wv-024.xml Thu Mar 5 15:14:52 2009 (r191) @@ -17,6 +17,7 @@ <TransactionContent xmlns="http://www.wireless-village.org/TRC1.1"> <StopSearch-Request> + <!-- EXPECTED ::= 595760001 --> <SearchID>0x23829381</SearchID> </StopSearch-Request> </TransactionContent> Added: wbxmlTestSuite/trunk/wv/wv-106-datetime.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ wbxmlTestSuite/trunk/wv/wv-106-datetime.xml Thu Mar 5 15:14:52 2009 (r191) @@ -0,0 +1,66 @@ +<?xml version="1.0"?> +<!DOCTYPE WV-CSP-Message PUBLIC "-//OMA//DTD WV-CSP 1.1//EN" "http://www.openmobilealliance.org/DTD/WV-CSP.XML"> +<WV-CSP-Message xmlns="http://www.wireless-village.org/CSP1.1"> + <Session> + <SessionDescriptor> + <SessionType>Inband</SessionType> + + <SessionID>im.user.com#48...@se...</SessionID> + </SessionDescriptor> + + <Transaction> + <TransactionDescriptor> + <TransactionMode>Request</TransactionMode> + + <TransactionID>IMApp01#12345@NOK5110</TransactionID> + + <Poll>F</Poll> + </TransactionDescriptor> + + <TransactionContent xmlns="http://www.wireless-village.org/TRC1.1"> + <MessageNotification> + <MessageInfo> + <MessageID>0x0000f132</MessageID> + + <ContentType>text/plain</ContentType> + + <ContentEncoding>None</ContentEncoding> + + <ContentSize>189</ContentSize> + + <Recipient> + <Group> + <ScreenName> + <SName>Johnnie</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Recipient> + + <Sender> + <Group> + <ScreenName> + <SName>Wicked Vicky</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Sender> + + <!-- datetime format test + - without seconds + - without timezone + - without any number seperators + --> + <!-- EXPECTED ::= 20010925T1340Z --> + <DateTime>20010925T1340</DateTime> + + <Validity>600</Validity> + </MessageInfo> + </MessageNotification> + </TransactionContent> + </Transaction> + </Session> +</WV-CSP-Message> + Added: wbxmlTestSuite/trunk/wv/wv-107-datetime.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ wbxmlTestSuite/trunk/wv/wv-107-datetime.xml Thu Mar 5 15:14:52 2009 (r191) @@ -0,0 +1,66 @@ +<?xml version="1.0"?> +<!DOCTYPE WV-CSP-Message PUBLIC "-//OMA//DTD WV-CSP 1.1//EN" "http://www.openmobilealliance.org/DTD/WV-CSP.XML"> +<WV-CSP-Message xmlns="http://www.wireless-village.org/CSP1.1"> + <Session> + <SessionDescriptor> + <SessionType>Inband</SessionType> + + <SessionID>im.user.com#48...@se...</SessionID> + </SessionDescriptor> + + <Transaction> + <TransactionDescriptor> + <TransactionMode>Request</TransactionMode> + + <TransactionID>IMApp01#12345@NOK5110</TransactionID> + + <Poll>F</Poll> + </TransactionDescriptor> + + <TransactionContent xmlns="http://www.wireless-village.org/TRC1.1"> + <MessageNotification> + <MessageInfo> + <MessageID>0x0000f132</MessageID> + + <ContentType>text/plain</ContentType> + + <ContentEncoding>None</ContentEncoding> + + <ContentSize>189</ContentSize> + + <Recipient> + <Group> + <ScreenName> + <SName>Johnnie</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Recipient> + + <Sender> + <Group> + <ScreenName> + <SName>Wicked Vicky</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Sender> + + <!-- datetime format test + - with seconds + - without timezone + - without any number seperators + --> + <!-- EXPECTED ::= 20010925T134013Z --> + <DateTime>20010925T134013</DateTime> + + <Validity>600</Validity> + </MessageInfo> + </MessageNotification> + </TransactionContent> + </Transaction> + </Session> +</WV-CSP-Message> + Added: wbxmlTestSuite/trunk/wv/wv-108-datetime.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ wbxmlTestSuite/trunk/wv/wv-108-datetime.xml Thu Mar 5 15:14:52 2009 (r191) @@ -0,0 +1,65 @@ +<?xml version="1.0"?> +<!DOCTYPE WV-CSP-Message PUBLIC "-//OMA//DTD WV-CSP 1.1//EN" "http://www.openmobilealliance.org/DTD/WV-CSP.XML"> +<WV-CSP-Message xmlns="http://www.wireless-village.org/CSP1.1"> + <Session> + <SessionDescriptor> + <SessionType>Inband</SessionType> + + <SessionID>im.user.com#48...@se...</SessionID> + </SessionDescriptor> + + <Transaction> + <TransactionDescriptor> + <TransactionMode>Request</TransactionMode> + + <TransactionID>IMApp01#12345@NOK5110</TransactionID> + + <Poll>F</Poll> + </TransactionDescriptor> + + <TransactionContent xmlns="http://www.wireless-village.org/TRC1.1"> + <MessageNotification> + <MessageInfo> + <MessageID>0x0000f132</MessageID> + + <ContentType>text/plain</ContentType> + + <ContentEncoding>None</ContentEncoding> + + <ContentSize>189</ContentSize> + + <Recipient> + <Group> + <ScreenName> + <SName>Johnnie</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Recipient> + + <Sender> + <Group> + <ScreenName> + <SName>Wicked Vicky</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Sender> + + <!-- datetime format test + - without seconds + - with timezone + - without any number seperators + --> + <DateTime>20010925T1340Z</DateTime> + + <Validity>600</Validity> + </MessageInfo> + </MessageNotification> + </TransactionContent> + </Transaction> + </Session> +</WV-CSP-Message> + Added: wbxmlTestSuite/trunk/wv/wv-109-datetime.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ wbxmlTestSuite/trunk/wv/wv-109-datetime.xml Thu Mar 5 15:14:52 2009 (r191) @@ -0,0 +1,65 @@ +<?xml version="1.0"?> +<!DOCTYPE WV-CSP-Message PUBLIC "-//OMA//DTD WV-CSP 1.1//EN" "http://www.openmobilealliance.org/DTD/WV-CSP.XML"> +<WV-CSP-Message xmlns="http://www.wireless-village.org/CSP1.1"> + <Session> + <SessionDescriptor> + <SessionType>Inband</SessionType> + + <SessionID>im.user.com#48...@se...</SessionID> + </SessionDescriptor> + + <Transaction> + <TransactionDescriptor> + <TransactionMode>Request</TransactionMode> + + <TransactionID>IMApp01#12345@NOK5110</TransactionID> + + <Poll>F</Poll> + </TransactionDescriptor> + + <TransactionContent xmlns="http://www.wireless-village.org/TRC1.1"> + <MessageNotification> + <MessageInfo> + <MessageID>0x0000f132</MessageID> + + <ContentType>text/plain</ContentType> + + <ContentEncoding>None</ContentEncoding> + + <ContentSize>189</ContentSize> + + <Recipient> + <Group> + <ScreenName> + <SName>Johnnie</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Recipient> + + <Sender> + <Group> + <ScreenName> + <SName>Wicked Vicky</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Sender> + + <!-- datetime format test + - with seconds + - with timezone + - without any number seperators + --> + <DateTime>20010925T134013Z</DateTime> + + <Validity>600</Validity> + </MessageInfo> + </MessageNotification> + </TransactionContent> + </Transaction> + </Session> +</WV-CSP-Message> + Added: wbxmlTestSuite/trunk/wv/wv-110-datetime.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ wbxmlTestSuite/trunk/wv/wv-110-datetime.xml Thu Mar 5 15:14:52 2009 (r191) @@ -0,0 +1,65 @@ +<?xml version="1.0"?> +<!DOCTYPE WV-CSP-Message PUBLIC "-//OMA//DTD WV-CSP 1.1//EN" "http://www.openmobilealliance.org/DTD/WV-CSP.XML"> +<WV-CSP-Message xmlns="http://www.wireless-village.org/CSP1.1"> + <Session> + <SessionDescriptor> + <SessionType>Inband</SessionType> + + <SessionID>im.user.com#48...@se...</SessionID> + </SessionDescriptor> + + <Transaction> + <TransactionDescriptor> + <TransactionMode>Request</TransactionMode> + + <TransactionID>IMApp01#12345@NOK5110</TransactionID> + + <Poll>F</Poll> + </TransactionDescriptor> + + <TransactionContent xmlns="http://www.wireless-village.org/TRC1.1"> + <MessageNotification> + <MessageInfo> + <MessageID>0x0000f132</MessageID> + + <ContentType>text/plain</ContentType> + + <ContentEncoding>None</ContentEncoding> + + <ContentSize>189</ContentSize> + + <Recipient> + <Group> + <ScreenName> + <SName>Johnnie</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Recipient> + + <Sender> + <Group> + <ScreenName> + <SName>Wicked Vicky</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Sender> + + <!-- datetime format test + - with seconds + - with timezone + - with number seperators + --> + <DateTime>2001-09-25T13:40:13Z</DateTime> + + <Validity>600</Validity> + </MessageInfo> + </MessageNotification> + </TransactionContent> + </Transaction> + </Session> +</WV-CSP-Message> + Added: wbxmlTestSuite/trunk/wv/wv-111-datetime.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ wbxmlTestSuite/trunk/wv/wv-111-datetime.xml Thu Mar 5 15:14:52 2009 (r191) @@ -0,0 +1,66 @@ +<?xml version="1.0"?> +<!DOCTYPE WV-CSP-Message PUBLIC "-//OMA//DTD WV-CSP 1.1//EN" "http://www.openmobilealliance.org/DTD/WV-CSP.XML"> +<WV-CSP-Message xmlns="http://www.wireless-village.org/CSP1.1"> + <Session> + <SessionDescriptor> + <SessionType>Inband</SessionType> + + <SessionID>im.user.com#48...@se...</SessionID> + </SessionDescriptor> + + <Transaction> + <TransactionDescriptor> + <TransactionMode>Request</TransactionMode> + + <TransactionID>IMApp01#12345@NOK5110</TransactionID> + + <Poll>F</Poll> + </TransactionDescriptor> + + <TransactionContent xmlns="http://www.wireless-village.org/TRC1.1"> + <MessageNotification> + <MessageInfo> + <MessageID>0x0000f132</MessageID> + + <ContentType>text/plain</ContentType> + + <ContentEncoding>None</ContentEncoding> + + <ContentSize>189</ContentSize> + + <Recipient> + <Group> + <ScreenName> + <SName>Johnnie</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Recipient> + + <Sender> + <Group> + <ScreenName> + <SName>Wicked Vicky</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Sender> + + <!-- datetime format test + - with seconds + - with timezone + - with number seperators + - with timezone of Germany + --> + <DateTime>2001-09-25T13:40:13A</DateTime> + + <Validity>600</Validity> + </MessageInfo> + </MessageNotification> + </TransactionContent> + </Transaction> + </Session> +</WV-CSP-Message> + Added: wbxmlTestSuite/trunk/wv/wv-112-datetime.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ wbxmlTestSuite/trunk/wv/wv-112-datetime.xml Thu Mar 5 15:14:52 2009 (r191) @@ -0,0 +1,66 @@ +<?xml version="1.0"?> +<!DOCTYPE WV-CSP-Message PUBLIC "-//OMA//DTD WV-CSP 1.1//EN" "http://www.openmobilealliance.org/DTD/WV-CSP.XML"> +<WV-CSP-Message xmlns="http://www.wireless-village.org/CSP1.1"> + <Session> + <SessionDescriptor> + <SessionType>Inband</SessionType> + + <SessionID>im.user.com#48...@se...</SessionID> + </SessionDescriptor> + + <Transaction> + <TransactionDescriptor> + <TransactionMode>Request</TransactionMode> + + <TransactionID>IMApp01#12345@NOK5110</TransactionID> + + <Poll>F</Poll> + </TransactionDescriptor> + + <TransactionContent xmlns="http://www.wireless-village.org/TRC1.1"> + <MessageNotification> + <MessageInfo> + <MessageID>0x0000f132</MessageID> + + <ContentType>text/plain</ContentType> + + <ContentEncoding>None</ContentEncoding> + + <ContentSize>189</ContentSize> + + <Recipient> + <Group> + <ScreenName> + <SName>Johnnie</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Recipient> + + <Sender> + <Group> + <ScreenName> + <SName>Wicked Vicky</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Sender> + + <!-- datetime format test + - with seconds + - with timezone + - with number seperators + - with timezone of Germany + --> + <DateTime>2001-09-25T13:40:13+01:00</DateTime> + + <Validity>600</Validity> + </MessageInfo> + </MessageNotification> + </TransactionContent> + </Transaction> + </Session> +</WV-CSP-Message> + Added: wbxmlTestSuite/trunk/wv/wv-113-datetime.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ wbxmlTestSuite/trunk/wv/wv-113-datetime.xml Thu Mar 5 15:14:52 2009 (r191) @@ -0,0 +1,66 @@ +<?xml version="1.0"?> +<!DOCTYPE WV-CSP-Message PUBLIC "-//OMA//DTD WV-CSP 1.1//EN" "http://www.openmobilealliance.org/DTD/WV-CSP.XML"> +<WV-CSP-Message xmlns="http://www.wireless-village.org/CSP1.1"> + <Session> + <SessionDescriptor> + <SessionType>Inband</SessionType> + + <SessionID>im.user.com#48...@se...</SessionID> + </SessionDescriptor> + + <Transaction> + <TransactionDescriptor> + <TransactionMode>Request</TransactionMode> + + <TransactionID>IMApp01#12345@NOK5110</TransactionID> + + <Poll>F</Poll> + </TransactionDescriptor> + + <TransactionContent xmlns="http://www.wireless-village.org/TRC1.1"> + <MessageNotification> + <MessageInfo> + <MessageID>0x0000f132</MessageID> + + <ContentType>text/plain</ContentType> + + <ContentEncoding>None</ContentEncoding> + + <ContentSize>189</ContentSize> + + <Recipient> + <Group> + <ScreenName> + <SName>Johnnie</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Recipient> + + <Sender> + <Group> + <ScreenName> + <SName>Wicked Vicky</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Sender> + + <!-- datetime format test + - with seconds + - with timezone + - with number seperators + - with timezone of Germany + --> + <DateTime>2001-09-25T13:40:13+0100</DateTime> + + <Validity>600</Validity> + </MessageInfo> + </MessageNotification> + </TransactionContent> + </Transaction> + </Session> +</WV-CSP-Message> + Added: wbxmlTestSuite/trunk/wv/wv-114-datetime.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ wbxmlTestSuite/trunk/wv/wv-114-datetime.xml Thu Mar 5 15:14:52 2009 (r191) @@ -0,0 +1,66 @@ +<?xml version="1.0"?> +<!DOCTYPE WV-CSP-Message PUBLIC "-//OMA//DTD WV-CSP 1.1//EN" "http://www.openmobilealliance.org/DTD/WV-CSP.XML"> +<WV-CSP-Message xmlns="http://www.wireless-village.org/CSP1.1"> + <Session> + <SessionDescriptor> + <SessionType>Inband</SessionType> + + <SessionID>im.user.com#48...@se...</SessionID> + </SessionDescriptor> + + <Transaction> + <TransactionDescriptor> + <TransactionMode>Request</TransactionMode> + + <TransactionID>IMApp01#12345@NOK5110</TransactionID> + + <Poll>F</Poll> + </TransactionDescriptor> + + <TransactionContent xmlns="http://www.wireless-village.org/TRC1.1"> + <MessageNotification> + <MessageInfo> + <MessageID>0x0000f132</MessageID> + + <ContentType>text/plain</ContentType> + + <ContentEncoding>None</ContentEncoding> + + <ContentSize>189</ContentSize> + + <Recipient> + <Group> + <ScreenName> + <SName>Johnnie</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Recipient> + + <Sender> + <Group> + <ScreenName> + <SName>Wicked Vicky</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Sender> + + <!-- datetime format test + - with seconds + - with timezone + - with number seperators + - with timezone of Germany + --> + <DateTime>2001-09-25T13:40:13+01</DateTime> + + <Validity>600</Validity> + </MessageInfo> + </MessageNotification> + </TransactionContent> + </Transaction> + </Session> +</WV-CSP-Message> + Added: wbxmlTestSuite/trunk/wv/wv-115-datetime.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ wbxmlTestSuite/trunk/wv/wv-115-datetime.xml Thu Mar 5 15:14:52 2009 (r191) @@ -0,0 +1,66 @@ +<?xml version="1.0"?> +<!DOCTYPE WV-CSP-Message PUBLIC "-//OMA//DTD WV-CSP 1.1//EN" "http://www.openmobilealliance.org/DTD/WV-CSP.XML"> +<WV-CSP-Message xmlns="http://www.wireless-village.org/CSP1.1"> + <Session> + <SessionDescriptor> + <SessionType>Inband</SessionType> + + <SessionID>im.user.com#48...@se...</SessionID> + </SessionDescriptor> + + <Transaction> + <TransactionDescriptor> + <TransactionMode>Request</TransactionMode> + + <TransactionID>IMApp01#12345@NOK5110</TransactionID> + + <Poll>F</Poll> + </TransactionDescriptor> + + <TransactionContent xmlns="http://www.wireless-village.org/TRC1.1"> + <MessageNotification> + <MessageInfo> + <MessageID>0x0000f132</MessageID> + + <ContentType>text/plain</ContentType> + + <ContentEncoding>None</ContentEncoding> + + <ContentSize>189</ContentSize> + + <Recipient> + <Group> + <ScreenName> + <SName>Johnnie</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Recipient> + + <Sender> + <Group> + <ScreenName> + <SName>Wicked Vicky</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Sender> + + <!-- datetime format test + - with seconds + - with timezone + - with number seperators + - with timezone of Germany + --> + <DateTime>2001-09-25T13:40:13+1</DateTime> + + <Validity>600</Validity> + </MessageInfo> + </MessageNotification> + </TransactionContent> + </Transaction> + </Session> +</WV-CSP-Message> + Added: wbxmlTestSuite/trunk/wv/wv-116-datetime.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ wbxmlTestSuite/trunk/wv/wv-116-datetime.xml Thu Mar 5 15:14:52 2009 (r191) @@ -0,0 +1,66 @@ +<?xml version="1.0"?> +<!DOCTYPE WV-CSP-Message PUBLIC "-//OMA//DTD WV-CSP 1.1//EN" "http://www.openmobilealliance.org/DTD/WV-CSP.XML"> +<WV-CSP-Message xmlns="http://www.wireless-village.org/CSP1.1"> + <Session> + <SessionDescriptor> + <SessionType>Inband</SessionType> + + <SessionID>im.user.com#48...@se...</SessionID> + </SessionDescriptor> + + <Transaction> + <TransactionDescriptor> + <TransactionMode>Request</TransactionMode> + + <TransactionID>IMApp01#12345@NOK5110</TransactionID> + + <Poll>F</Poll> + </TransactionDescriptor> + + <TransactionContent xmlns="http://www.wireless-village.org/TRC1.1"> + <MessageNotification> + <MessageInfo> + <MessageID>0x0000f132</MessageID> + + <ContentType>text/plain</ContentType> + + <ContentEncoding>None</ContentEncoding> + + <ContentSize>189</ContentSize> + + <Recipient> + <Group> + <ScreenName> + <SName>Johnnie</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Recipient> + + <Sender> + <Group> + <ScreenName> + <SName>Wicked Vicky</SName> + + <GroupID>wv:john/cha...@th...</GroupID> + </ScreenName> + </Group> + </Sender> + + <!-- datetime format test + - with seconds + - with timezone + - with number seperators + - with timezone of New York + --> + <DateTime>2001-09-25T13:40:13-05:00</DateTime> + + <Validity>600</Validity> + </MessageInfo> + </MessageNotification> + </TransactionContent> + </Transaction> + </Session> +</WV-CSP-Message> + |