From 2809c23f9238bfc933d17ef430e13e8ced850b19 Mon Sep 17 00:00:00 2001
From: Romain Deltour <rdeltour@gmail.com>
Date: Mon, 5 Dec 2022 10:12:53 +0100
Subject: [PATCH] test: do not use file names with illegal characters in tests

File names with EPUB-illegal characters are also NTFS-invalid names,
so they can cause issues (cannot be easily checked out by git on Windows
or may cause runtime issues on NTFS).

This commit replaces the expanded EPUBs in invalid characters by tests
by packaged EPUBs.

Fix #1420.
---
 .../ocf-filename-character-forbidden-error.epub | Bin 0 -> 1506 bytes
 .../EPUB/content_|.xhtml                        |  11 -----------
 .../EPUB/nav.xhtml                              |  14 --------------
 .../EPUB/package.opf                            |  16 ----------------
 .../META-INF/container.xml                      |   6 ------
 .../mimetype                                    |   1 -
 ...orbidden-non-publication-resource-error.epub | Bin 0 -> 1620 bytes
 .../EPUB/content_001.xhtml                      |  11 -----------
 .../EPUB/nav.xhtml                              |  14 --------------
 .../EPUB/package.opf                            |  16 ----------------
 .../META-INF/container.xml                      |   6 ------
 .../META-INF/file_<>.txt                        |   0
 .../mimetype                                    |   1 -
 src/test/resources/epub3/04-ocf/ocf.feature     |   4 ++--
 14 files changed, 2 insertions(+), 98 deletions(-)
 create mode 100644 src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error.epub
 delete mode 100644 src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error/EPUB/content_|.xhtml
 delete mode 100644 src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error/EPUB/nav.xhtml
 delete mode 100644 src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error/EPUB/package.opf
 delete mode 100644 src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error/META-INF/container.xml
 delete mode 100644 src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error/mimetype
 create mode 100644 src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error.epub
 delete mode 100644 src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/EPUB/content_001.xhtml
 delete mode 100644 src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/EPUB/nav.xhtml
 delete mode 100644 src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/EPUB/package.opf
 delete mode 100644 src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/META-INF/container.xml
 delete mode 100644 src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/META-INF/file_<>.txt
 delete mode 100644 src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/mimetype

