3 files changed, 71 insertions, 1 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 7113a55..f100e54 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -31,9 +31,10 @@ TESTS = \
        hex.test \
        order.test \
        recursion.test \
+        entities.test \
        malformed_dict.test
-EXTRA_DIST = $(TESTS) data/1.plist data/2.plist data/3.plist data/4.plist data/5.plist data/6.plist data/7.plist data/signed.plist data/signed.bplist data/unsigned.plist data/unsigned.bplist data/hex.plist data/order.bplist data/recursion.bplist data/malformed_dict.bplist
+EXTRA_DIST = $(TESTS) data/1.plist data/2.plist data/3.plist data/4.plist data/5.plist data/6.plist data/7.plist data/signed.plist data/signed.bplist data/unsigned.plist data/unsigned.bplist data/hex.plist data/order.bplist data/recursion.bplist data/entities.plist data/malformed_dict.bplist
 TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) top_builddir=$(top_builddir)
diff --git a/test/data/entities.plist b/test/data/entities.plist
new file mode 100644
index 0000000..d7655d6
--- /dev/null
+++ b/test/data/entities.plist
@@ -0,0 +1,57 @@
+<plist version="1.0">
+<dict>
+    <key>some test entitites</key>
+    <dict>
+        <key>copyright</key>
+        <string>&#169;</string>
+        <key>multiple entitites</key>
+        <string>&#x2F20;&#x2F21;&#x2F22;</string>
+        <key>multiple entitites with characters inbetween</key>
+        <string>a&#x2F23;b&#x2F24;c&#x2F25;d</string>
+    </dict>
+    <key>one byte entity</key>
+    <dict>
+        <key>one byte entity</key>
+        <string>&#64;</string>
+        <key>one byte entity with text after</key>
+        <string>&#x40;z</string>
+        <key>one byte entity with text before</key>
+        <string>a&#x40;</string>
+        <key>one byte entity with text before &amp; after</key>
+        <string>a&#64;z</string>
+    </dict>
+    <key>two-byte utf-8</key>
+    <dict>
+        <key>two-byte utf-8</key>
+        <string>&#xC4;</string>
+        <key>two-byte utf-8 with text after</key>
+        <string>&#xCB;yz</string>
+        <key>two-byte utf-8 with text before</key>
+        <string>ab&#xD6;</string>
+        <key>two-byte utf-8 with text before &amp; after</key>
+        <string>ab&#xDC;yz</string>
+    </dict>
+    <key>three byte utf-8</key>
+    <dict>
+        <key>three byte utf-8</key>
+        <string>&#xFFE0;</string>
+        <key>three byte utf-8 with text after</key>
+        <string>&#65505;xyz</string>
+        <key>three byte utf-8 with text before</key>
+        <string>abc&#xFFE5;</string>
+        <key>three byte utf-8 with text before &amp; after</key>
+        <string>abc&#65510;xyz</string>
+    </dict>
+    <key>four byte utf-8</key>
+    <dict>
+        <key>four byte utf-8</key>
+        <string>&#x1D562;</string>
+        <key>four byte utf-8 with text after</key>
+        <string>&#x1D563;wxyz</string>
+        <key>four byte utf-8 with text before</key>
+        <string>abcd&#x1D564;</string>
+        <key>four byte utf-8 with text before &amp; after</key>
+        <string>abcd&#x1D565;wxyz</string>
+    </dict>
+</dict>
+</plist>
diff --git a/test/entities.test b/test/entities.test
new file mode 100755
index 0000000..b87e4c7
--- /dev/null
+++ b/test/entities.test
@@ -0,0 +1,12 @@
+## -*- sh -*-
+set -e
+DATASRC=$top_srcdir/test/data
+TESTFILE=entities.plist
+DATAIN0=$DATASRC/$TESTFILE
+DATAOUT0=$top_builddir/test/data/$TESTFILE.bin
+$top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
+$top_builddir/test/plist_cmp $DATAIN0 $DATAOUT0

