From fa3da68dfa43341a8b6722d2e8a787c14cef02b9 Mon Sep 17 00:00:00 2001
From: markus schnalke <meillo@marmaro.de>
Date: Wed, 10 Aug 2016 19:25:53 +0200
Subject: [PATCH] Add more tests to tests/test-send-mimeify

---
 test/tests/send/amphioctopus-marginatus.png |  Bin 0 -> 954 bytes
 test/tests/send/test-mimeify                |  244 +++++++++++++++++++++++++++
 test/tests/send/ulm.txt                     |    1 +
 3 files changed, 245 insertions(+)
 create mode 100644 test/tests/send/amphioctopus-marginatus.png
 create mode 100644 test/tests/send/ulm.txt

diff --git a/test/tests/send/amphioctopus-marginatus.png b/test/tests/send/amphioctopus-marginatus.png
new file mode 100644
index 0000000000000000000000000000000000000000..d66764001775996b6f90f9c52cc8df7e93dd55b8
GIT binary patch
literal 954
zcmeAS@N?(olHy`uVBq!ia0vp^MnJ61!VDx&oH%w7NU@|l`Z_W&Z0zU$lgJ9>GZqKA
zJ29*~C-V}>QAqX(@?~JCQe$9fXklRZ1r%y{!N5>zz`*b-fq}tl1_Oh5!JJ)zHb4o3
z0G|+7Q*8r%4IN{3eQtIZ4H@Cq+^rp@>pU!6=1$z2A2BD$w0~mh2@{2wb@R@jJN&S>
zI%Cz&^Lv1Lc}jx(f*JLq{{GDTcl+<ZKYu1}Dq;bOa~60+7Bet#cY-jZ`N`93L4suk
zj_E*p8W3wUteCsij)8$G!qdeu#Nzbc$@Uqy9Yl^zwYqTif@yR6G=~!po~<i+DNr=M
zt17cVG2qog@6eTN6`K#1YL;+6cl4XyF;9d;L}tPo%Lg(iCkSNt97{^+xpH-BM6!(Y
z!>VaA)@7Tw<zJZp{c`#J-QWEteL0_`R_bh|=&70c^(${iW~!gQ)X(?zj66^FE;t>!
z$&lCJ-`}(RJLUGwF*>*+<lGFq=QYVupDt*~*Ke_SUq5fki65O+0cTCicG_z;x^Brc
zy<5(E>;623%@WSDS6Sydt7ZokZ8FGt_wsA8y8oulHx0cw6mEyjwk*5%dVBm@-U~ia
zF?kPnTO<b@3lVB@eDQbB4BvatCfYk0Bwzo#ZGHJ+ztqzg_O5@wU8za&SHgzH8y3G#
ztoZ31YI|1S#f+7uSS<OVnquN{Wf$c+`p1_lzKF=zjSpm1`nT*?>-T^=#thlN*Bsl@
z?d_!HIQf%YT;DfNL7UatW{bO4h3~pIdzHdU4`zm#lx4{?yEJxR(t7*N!0))Tu+-_o
ztXT_%?w>yUy{kesi}6sxy?`@q3N5l`AD1ij<s7MF*s*-$vZJp;5*=S>t~ZGB5!z~-
z@$~S7skvVL9_uxdZDg7RY_~Ukn4UEI*u!-Ng7=T@W#h2f_BrwTa<$M^MTrgv3b-;d
z=Nj!_D;rQ8t)u49qu^3>a@p_F;|u-5JPwF@IvDO2U-o#;{9Acq$0yBTXt?;Q>2|@v
znZMuca+zZA;?>7ToEbaR6Ihn0eq?xDzTv?<x9?v<`P~fD!`!(%cd;E%UT$@Yd;S&=
z)kzl(nV(y~{GB{W;Q#FpKkj<=i2m39$MA2Jtn0<u^SywHO|`@|q9i4;B-JXpC>2OC
z7#SFv=^9w*8XANcT3DGFTA7+_8yHy`7+79o^heQ<o1c=IR*74KNB7RpKn)C@u6{1-
HoD!M<?-q}G

literal 0
HcmV?d00001

diff --git a/test/tests/send/test-mimeify b/test/tests/send/test-mimeify
index 96e2418..9530f2b 100644
--- a/test/tests/send/test-mimeify
+++ b/test/tests/send/test-mimeify
@@ -60,3 +60,247 @@ foo
 ----EOM----
 alice
 !
+
+
+cat >"$draft" <<!
+To: meillo
+Cc:
+Subject: mime test 1
+Date: Fri, 05 Aug 2016 21:38:40 +0200
+--------
+foo
+!
+runandcheck 'send -debug "$draft" | sed "/^Content-ID/s/:.*/: <TESTID>/"' <<!
+To: meillo
+Subject: mime test 1
+Date: Fri, 05 Aug 2016 21:38:40 +0200
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
+Content-ID: <TESTID>
+From: Bob <bob@example.org>
+
+foo
+----EOM----
+meillo
+!
+
+cat >"$draft" <<!
+To: meillo
+Cc:
+Subject: mime test 2
+Date: Fri, 05 Aug 2016 21:38:56 +0200
+--------
+foo
+füße
+!
+runandcheck 'send -debug "$draft" | sed "/^Content-ID/s/:.*/: <TESTID>/"' <<!
+To: meillo
+Subject: mime test 2
+Date: Fri, 05 Aug 2016 21:38:56 +0200
+MIME-Version: 1.0
+Content-Type: text/plain; charset="UTF-8"
+Content-ID: <TESTID>
+Content-Transfer-Encoding: quoted-printable
+From: Bob <bob@example.org>
+
+foo
+f=C3=BC=C3=9Fe
+----EOM----
+meillo
+!
+
+cat >"$draft" <<!
+To: meillo
+Cc:
+Subject:mime test 3
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
+Date: Fri, 05 Aug 2016 21:42:16 +0200
+--------
+foo
+!
+runandcheck 'send -debug "$draft" | sed "/^Content-ID/s/:.*/: <TESTID>/"' <<!
+To: meillo
+Subject: mime test 3
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
+Date: Fri, 05 Aug 2016 21:42:16 +0200
+From: Bob <bob@example.org>
+
+foo
+----EOM----
+meillo
+!
+
+cat >"$draft" <<!
+To: meillo
+Cc:
+Subject:mime test 4
+MIME-Version: 1.0
+Content-Type: text/html; charset="us-ascii"
+Date: Fri, 05 Aug 2016 21:43:06 +0200
+--------
+<b>füße</b>
+!
+runandcheck 'send -debug "$draft"' <<!
+To: meillo
+Subject: mime test 4
+MIME-Version: 1.0
+Content-Type: text/html; charset="us-ascii"
+Date: Fri, 05 Aug 2016 21:43:06 +0200
+From: Bob <bob@example.org>
+
+<b>füße</b>
+----EOM----
+meillo
+!
+
+cat >"$draft" <<!
+To: meillo
+Cc:
+Subject:mime test 5
+MIME-Version: 1.0
+Content-Type: text/plain; charset="latin1"
+Date: Fri, 05 Aug 2016 21:44:00 +0200
+--------
+füße
+!
+runandcheck 'send -debug "$draft"' <<!
+To: meillo
+Subject: mime test 5
+MIME-Version: 1.0
+Content-Type: text/plain; charset="latin1"
+Date: Fri, 05 Aug 2016 21:44:00 +0200
+From: Bob <bob@example.org>
+
+füße
+----EOM----
+meillo
+!
+
+
+# now something more complex with separate call to mhbuild(1)
+
+cat >"$draft" <<!
+To: meillo
+Cc:
+Subject: mime test 6
+Date: Fri, 05 Aug 2016 21:46:20 +0200
+--------
+foo
+#<text/html
+<b>bar</b>
+#text/plain tests/send/ulm.txt
+Käse
+#begin [Picture of an Amphioctopus marginatus] alternative
+#image/png tests/send/amphioctopus-marginatus.png
+Amphioctopus marginatus sitting in its portable home
+composed of coconut shell pieces.
+#end
+end
+!
+runandcheck 'mhbuild "$draft"' <<!
+!
+runandcheck 'mhlist -v -file "$draft"' <<!
+ msg part  type/subtype              size description                         
+   0       multipart/mixed           2623
+		boundary="----- =_aaaaaaaaaa0"
+     1     text/plain                   4
+		charset="us-ascii"
+     2     text/html                   11
+		charset="us-ascii"
+     3     text/plain                  35
+		charset="us-ascii"
+     4     text/plain                   6
+		charset="UTF-8"
+     5     multipart/alternative     1663 Picture of an Amphioctopus marginatu
+		boundary="----- =_aaaaaaaaaa1"
+     5.1   text/plain                  87
+		charset="us-ascii"
+     5.2   image/png                  954
+     6     text/plain                   4
+		charset="us-ascii"
+!
+runandcheck 'send -debug "$draft" | sed "/^Content-ID/s/:.*/: <TESTID>/"' <<!
+To: meillo
+Subject: mime test 6
+Date: Fri, 05 Aug 2016 21:46:20 +0200
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
+Content-ID: <TESTID>
+From: Bob <bob@example.org>
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; charset="us-ascii"
+Content-ID: <TESTID>
+
+foo
+
+------- =_aaaaaaaaaa0
+Content-Type: text/html; charset="us-ascii"
+Content-ID: <TESTID>
+
+<b>bar</b>
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; charset="us-ascii"
+Content-ID: <TESTID>
+
+in ulm und um ulm und um ulm herum
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; charset="UTF-8"
+Content-ID: <TESTID>
+Content-Transfer-Encoding: quoted-printable
+
+K=C3=A4se
+
+------- =_aaaaaaaaaa0
+Content-Type: multipart/alternative; boundary="----- =_aaaaaaaaaa1"
+Content-ID: <TESTID>
+Content-Description: Picture of an Amphioctopus marginatus
+
+------- =_aaaaaaaaaa1
+Content-Type: image/png
+Content-ID: <TESTID>
+Content-Transfer-Encoding: base64
+
+iVBORw0KGgoAAAANSUhEUgAAADIAAAArBAMAAADIyMbRAAAABGdBTUEAALGPC/xhBQAAAAFzUkdC
+AK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAADBQTFRF
+NSswLygsMycvCwcEKBwThW21iHWuSDhEnZG1b1icUjWPkXXINCBcrp7PzsPhjXtoqrnPvAAAAAx0
+Uk5TAS5a/flp/tv9/vz8kbJyBAAAAAlwSFlzAAALiQAAC4kBN8nLrQAAAAl2cEFnAAAAlgAAACsA
+qJ21PgAAAlhJREFUOMu9kz9o20AUxpU60NXQNYOHlkDI4OaudOkQcpeKemlwIVDqoUtVqa0hg8F1
+KXQL50FOl4ieFAgUHJCsOeAcyZAQaEzGYmSM1NWlWGMcQ+F6lhw7drO2b9Cf99N337v3TpL0z2Im
+dUMyIUkpafX1DWhpZU4vGvnvfwEM5L2gy1WyMQ0w/v3ND7kevJwywahUzpg+53xjWvLQKB9/tDjv
+f56UyPiJelDNNXa5PymBRbRuNd13DdrfngCzGEObqjtuQyVrUnKyMGzu6fVzJ0+ys9kxSggg21ab
+OXbe67dfrQ3QTFpcbuG7OGNQxlQShEHo/byYTd7mkT9CMGPX/bavd8NOZcvQva/vtyKCIfpgsKOw
+o+thePlDVT3NL0Q2BQRzFmPBJiFhxyNEI5wvx6Uh6FhvLV9RBSL+pvqF91DcMwBr+6zGtItLQipB
+k/IeXo72CRE8q2s2o4qqV7rem6ogqUgDAFxkpmOZiii70irt9jBOx0MTGstxapqhEt/LzfeKeCVq
+AcJg3lDMhiCEHTbxpyKObMR+ALinsabF6lRhQetprzBcTBK1PWjlw5CVbUqPSK8oYzwcghA9t4Lw
+l2KbxuGucBHfxr0GCDy282HXpyZVqnJhQMBwCmhpnTK/rR1Qc1ssJkCMIERyyab7dcehTlZIwBVJ
+QDG7F6bjnJ/abhbHkpgAgNHqgttwwZn77LpElDDo6vHiCWi4J2AEpCXxAON3sOCeRvf0VQ9GMWdW
+RwpJugbAI6c6yguftEglktExA+c76ftjkhD/2/D43UmMFf8r/gD+qh1F0ZufSgAAACV0RVh0ZGF0
+ZTpjcmVhdGUAMjAxNi0wOC0xMFQxODo0MTo1NyswMjowMDnWAU8AAAAldEVYdGRhdGU6bW9kaWZ5
+ADIwMTYtMDgtMTBUMTg6NDE6NTcrMDI6MDBIi7nzAAAAAElFTkSuQmCC
+
+------- =_aaaaaaaaaa1
+Content-Type: text/plain; charset="us-ascii"
+Content-ID: <TESTID>
+
+Amphioctopus marginatus sitting in its portable home
+composed of coconut shell pieces.
+
+------- =_aaaaaaaaaa1--
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; charset="us-ascii"
+Content-ID: <TESTID>
+
+end
+
+------- =_aaaaaaaaaa0--
+----EOM----
+meillo
+!
+
+rm "$draft.orig"
diff --git a/test/tests/send/ulm.txt b/test/tests/send/ulm.txt
new file mode 100644
index 0000000..ddeb0d4
--- /dev/null
+++ b/test/tests/send/ulm.txt
@@ -0,0 +1 @@
+in ulm und um ulm und um ulm herum
-- 
1.7.10.4