Move faces.el test data to follow our conventions

* test/lisp/faces-tests.el (ert-x): Require.
(faces--test-data-dir): Remove variable.
(faces--test-extend-with-themes): Use ert-resource-directory.
* test/lisp/faces-resources/*: Moved from test/data/themes/*.

2 files changed, 0 insertions, 69 deletions

diff --git a/test/data/themes/faces-test-dark-theme.el b/test/data/themes/faces-test-dark-theme.el
deleted file mode 100644
index a5e2ca43627..00000000000
--- a/test/data/themes/faces-test-dark-theme.el
+++ /dev/null
@@ -1,35 +0,0 @@
-;;; faces-test-dark-theme.el --- A dark theme from tests ;;; -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2019-2020 Free Software Foundation, Inc.
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;; Code:
-
-(deftheme faces-test-dark
-  "")
-
-(custom-theme-set-faces
- 'faces-test-dark
- '(spiff-added ((t (:foreground "Green" :extend t))))
- '(spiff-changed-face ((t (:foreground "Khaki"))))
- '(spiff-file-header-face ((t (:background "grey20" :foreground "ivory1")))))
-
-(provide-theme 'faces-test-dark)
-
-;;; faces-test-dark-theme.el ends here
diff --git a/test/data/themes/faces-test-light-theme.el b/test/data/themes/faces-test-light-theme.el
deleted file mode 100644
index b2f7ec69742..00000000000
--- a/test/data/themes/faces-test-light-theme.el
+++ /dev/null
@@ -1,34 +0,0 @@
-;;; faces-test-light-theme.el --- A dark theme from tests ;;; -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2019-2020 Free Software Foundation, Inc.
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;;; Code:
-
-(deftheme faces-test-light
-  "")
-
-(custom-theme-set-faces
- 'faces-test-light
- '(spiff-added ((t (:inherit diff-changed :background "light green" :extend t))))
- '(spiff-changed ((t (:background "light steel blue")))))
-
-(provide-theme 'faces-test-light)
-
-;;; faces-test-light-theme.el ends here