fUnit 0.1.0 → 0.1.1

data/tests/tc_test_suite.rb

@@ -8,104 +8,104 @@ require 'funit/assertions'
 
 class TestTestSuite < Test::Unit::TestCase
 
- def setup
-  File.rm_f(*Dir["dummyf90test*"])
- end 
-
- def teardown
-  File.rm_f(*Dir["dummyf90test*"])
- end 
-
- def test_nonexistent_funit_file_is_not_created
-  Funit::TestSuite.new 'dummyf90test'
-  assert !File.exists?("dummyf90test.fun")
-  assert !File.exists?("dummyf90test_fun.f90")
- end
-
- def create_funit_file funit_contents
-  File.open('dummyf90test.f90','w') do |f|
-   f.puts "module dummyf90test\nend module dummyf90test"
+  def setup
+    File.rm_f(*Dir["dummyf90test*"])
+  end 
+
+  def teardown
+    File.rm_f(*Dir["dummyf90test*"])
+  end 
+
+  def test_nonexistent_funit_file_is_not_created
+    Funit::TestSuite.new 'dummyf90test'
+    assert !File.exists?("dummyf90test.fun")
+    assert !File.exists?("dummyf90test_fun.f90")
   end
-  File.open('dummyf90test.fun','w') do |f|
-   f.puts funit_contents
+
+  def create_funit_file funit_contents
+    File.open('dummyf90test.f90','w') do |f|
+      f.puts "module dummyf90test\nend module dummyf90test"
+    end
+    File.open('dummyf90test.fun','w') do |f|
+      f.puts funit_contents
+    end
+  end
+
+  @@compileCommand = "#{Funit::Compiler.new.name} -c dummyf90test.f90 dummyf90test_fun.f90"
+
+  def test_bare_minimum_funit_file_compiles
+    create_funit_file ""
+    Funit::TestSuite.new 'dummyf90test'
+    assert system(@@compileCommand)
+  end
+
+  def test_module_variables_allowed
+    create_funit_file "integer :: a"
+    Funit::TestSuite.new 'dummyf90test'
+    assert system(@@compileCommand)
+  end
+
+  def test_blank_setup_compiles
+    create_funit_file "beginSetup\nendSetup"
+    Funit::TestSuite.new 'dummyf90test'
+    assert system(@@compileCommand)
+  end
+
+  def test_blank_test_gives_warning
+    create_funit_file "beginTest bob\nendTest"
+    Funit::TestSuite.new 'dummyf90test'
+    assert system(@@compileCommand)
   end
- end
-
- @@compileCommand = "#{Funit::Compiler.new.name} -c dummyf90test.f90 dummyf90test_fun.f90"
-
- def test_bare_minimum_funit_file_compiles
-  create_funit_file ""
-  Funit::TestSuite.new 'dummyf90test'
-  assert system(@@compileCommand)
- end
-
- def test_module_variables_allowed
-  create_funit_file "integer :: a"
-  Funit::TestSuite.new 'dummyf90test'
-  assert system(@@compileCommand)
- end
-
- def test_blank_setup_compiles
-  create_funit_file "beginSetup\nendSetup"
-  Funit::TestSuite.new 'dummyf90test'
-  assert system(@@compileCommand)
- end
-
- def test_blank_test_gives_warning
-  create_funit_file "beginTest bob\nendTest"
-  Funit::TestSuite.new 'dummyf90test'
-  assert system(@@compileCommand)
- end
-
- def test_single_assert_test_compiles
-  create_funit_file "beginTest assertTrue\nIsTrue(.true.)\nendTest"
-  Funit::TestSuite.new 'dummyf90test'
-  assert system(@@compileCommand)
- end
-
- def test_matrix_assert_compiles
-  create_funit_file <<-MATRIX
+
+  def test_single_assert_test_compiles
+    create_funit_file "beginTest assertTrue\nIsTrue(.true.)\nendTest"
+    Funit::TestSuite.new 'dummyf90test'
+    assert system(@@compileCommand)
+  end
+
+  def test_matrix_assert_compiles
+    create_funit_file <<-MATRIX
  beginTest assertTrue
   integer :: a(2,2)
   a = 1
   IsEqual(a(1,1),1)
  endTest
