Move shr.el test data to follow our conventions

* test/lisp/net/shr-tests.el (ert, ert-x): Require.
(shr-tests--datadir): Remove variable.
(shr-test, rendering): Use ert-resource-directory.
* test/lisp/net/shr-resources/*: Move from test/data/shr/.

14 files changed, 0 insertions, 95 deletions

diff --git a/test/data/shr/div-div.html b/test/data/shr/div-div.html
deleted file mode 100644
index 1c191ae44d8..00000000000
--- a/test/data/shr/div-div.html
+++ /dev/null
@@ -1 +0,0 @@
-<div>foo</div><div>Bar</div>
diff --git a/test/data/shr/div-div.txt b/test/data/shr/div-div.txt
deleted file mode 100644
index 62715e12513..00000000000
--- a/test/data/shr/div-div.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-foo
-Bar
diff --git a/test/data/shr/div-p.html b/test/data/shr/div-p.html
deleted file mode 100644
index fcbdfc43293..00000000000
--- a/test/data/shr/div-p.html
+++ /dev/null
@@ -1 +0,0 @@
-<div>foo</div><p>Bar</p>
diff --git a/test/data/shr/div-p.txt b/test/data/shr/div-p.txt
deleted file mode 100644
index 859d731da89..00000000000
--- a/test/data/shr/div-p.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-foo
-
-Bar
diff --git a/test/data/shr/li-div.html b/test/data/shr/li-div.html
deleted file mode 100644
index eca3c511bd9..00000000000
--- a/test/data/shr/li-div.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<ul>
-  <li>
-    <div>
-      <p >This is the first paragraph of a list item.</div>
-    <p >This is the second paragraph of a list item.</li>
-  <li>
-    <div>This is the first paragraph of a list item.</div>
-    <div>This is the second paragraph of a list item.</div>
-  </li>
-</ul>
diff --git a/test/data/shr/li-div.txt b/test/data/shr/li-div.txt
deleted file mode 100644
index 9fc54f2bdc6..00000000000
--- a/test/data/shr/li-div.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-* This is the first paragraph of a list item.
-
-  This is the second paragraph of a list item.
-
-* This is the first paragraph of a list item.
-  This is the second paragraph of a list item.
diff --git a/test/data/shr/li-empty.html b/test/data/shr/li-empty.html
deleted file mode 100644
index 05cfee7bdd4..00000000000
--- a/test/data/shr/li-empty.html
+++ /dev/null
@@ -1 +0,0 @@
-<ol><li></li><li></li><li></li></ol>
diff --git a/test/data/shr/li-empty.txt b/test/data/shr/li-empty.txt
deleted file mode 100644
index 906fd8df8b3..00000000000
--- a/test/data/shr/li-empty.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-1%20
-2%20
-3%20
diff --git a/test/data/shr/nonbr.html b/test/data/shr/nonbr.html
deleted file mode 100644
index 56282cf4ca5..00000000000
--- a/test/data/shr/nonbr.html
+++ /dev/null
@@ -1 +0,0 @@
-<div class="gmail_extra">(progn</div><div class="gmail_extra">  (setq minibuffer-prompt-properties &#39;(read-only t cursor-intangible t face minibuffer-prompt))</div><div class="gmail_extra"><br></div><div class="gmail_extra">  (defun turn-on-cursor-intangible-mode ()</div><div class="gmail_extra">    &quot;Turns on cursor-intangible-mode.&quot;</div><div class="gmail_extra">    (interactive)</div><div class="gmail_extra">    (cursor-intangible-mode 1))</div><div class="gmail_extra">  (define-globalized-minor-mode global-cursor-intangible-mode cursor-intangible-mode turn-on-cursor-intangible-mode)</div><div class="gmail_extra"><br></div><div class="gmail_extra">  (global-cursor-intangible-mode 1))</div><div class="gmail_extra"><br></div>
diff --git a/test/data/shr/nonbr.txt b/test/data/shr/nonbr.txt
deleted file mode 100644
index 0c3cffa93f9..00000000000
--- a/test/data/shr/nonbr.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-(progn
-  (setq minibuffer-prompt-properties '(read-only t cursor-intangible t face
-minibuffer-prompt))
-
-  (defun turn-on-cursor-intangible-mode ()
-    "Turns on cursor-intangible-mode."
-    (interactive)
-    (cursor-intangible-mode 1))
-  (define-globalized-minor-mode global-cursor-intangible-mode
-cursor-intangible-mode turn-on-cursor-intangible-mode)
-
-  (global-cursor-intangible-mode 1))
diff --git a/test/data/shr/ol.html b/test/data/shr/ol.html
deleted file mode 100644
index f9a15f26409..00000000000
--- a/test/data/shr/ol.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<ol>
-  <li>one</li>
-  <li>two</li>
-  <li>three</li>
-</ol>
-
-<ol start="10">
-  <li>ten</li>
-  <li>eleven</li>
-  <li>twelve</li>
-</ol>
-
-<ol start="0">
-  <li>zero</li>
-  <li>one</li>
-  <li>two</li>
-</ol>
-
-<ol start="-5">
-  <li>minus five</li>
-  <li>minus four</li>
-  <li>minus three</li>
-</ol>
-
-<ol start="notanumber">
-  <li>one</li>
-  <li>two</li>
-  <li>three</li>
-</ol>
diff --git a/test/data/shr/ol.txt b/test/data/shr/ol.txt
deleted file mode 100644
index 0d46e2a8ddb..00000000000
--- a/test/data/shr/ol.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-1 one
-2 two
-3 three
-
-10 ten
-11 eleven
-12 twelve
-
-0 zero
-1 one
-2 two
-
--5 minus five
--4 minus four
--3 minus three
-
-1 one
-2 two
-3 three
diff --git a/test/data/shr/ul-empty.html b/test/data/shr/ul-empty.html
deleted file mode 100644
index e5a75ab9216..00000000000
--- a/test/data/shr/ul-empty.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<ul>
-<li></li>
-</ul>
-Lala
diff --git a/test/data/shr/ul-empty.txt b/test/data/shr/ul-empty.txt
deleted file mode 100644
index 8993555425b..00000000000
--- a/test/data/shr/ul-empty.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-* 
-
-Lala 
\ No newline at end of file