[Emacs-diffs] scratch/merge-cedet-tests 31d40a7 257/316: Fix EIEIO methodinvoke-utest and semantic-fmt-utest.

[Edward John Steere]

branch: scratch/merge-cedet-tests
commit 31d40a757fb4cfb8a7ac0aa1d7605ce5f3d8582d
Author: David Engster <address@hidden>
Commit: Edward John Steere <address@hidden>

    Fix EIEIO methodinvoke-utest and semantic-fmt-utest.
    
    * Makefile: Add tests/eieio to path for unit tests.
    
    * tests/cedet-utest.el (cedet/semantic/fmt-utest): Require.
    
    * tests/cedet/semantic/fmt-utest.el: Fix requires and rename
      accordingly.
---
 test/manual/cedet/cedet/semantic/fmt-utest.el |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/test/manual/cedet/cedet/semantic/fmt-utest.el 
b/test/manual/cedet/cedet/semantic/fmt-utest.el
index 14c329b..fc3140f 100644
--- a/test/manual/cedet/cedet/semantic/fmt-utest.el
+++ b/test/manual/cedet/cedet/semantic/fmt-utest.el
@@ -1,4 +1,4 @@
-;;; semantic-fmt-utest.el --- Parsing / Formatting tests
+;;; cedet/semantic/fmt-utest.el --- Parsing / Formatting tests
 ;;
 ;; Copyright (C) 2012 Eric M. Ludlam
 ;;
@@ -28,9 +28,8 @@
 ;; make sure that the semantic-tag-format-* functions in question
 ;; created the desired output.
 
-(require 'cedet-utests)
 (require 'semantic)
-(require 'semantic-format)
+(require 'semantic/format)
 
 ;;; Code:
 
@@ -58,7 +57,7 @@ Files to visit are in `semantic-fmt-utest-file-list'."
       (cedet-utest-log-setup "PARSE/FORMAT")
 
       (set-buffer (semantic-find-file-noselect
-                  (locate-library "semantic-fmt-utest.el")))
+                  (locate-library "cedet/semantic/fmt-utest.el")))
 
       (dolist (FILE fl)
 
@@ -156,6 +155,6 @@ Pass ARGS to format to create the log message."
   ;; Forward to CEDET utest framework.
   (apply 'cedet-utest-log args))
 
-(provide 'semantic-fmt-utest)
+(provide 'cedet/semantic/fmt-utest)
 
 ;;; semantic-fmt-utest.el ends here