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/*.

3 files changed, 2 insertions, 6 deletions

diff --git a/test/data/themes/faces-test-dark-theme.el b/test/lisp/faces-resources/faces-test-dark-theme.el
index a5e2ca43627..a5e2ca43627 100644
--- a/test/data/themes/faces-test-dark-theme.el
+++ b/test/lisp/faces-resources/faces-test-dark-theme.el
diff --git a/test/data/themes/faces-test-light-theme.el b/test/lisp/faces-resources/faces-test-light-theme.el
index b2f7ec69742..b2f7ec69742 100644
--- a/test/data/themes/faces-test-light-theme.el
+++ b/test/lisp/faces-resources/faces-test-light-theme.el
diff --git a/test/lisp/faces-tests.el b/test/lisp/faces-tests.el
index 32dc1eea856..b19cef5decd 100644
--- a/test/lisp/faces-tests.el
+++ b/test/lisp/faces-tests.el
@@ -23,13 +23,9 @@
 ;;; Code:
 
 (require 'ert)
+(require 'ert-x)
 (require 'faces)
 
-(defvar faces--test-data-dir
-  (expand-file-name "../data/"
-                    (file-name-directory (or load-file-name
-                                             buffer-file-name))))
-
 (defgroup faces--test nil ""
   :group 'faces--test)
 
@@ -122,7 +118,7 @@
   (should (equal (face-attribute 'spiff-changed-face :extend) t))
   (should (equal (face-attribute 'spiff-added :extend) 'unspecified))
   (should (equal (face-attribute 'spiff-file-header-face :extend) nil))
-  (add-to-list 'custom-theme-load-path (concat faces--test-data-dir "themes"))
+  (add-to-list 'custom-theme-load-path (ert-resource-directory))
   (load-theme 'faces-test-dark t t)
   (load-theme 'faces-test-light t t)
   (should (equal (face-attribute 'faces--test-inherit-extend :extend)