diff --git a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error.epub b/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error.epub
new file mode 100644
index 0000000000000000000000000000000000000000..34ee4171036e06490a8cbbdf1c84c53d450f9cf5
GIT binary patch
literal 1506
zcmWIWW@h1HU}9ikSX<B<nxD8@M+C?QVGbb9&CE?LsVqoMEGWpyOinDx%+J$LEhtUW
zuF5P30O}M0>f~T3+};|h$*s6@4N%7usBYJQP$&K5{JfIXyps4Dy^4&I+#K6}L;fZM
zk(TtIqFZ;H9C7t{sbDlCBjv)ujb2NAZ#lg%K3bozdF*A}yM5IsFMfR(6#L${S4HBi
zkQMi=o^9)n2qkE6e7v{3ZuYli_f0nEPnsB4v~iuy4Npom{1vYg8K_wyUE<oy&^K>V
zzn??r{SUX^7<6)KTxgm*HMA`|#C*H0YPa~WC*K?Feti=zoVhXhzI3X!_$8ex=G8l{
zo!}@bxm2()*sCofK8vwu_C8eK6>+;UJ^=d6i;;nW4@iT3mzP)u@mJ`C-Fb%%cwEz;
zYlkq(W?Q|TaBIPqC9=OIc9m#}ME9|rn3QN-`04x9r3)OEdrxTJqw?|H)8zkO|NcD1
z!|Rt<AX+9lXFjXBOEU8Y9q*ksQxmNYZCjVUV-3&wfW^lzKa|hhz0v<oa_C!yo?<2G
z<$nST-dg_dezMGAaj5v#1CEoE)&^c)<M~1OEB|?!pjI7A-TP~{Hy6E$ohw+Rwe9d)
zdH#jF)o!gejxNu7VU=}IbIWRf9hT`^9MV;_($wy9-(&N?b@}|?y!dCEpXeT4mDRmK
z#p%gqh7-a9i(EgQn^)NWWoJBUSV;f7^gb0B4ikWhMgSHT1&PVoiRr0&`2}gcLDv3<
z4FvA}6usu@qp^{>W03}@kbY<5@e6u7C%W|CcHS`T^gg}+dD5+ryAzBo_Pww4EZn?x
z?T=%13(ifQu#}5s*Dm8H(^Pey^`A7o6QbUF{p<3$MG0G^y&_s46l<E#_Vqeuo_SsW
z>CPbIn?Kq3io_So1b+(aFM8pyMz(gXp<=UMfb)&%A6Rn|3^Nut|0_P>YdiBt>3uim
zVDFrZMuih1XL&B;44h%bFA^n^;?<$PV&2J#SJzflMBm}!3p`<)<uA#+c4t7V9^dls
zcmGV#e^qp3`t{|%Ic$5BDtPp2?pMA!?9aK3@5XJ#?R%V#Nvt>*YUX_<bW-fOsi%&s
zSL;9VczmnqesxS^*_8(Zi*#7GT-^08CgCvuQX_$+tI5SXtmoccdOLK3E=PA;iBO%*
zv;}+fS6*w}-`MlmI8N(Ca_sW`>b7?O<J04(75oUExbe8iJ_#GkIcIJ({OwCRt~GIM
zvslsh`q2G|C;??#{mbiERs*Br2M~(^v9D{0qpqi)8#n_dX6B_9=~d+B#P%KJI%FW=
za{in4p}3`P`9ia}n&#QQU|;hxtodbLM$pCm+q+g&$W$2Tue!RH`;}Mir$b_5n=Lhx
z)O(*#ZarKVt>?J*)uN(9lD5JB+51cV#M<WdCVV<+P&UP<%uT6KIqyZs=E}rp#!RJ#
zE2}2n`Q?zwbAQP##TKI^yXYHl__Ad$#(r=y?$lk;C)J<2&wW#aA=`U{{`4&u43~ZC
z^>degvE1puh1TDT*N-v>cr!A|G2<?mfPQ2ECP9WJjUX1Rl!EBOT_%ClLUdUHS=dS_
zbQ93?J;DSDph2jm0J>iEe1g!c0?avJy-2wRSvR&QMd;qnj4Ofzyjj^m>R5r$4CuaT
HEFc~Ln=M9u

literal 0
HcmV?d00001

diff --git a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error/EPUB/content_|.xhtml b/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error/EPUB/content_|.xhtml
deleted file mode 100644
index ea29a1610..000000000
--- a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error/EPUB/content_|.xhtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-	<head>
-		<meta charset="utf-8"/>
-		<title>Minimal EPUB</title>
-	</head>
-	<body>
-		<h1>Loomings</h1>
-		<p>Call me Ishmael.</p>
-	</body>
-</html>
diff --git a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error/EPUB/nav.xhtml b/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error/EPUB/nav.xhtml
deleted file mode 100644
index 508931b93..000000000
--- a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error/EPUB/nav.xhtml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xml:lang="en" lang="en">
-	<head>
-		<meta charset="utf-8"/>
-		<title>Minimal Nav</title>
-	</head>
-	<body>
-		<nav epub:type="toc">
-			<ol>
-				<li><a href="content_%7C.xhtml">content 001</a></li>
-			</ol>
-		</nav>
-	</body>
-</html>
diff --git a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error/EPUB/package.opf b/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error/EPUB/package.opf
deleted file mode 100644
index ffb6b06a0..000000000
--- a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error/EPUB/package.opf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://www.idpf.org/2007/opf" version="3.0" xml:lang="en" unique-identifier="q">
-<metadata xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <dc:title id="title">Minimal EPUB 3.0</dc:title>
-  <dc:language>en</dc:language>
-  <dc:identifier id="q">NOID</dc:identifier>
-  <meta property="dcterms:modified">2017-06-14T00:00:01Z</meta>
-</metadata>
-<manifest>
-  <item id="content_001"  href="content_%7C.xhtml" media-type="application/xhtml+xml"/>
-  <item id="nav"  href="nav.xhtml" media-type="application/xhtml+xml" properties="nav"/>
-</manifest>
-<spine>
-  <itemref idref="content_001" />
-</spine>
-</package>
\ No newline at end of file
diff --git a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error/META-INF/container.xml b/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error/META-INF/container.xml
deleted file mode 100644
index 318782179..000000000
--- a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error/META-INF/container.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
-	<rootfiles>
-		<rootfile full-path="EPUB/package.opf" media-type="application/oebps-package+xml"/>
-	</rootfiles>
-</container>
diff --git a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error/mimetype b/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error/mimetype
deleted file mode 100644
index 57ef03f24..000000000
--- a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-error/mimetype
+++ /dev/null
@@ -1 +0,0 @@
-application/epub+zip
\ No newline at end of file
diff --git a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error.epub b/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error.epub
new file mode 100644
index 0000000000000000000000000000000000000000..bd450d36d383cabf4215d6e7dac1270802f365f4
GIT binary patch
literal 1620
zcmWIWW@h1HU}9ikNUm!Q%}-pdBLZZDFb5FlX6B}rR2HNr78K-UCMT9;=I80B7L+Dw
zS7jCi0CkE0b#j1phJSTTxChkX#mK<G2c%sCLY?&U63g@|GD>oDLMIsJA65`(O@AIP
z@a@-}l8oHBk+=GMtxH~p2uic7@SNCp<m7(+wiQ9k+wawuzvsKNuWnCGZT&t&-^HTR
zF|D!gub)lJUUY#$=X8)>|I+z>8&<!TTBm*3_{xd`yMM~Q@@+@nt$xK>Geh`h#7jTj
z@V?Far{54+G4;)2F$=9pYc3bf65aa8=kQ_U_7Fwqu+H+wXEb!JPjEYJOR~Q6`{Rq>
z(TnEp*-*N?Ezfc5oSN;=jx=re<lf@8Af+nE`Ly+W56fRGSH;deFI3*`%I(P2a$-5-
z1a*ZY9aH8SKjwS+yp9nyBs94dSFQnuz!M-AgM~zLeqKpxUP-)xfgvPBZ2JxQn+!x+
z(tnC>-EDHj)#Igt(Tt3g3kNrPE%m+S^uqXPeZJ<gmvQg*RiC{0^<hx#d*5CaiL*jh
z+_QSNtve!=puzF+-txNH-;&)o*_=OVVqDS2bv8FVDbes(yiR1GW`%T#YcE6Jyh;6j
z4xRTu+<Ifs$*FOnY3|g}w(Jn|?Y64j;=i7JZ?OCIO}KF8#^C$Xsn+6`bgGzF@3?k?
zqom|g!NOp#wutyF#-7>xQ2qD+IGbuBFqS6(6O91Oe+7xj*@@|?die!uy+PjoEd~Pn
zerwO#DU}iUSc++egz3izj~9sRFI#x{olDfN3$=f%+jpH#vz=L>G55V?z@5BY?Q1vq
zuj~}s6w>GrUfy<RPfP#z<4@S~R&PG^`d9S%K!aPnsya>|c21dnR!#Ns>@BaKe{xzm
z^Gyx2`_9vWeVUc4-7QNL!uqCZ`<z(7eMR7#s!k)X4qI-?h5dXxSE>u|e|0+}A*)k2
zN{!FR+xVo3B3JP9MyKv3AI^^~SB)(<?GokBmoIN}7Wvd*6>!W!TQ6i`_u-ed_V&-Z
zcgcKw`t_xqQ~zQPxn}PB<#N9_Xdk@7SZ)1eTKEYG=Burz(mHqfZCYKv^wY<acHEYi
zc5JixA{V|u*3_a!!<#X8%Q|cE8y~z^^0Y*JxiRO?(%Y^ZbUC`)N`%Vfyf56_9`gFY
zeTQQoE%im8tXy~bwP*kN|JN<2sLIrZro1t1)o1hPQ#UqC*uQ_Hqsuk9s1twxhyG<i
zjSl_G>sVF;qu~cMx%s+=IO=-(x#@$FTw-QkYLQ+=Zcc39L9Rmv0xsvjX&;JP>Xt7w
zi>qm#?F;rbFT<K&=4Aw3+`qkRMTJa-asH~SYq?)})qXl8Cbrp9BT2pY`Q+Bab<ui`
zYhNuYIwWZu{GYwQ)K9E!UT?yulLlo|e9GLE3YGI-bZo9nd}hp4YPhm$;+<a(nLPKG
z+)`{YO0tW-@rEy3_G0V@7voOd6@60usr%eFH5jtJH|S5_a=~!fr(QpI=@-kL{#$7M
zy?Fg7Gst^fK+iBR6mD+~1v8)os8oV`FD)}CHQvTfucV?Rz?+dtjv03;2GR~punbEY
zK`dCA2GNDP1Ouss=&}N`P|GuPz36!!q1Ody1XwRd34m?}dcH!Kp#sclU^9?%8M<!t
vWPs4UnHee6P!a{i4BTN2G6MvbG)`hcG6N;#S=m4;*nqGK=+h%Wbqovu0&i8U

literal 0
HcmV?d00001

diff --git a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/EPUB/content_001.xhtml b/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/EPUB/content_001.xhtml
deleted file mode 100644
index ea29a1610..000000000
--- a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/EPUB/content_001.xhtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-	<head>
-		<meta charset="utf-8"/>
-		<title>Minimal EPUB</title>
-	</head>
-	<body>
-		<h1>Loomings</h1>
-		<p>Call me Ishmael.</p>
-	</body>
-</html>
diff --git a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/EPUB/nav.xhtml b/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/EPUB/nav.xhtml
deleted file mode 100644
index 240745e63..000000000
--- a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/EPUB/nav.xhtml
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xml:lang="en" lang="en">
-	<head>
-		<meta charset="utf-8"/>
-		<title>Minimal Nav</title>
-	</head>
-	<body>
-		<nav epub:type="toc">
-			<ol>
-				<li><a href="content_001.xhtml">content 001</a></li>
-			</ol>
-		</nav>
-	</body>
-</html>
diff --git a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/EPUB/package.opf b/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/EPUB/package.opf
deleted file mode 100644
index 0d1eec6e9..000000000
--- a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/EPUB/package.opf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://www.idpf.org/2007/opf" version="3.0" xml:lang="en" unique-identifier="q">
-<metadata xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <dc:title id="title">Minimal EPUB 3.0</dc:title>
-  <dc:language>en</dc:language>
-  <dc:identifier id="q">NOID</dc:identifier>
-  <meta property="dcterms:modified">2017-06-14T00:00:01Z</meta>
-</metadata>
-<manifest>
-  <item id="content_001"  href="content_001.xhtml" media-type="application/xhtml+xml"/>
-  <item id="nav"  href="nav.xhtml" media-type="application/xhtml+xml" properties="nav"/>
-</manifest>
-<spine>
-  <itemref idref="content_001" />
-</spine>
-</package>
\ No newline at end of file
diff --git a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/META-INF/container.xml b/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/META-INF/container.xml
deleted file mode 100644
index 318782179..000000000
--- a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/META-INF/container.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<container version="1.0" xmlns="urn:oasis:names:tc:opendocument:xmlns:container">
-	<rootfiles>
-		<rootfile full-path="EPUB/package.opf" media-type="application/oebps-package+xml"/>
-	</rootfiles>
-</container>
diff --git a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/META-INF/file_<>.txt b/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/META-INF/file_<>.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/mimetype b/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/mimetype
deleted file mode 100644
index 57ef03f24..000000000
--- a/src/test/resources/epub3/04-ocf/files/ocf-filename-character-forbidden-non-publication-resource-error/mimetype
+++ /dev/null
@@ -1 +0,0 @@
-application/epub+zip
\ No newline at end of file
diff --git a/src/test/resources/epub3/04-ocf/ocf.feature b/src/test/resources/epub3/04-ocf/ocf.feature
index ede13d575..a8bf1c50a 100644
--- a/src/test/resources/epub3/04-ocf/ocf.feature
+++ b/src/test/resources/epub3/04-ocf/ocf.feature
@@ -58,13 +58,13 @@ Feature: EPUB 3 — Open Container Format
 
   @spec @xref:sec-container-filenames
   Scenario: Report forbidden characters in file names
-    When checking EPUB 'ocf-filename-character-forbidden-error'
+    When checking EPUB 'ocf-filename-character-forbidden-error.epub'
     Then error PKG-009 is reported
     And no other errors or warnings are reported
 
   @spec @xref:sec-container-filenames
   Scenario: Report forbidden characters in file names even for non-publication resources 
-    When checking EPUB 'ocf-filename-character-forbidden-non-publication-resource-error'
+    When checking EPUB 'ocf-filename-character-forbidden-non-publication-resource-error.epub'
     Then error PKG-009 is reported
     And no other errors or warnings are reported