New test suite for EDE project detection.

Includes several directories of minimal projects of different types.

tests/cedet-utests.el

@@ -1,6 +1,6 @@
 ;;; cedet-utests.el --- Run all unit tests in the CEDET suite.
 
-;; Copyright (C) 2008, 2009, 2010, 2012, 2013 Eric M. Ludlam
+;; Copyright (C) 2008, 2009, 2010, 2012, 2013, 2014 Eric M. Ludlam
 
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
 
@@ -31,6 +31,7 @@
 (require 'pulse-utest)
 (require 'cedet-files-utests)
 (require 'cedet-compat)
+(require 'cedet/ede/detect-utest)
 (require 'cedet/semantic/lex-utest)
 (require 'cedet/semantic/lex-spp-utest)
 (require 'cedet/semantic/utest-parse)
@@ -92,9 +93,7 @@
     ;;
     ;; EDE
     ;;
-
-    ;; @todo - Currently handled in the integration tests.  Need
-    ;;         some simpler unit tests here.
+    ("ede: project detection tests" . ede-detect-utest)
 
     ;;
     ;; SEMANTIC

tests/cedet/ede/detect-utest.el

@@ -0,0 +1,102 @@
+;;; ede/detect.el --- Tests for detecting different kinds of projects.
+;;
+;; Copyright (C) 2014 Eric M. Ludlam
+;;
+;; Author: Eric M. Ludlam <eric@siege-engine.com>
+;;
+;; This program 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.
+
+;; This program 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 this program.  If not, see http://www.gnu.org/licenses/.
+
+;;; Code:
+
+(require 'ede/linux)
+
+(defvar ede-detect-utest-project-list
+  '(
+    ( "src/proj/Project.ede" . ede-proj-project-p )
+    ( "src/automake/Makefile.am" . project-am-makefile-p )
+    ( "src/android/AndroidManifest.xml" . ede-android-project-p ) 
+    ( "src/android/src/test.java" . ede-android-project-p )
+    ( "src/emacs/Makefile" . ede-emacs-project-p )
+    ( "src/emacs/src/emacs.c" . ede-emacs-project-p )
+    ;( "src/ant/build.xml" . ede-ant-project-p )
+    ( "src/linux/Makefile" . ede-linux-project-p )
+    ( "src/linux/scripts/ver_linux" . ede-linux-project-p )
+     )
+  "List of sources to load in ndetectable projects.
+Each entry is a cons cell:
+  ( SRCFILE . PROJECT-TYPE )")
+
+;;;###autoload
+(defun ede-detect-utest ()
+  "Test out the detection scheme for EDE."
+  (interactive)
+  (save-excursion
+
+    (let ((errlog nil)
+	  (project-linux-build-directory-default 'same)
+	  (project-linux-architecture-default "glnx")
+	  (ede-project-directories t) ; safe to load Project.ede
+	  )
+      (cedet-utest-log-setup "EDE DETECT")
+
+      (set-buffer (semantic-find-file-noselect
+		   (expand-file-name "cedet/ede/detect.el"
+				     cedet-utest-root)))
+
+      (dolist (fl ede-detect-utest-project-list)
+
+	;; Make sure we have the files we think we have.
+	(when (not (file-exists-p (car fl)))
+	  (error "Cannot find unit test file: %s" (car fl)))
+
+	;; Do the detection
+	(let ((fb (find-buffer-visiting (car fl)))
+	      (b (semantic-find-file-noselect (car fl))))
+
+	  (save-excursion
+	    (set-buffer b)
+
+	    ;; Run the EDE detection code.  Firing up the mode isn't really needed.
+	    (ede-initialize-state-current-buffer)
+
+	    ;; Test the result.
+	    (unless (funcall (cdr fl) ede-object-root-project)
+
+	      (message "Found %S, wanted %S"
+		       ede-object-root-project
+		       (cdr fl))
+
+	      (push fl errlog))
+	    )
+
+	  ;; If it wasn't already in memory, whack it.
+	  (when (and b (not fb))
+	    (kill-buffer b))
+	  ))
+
+	(cedet-utest-log-shutdown
+       "EDE DETECT"
+       (when errlog
+	 (format "%s Failures found." (length errlog))))
+
+      (when errlog
+	(error "Failures found looking for project in %s" (car (car errlog))))
+      ))
+
+  )
+
+
+(provide 'cedet/ede/detect-utest)
+
+;;; detect.el ends here

tests/cedet/ede/src/android/AndroidManifest.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	  package="com.face.project"
+	  android:versionCode="1"
+	  android:versionName="1.0">
+  <application android:label="@string/app_name" android:icon="@drawable/icon">
+
+    <activity android:name="ArduinoBot"/>
+
+  </application>
+</manifest> 
+

tests/cedet/ede/src/android/src/test.java

@@ -0,0 +1 @@
+/* Test Java File in a subdirectory */

tests/cedet/ede/src/automake/Makefile.am

@@ -0,0 +1 @@
+# Test makefile.

tests/cedet/ede/src/emacs/Makefile

@@ -0,0 +1 @@
+# Test makefile.

tests/cedet/ede/src/emacs/configure.in

@@ -0,0 +1,2 @@
+dnl Test configure for Emacs
+AC_INIT(emacs, 1.0.0)

tests/cedet/ede/src/emacs/src/config.h

@@ -0,0 +1 @@
+/* config for test */

tests/cedet/ede/src/emacs/src/emacs.c

@@ -0,0 +1 @@
+/* Fake emacs.c for faking out EDE tests */

tests/cedet/ede/src/emacs/src/lisp.h

@@ -0,0 +1 @@
+/* lisp for test */

tests/cedet/ede/src/linux/Makefile

@@ -0,0 +1,3 @@
+VERSION    = 1
+PATCHLEVEL = 2
+SUBLEVEL   = 3

tests/cedet/ede/src/linux/scripts/ver_linux

@@ -0,0 +1,2 @@
+1.0
+# Fake linux marker

tests/cedet/ede/src/proj/Project.ede

@@ -0,0 +1,11 @@
+;; Object proj
+;; EDE Project Files are auto generated: Do Not Edit
+(ede-proj-project "proj"
+  :file "Project.ede"
+  :name "proj"
+  :targets
+  (list
+    (ede-proj-target-makefile-miscelaneous "misc"
+      :name "misc"
+      :path ""
+      :source '("TEST"))))

tests/cedet/ede/src/proj/TEST

@@ -0,0 +1 @@
+TEST