-  MATRIX
-  Funit::TestSuite.new 'dummyf90test'
-  assert system(@@compileCommand)
- end
+    MATRIX
+    Funit::TestSuite.new 'dummyf90test'
+    assert system(@@compileCommand)
+  end
 
- def test_simple_real_equals_assert_works
-  create_funit_file <<-REALEQUALS
+  def test_simple_real_equals_assert_works
+    create_funit_file <<-REALEQUALS
  beginTest assert_equals
   real :: real_var
   real_var = 1.0
   IsRealEqual(real_var,1.0)
  endTest
-  REALEQUALS
-  Funit::TestSuite.new 'dummyf90test'
-  assert system(@@compileCommand)
- end
-
- def test_real_equals_assert_works_with_function
-  create_funit_file <<-REQUALSFUNC
-  function balance( left, right)
-   real :: balance
-   real, intent(in) :: left, right
-   balance = 0.5*(left+right)
-  end function balance
+    REALEQUALS
+    Funit::TestSuite.new 'dummyf90test'
+    assert system(@@compileCommand)
+  end
+
+  def test_real_equals_assert_works_with_function
+    create_funit_file <<-REQUALSFUNC
  beginTest assert_equals_for_function
   IsRealEqual(balance(0.0,0.0),0.0)
  endTest
-  REQUALSFUNC
-  Funit::TestSuite.new 'dummyf90test'
-  assert system(@@compileCommand)
- end
-
- def test_ignore_commented_test
-  create_funit_file "XbeginTest bob\nendTest"
-  Funit::TestSuite.new 'dummyf90test'
-  assert_no_match( /Testbob/i, IO.readlines('dummyf90test_fun.f90').join )
- end
+ function balance( left, right)
+  real :: balance
+  real, intent(in) :: left, right
+  balance = 0.5*(left+right)
+ end function balance
+    REQUALSFUNC
+    Funit::TestSuite.new 'dummyf90test'
+    assert system(@@compileCommand)
+  end
+
+  def test_ignore_commented_test
+    create_funit_file "XbeginTest bob\nendTest"
+    Funit::TestSuite.new 'dummyf90test'
+    assert_no_match( /Testbob/i, IO.readlines('dummyf90test_fun.f90').join )
+  end
 
 end

data/utils/funit-mode.el