diff --git a/test/Makefile.am b/test/Makefile.am index 7113a55..f100e54 100644 --- a/test/Makefile.am +++ b/test/Makefile.am
@@ -31,9 +31,10 @@ TESTS = \
31	hex.test \	31	hex.test \
32	order.test \	32	order.test \
33	recursion.test \	33	recursion.test \
		34	entities.test \
34	malformed_dict.test	35	malformed_dict.test
35		36
36	EXTRA_DIST = $(TESTS) data/1.plist data/2.plist data/3.plist data/4.plist data/5.plist data/6.plist data/7.plist data/signed.plist data/signed.bplist data/unsigned.plist data/unsigned.bplist data/hex.plist data/order.bplist data/recursion.bplist data/malformed_dict.bplist	37	EXTRA_DIST = $(TESTS) data/1.plist data/2.plist data/3.plist data/4.plist data/5.plist data/6.plist data/7.plist data/signed.plist data/signed.bplist data/unsigned.plist data/unsigned.bplist data/hex.plist data/order.bplist data/recursion.bplist data/entities.plist data/malformed_dict.bplist
37		38
38	TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) top_builddir=$(top_builddir)	39	TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) top_builddir=$(top_builddir)
39		40


diff --git a/test/data/entities.plist b/test/data/entities.plist new file mode 100644 index 0000000..d7655d6 --- /dev/null +++ b/test/data/entities.plist
@@ -0,0 +1,57 @@
		1	<plist version="1.0">
		2	<dict>
		3	<key>some test entitites</key>
		4	<dict>
		5	<key>copyright</key>
		6	<string>©</string>
		7	<key>multiple entitites</key>
		8	<string>⼠⼡⼢</string>
		9	<key>multiple entitites with characters inbetween</key>
		10	<string>a⼣b⼤c⼥d</string>
		11	</dict>
		12	<key>one byte entity</key>
		13	<dict>
		14	<key>one byte entity</key>
		15	<string>@</string>
		16	<key>one byte entity with text after</key>
		17	<string>@z</string>
		18	<key>one byte entity with text before</key>
		19	<string>a@</string>
		20	<key>one byte entity with text before & after</key>
		21	<string>a@z</string>
		22	</dict>
		23	<key>two-byte utf-8</key>
		24	<dict>
		25	<key>two-byte utf-8</key>
		26	<string>Ä</string>
		27	<key>two-byte utf-8 with text after</key>
		28	<string>Ëyz</string>
		29	<key>two-byte utf-8 with text before</key>
		30	<string>abÖ</string>
		31	<key>two-byte utf-8 with text before & after</key>
		32	<string>abÜyz</string>
		33	</dict>
		34	<key>three byte utf-8</key>
		35	<dict>
		36	<key>three byte utf-8</key>
		37	<string>￠</string>
		38	<key>three byte utf-8 with text after</key>
		39	<string>￡xyz</string>
		40	<key>three byte utf-8 with text before</key>
		41	<string>abc￥</string>
		42	<key>three byte utf-8 with text before & after</key>
		43	<string>abc￦xyz</string>
		44	</dict>
		45	<key>four byte utf-8</key>
		46	<dict>
		47	<key>four byte utf-8</key>
		48	<string>𝕢</string>
		49	<key>four byte utf-8 with text after</key>
		50	<string>𝕣wxyz</string>
		51	<key>four byte utf-8 with text before</key>
		52	<string>abcd𝕤</string>
		53	<key>four byte utf-8 with text before & after</key>
		54	<string>abcd𝕥wxyz</string>
		55	</dict>
		56	</dict>
		57	</plist>


diff --git a/test/entities.test b/test/entities.test new file mode 100755 index 0000000..b87e4c7 --- /dev/null +++ b/test/entities.test
@@ -0,0 +1,12 @@
		1	## -- sh --
		2
		3	set -e
		4
		5	DATASRC=$top_srcdir/test/data
		6	TESTFILE=entities.plist
		7	DATAIN0=$DATASRC/$TESTFILE
		8	DATAOUT0=$top_builddir/test/data/$TESTFILE.bin
		9
		10	$top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
		11
		12	$top_builddir/test/plist_cmp $DATAIN0 $DATAOUT0