@@ -0,0 +1,115 @@
+;; 'funit-mode.el' - a derived major mode for editing fUnit files
+;;
+;; $Id: funit-mode.el 157 2006-04-16 01:02:21Z kleb $
+;;
+;; INSTALLATION:
+;;
+;; Copy 'funit-mode.el' to the system site-lisp directory, e.g.,
+;;
+;;   /usr/share/emacs/site-lisp
+;;
+;; or, if you do not have root permission, somewhere local
+;; and set the load-path search variable in your ~/.emacs file
+;; accordingly, e.g.,
+;;
+;;  (setq load-path (append load-path '("~/lisp")))
+;;
+;; Then, to automatically activate funit-mode when visiting files,
+;; add the following lines to your ~/.emacs file:
+;;
+;;  (autoload 'funit-mode "funit-mode"
+;;     "Mode for editing fUnit files.")
+;;  (setq auto-mode-alist
+;;     (cons '("\\.fun$" . funit-mode) auto-mode-alist))
+
+(define-derived-mode funit-mode
+  f90-mode  "fUnit"
+  "Major mode for fUnit files (derived from F90 mode).\n\n
+  \\{funit-mode-map}"
+  (interactive)
+  (message "fUnit mode.")
+)
+
+;; add some new font-locks to f90's extensive list
+(font-lock-add-keywords 'funit-mode
+ '(("\\<IsFalse\\>"		. font-lock-function-name-face)
+   ("\\<IsEqual\\>"		. font-lock-function-name-face)
+   ("\\<IsRealEqual\\>"		. font-lock-function-name-face)
+   ("\\<IsTrue\\>"		. font-lock-function-name-face)
+   ("\\<IsEqualWithin\\>"	. font-lock-function-name-face)
+   ("\\<beginTest\\>"		. font-lock-builtin-face)
+   ("\\<endTest\\>"		. font-lock-builtin-face)
+   ("\\<beginTeardown\\>"	. font-lock-builtin-face)
+   ("\\<endTeardown\\>"		. font-lock-builtin-face)
+   ("\\<beginSetup\\>"		. font-lock-builtin-face)
+   ("\\<endSetup\\>"		. font-lock-builtin-face))
+)
+
+(defvar funit-buffer-command "funit"
+  "Shell command used by the \\[funit-test-buffer] function.")
+
+;;(defvar compilation-buffer-name-function "* fUnit output *")
+
+;; run fUnit on the current buffer:
+(defun funit-test-buffer ()
+  "Excute \\[funit-buffer-command] on the file associated
+   with the current buffer."
+  (interactive)
+;  (compile funit-buffer-command);; (file-name-nondirectory buffer-file-name)))
+  (save-buffer)
+  (shell-command-on-region (point-min) (point-max) funit-buffer-command funit-error-buffer)
+)
+
+;; key-binding for running fUnit on the current buffer
+(define-key funit-mode-map "\C-c\C-c" 'funit-test-buffer)
+
+;; add fUnit error regex to compilation mode:
+;;   blah, blah, blak [FluxFunctions.fun:34]
+;(require 'compile)
+;(setq compilation-error-regexp-alist
+;      (cons '("\\[\\(.+\\):\\([0-9]+\\)\\]" 1 2) compilation-error-regexp-alist)
+;)
+
+
+(defvar funit-error-buffer
+  "*fUnit output-buffer*"
+  "Buffer name for error messages used by `funit-next-error'")
+
+(defvar funit-error-message-regexp
+  "\\[.+:\\([0-9]+\\)\\]"
+  "Regular expression used by `funit-next-error' to find error messages.
+The sub-expression between the first capturing parens must be the line
+number where the error occured")
+
+
+(defun funit-next-error ()
+  "Goto line in current buffer indicated by next error message in `funit-error-buffer'
+
+Assumes that the point is positioned before the first occurance of
+`funit-error-message-regexp' in the `funit-error-buffer' before the first
+call to this function.
+
+See also `funit-error-message-regexp' `funit-error-buffer'"
+  
+  (interactive)
+  (let ((error-line-number))
+    (save-current-buffer
+      (set-buffer (or (get-buffer funit-error-buffer)
+                      (error
+                       (concat
+                        "Can't find the error buffer: "
+                        funit-error-buffer))))
+      (if (re-search-forward funit-error-message-regexp nil t)
+          (progn
+            (setq error-line-number
+                  (string-to-number
+                   (buffer-substring (match-beginning 1)
+                                     (match-end 1))))
+            (goto-char (1+ (match-end 1))))))
+    (if error-line-number
+        (goto-line error-line-number)
+      (message "No more errors"))))
+
+(provide 'funit-mode)
+
+;; end of 'funit-mode.el'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: fUnit
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2006-04-15 00:00:00 -04:00
+  version: 0.1.1
+date: 2006-04-18 00:00:00 -04:00
 summary: A Fortran Unit Testing Framework
 require_paths: 
   - lib
@@ -49,6 +49,7 @@ files:
   - docs/html/rdoc-style.css
   - docs/html/classes/Funit
   - docs/html/classes/Funit.html
+  - docs/html/classes/String.html
   - docs/html/classes/Funit/Assertions.html
   - docs/html/classes/Funit/Compiler.html
   - docs/html/classes/Funit/Depend.html
@@ -104,6 +105,7 @@ files:
   - tests/tc_funit.rb
   - tests/tc_test_suite.rb
   - tests/ts_funit.rb
+  - utils/funit-mode.el
 test_files: 
   - tests/ts_funit.rb
 rdoc_options: