Merge lp:~kolmis/wxbanker/runnable-tests into lp:wxbanker

[Karel Kolman]

[Karel Kolman (kolmis)]

Single test modules should be runnable IMHO.
I also separated the module path insertion into a module testbase.py.

[Michael Rooney (mrooney)]

> Single test modules should be runnable IMHO.
> I also separated the module path insertion into a module testbase.py.

This all looks pretty good. Although running the guitests later in the sequence ends up giving me some "ProgrammingError: Cannot operate on a closed database." Do you get those too? I guess it should either be worked around by a custom sort, or I could try to figure out what isn't closing down properly.

[lp:~kolmis/wxbanker/runnable-tests]

225. By Karel Kolman on 2009-05-12

GuiTests - add Publisher.unsubAll() call to test setUp method

[Karel Kolman (kolmis)]

Didn't happen on my side, otherwise I wouldn't propose a merge :)

It seems the problem could be guitests were called after modeltests on your machine, adding a Publisher.unsubAll() to guitests.py seems to solve the problem.

[Karel Kolman (kolmis)]

and the guitests.py fix is pushed in r225...

[Michael Rooney (mrooney)]

On Tue, May 12, 2009 at 12:59 PM, Karel Kolman <email address hidden> wrote:
> and the guitests.py fix is pushed in r225...

Yes, that fixes the issue but also causes one of the UI tests to no
longer test for a regression. I added an assert to test for the
condition it actually wants so that isn't hidden anymore and should
fail. I think the proper place is to figure out what in the modeltests
isn't unsubscribing and fix it, so I'll take a look at it.

Also I cleaned up the way alltests was getting the modules, so it
doesn't need a filter or a lambda, and fixed the name of the copyright
of testbase :)

=== modified file 'tests/alltests.py'
--- tests/alltests.py	2009-05-12 06:32:46 +0000
+++ tests/alltests.py	2009-05-12 13:55:37 +0000
@@ -18,12 +18,14 @@
 #    You should have received a copy of the GNU General Public License
 #    along with wxBanker.  If not, see <http://www.gnu.org/licenses/>.
 
-import os, sys; sys.path.insert(0, os.path.dirname(__file__))
-import unittest
-
-# Specify the modules to test.
-# TODO: assemble the list by listing .py files in this directory
-modules = ["csvimportertests", "guitests", "modeltests", "localetests"]
+import testbase
+import unittest, os 
+
+# find the modules to test
+ignores = ['__init__.py', 'testbase.py', 'alltests.py']
+files = filter(lambda x: x.endswith(".py") and x not in ignores, os.listdir(os.path.dirname(__file__)))
+modules = [m.replace(".py", "") for m in files]
+
 suite = unittest.TestLoader().loadTestsFromNames(modules)
 
 def main():

=== modified file 'tests/csvimportertests.py'
--- tests/csvimportertests.py	2009-05-12 06:32:46 +0000
+++ tests/csvimportertests.py	2009-05-12 13:37:15 +0000
@@ -18,7 +18,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with wxBanker.  If not, see <http://www.gnu.org/licenses/>.
 
-import os, sys; sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+import testbase
 import unittest
 from csvimporter import CsvImporter
 
@@ -31,3 +31,6 @@
         decimalSeparator = ','
         self.assertEquals(self.importer.parseAmount('-1 000,00', decimalSeparator), -1000.0)
         self.assertEquals(self.importer.parseAmount('$ -1 000,00 ', decimalSeparator), -1000.0)
+
+if __name__ == "__main__":
+    unittest.main()

=== modified file 'tests/guitests.py' (properties changed: -x to +x)
--- tests/guitests.py	2009-05-12 06:32:46 +0000
+++ tests/guitests.py	2009-05-12 13:37:15 +0000
@@ -18,9 +18,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with wxBanker.  If not, see <http://www.gnu.org/licenses/>.
 
-# Here we must insert since if wxbanker is installed on the system this would
-# otherwise pull in that package first.
-import os, sys; sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+import testbase, os
 import controller, unittest, wxbanker
 from wx.lib.pubsub import Publisher
 
@@ -51,4 +49,7 @@
         if os.path.exists("test.db"):
             os.remove("test.db")
         if os.path.exists(self.ConfigPathBackup):
-            os.rename(self.ConfigPathBackup, self.ConfigPath)
\ No newline at end of file
+            os.rename(self.ConfigPathBackup, self.ConfigPath)
+            
+if __name__ == "__main__":
+    unittest.main()

=== modified file 'tests/localetests.py' (properties changed: -x to +x)
--- tests/localetests.py	2009-05-12 06:32:46 +0000
+++ tests/localetests.py	2009-05-12 13:37:15 +0000
@@ -18,7 +18,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with wxBanker.  If not, see <http://www.gnu.org/licenses/>.
 
-import os, sys; sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+import testbase
 import unittest, locale, currencies as c
 
 class LocaleTests(unittest.TestCase):
@@ -43,3 +43,6 @@
         # The test is that none of these calls throw an exception.
         for curr in c.CurrencyList:
             curr().float2str(1000)
+
+if __name__ == "__main__":
+    unittest.main()

=== modified file 'tests/modeltests.py' (properties changed: -x to +x)
--- tests/modeltests.py	2009-05-12 06:32:46 +0000
+++ tests/modeltests.py	2009-05-12 13:37:15 +0000
@@ -18,7 +18,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with wxBanker.  If not, see <http://www.gnu.org/licenses/>.
 
-import os, sys; sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+import testbase, os
 import controller, unittest
 from wx.lib.pubsub import Publisher
 
@@ -231,4 +231,7 @@
         if os.path.exists("test.db"):
             os.remove("test.db")
         if os.path.exists(self.ConfigPathBackup):
-            os.rename(self.ConfigPathBackup, self.ConfigPath)
\ No newline at end of file
+            os.rename(self.ConfigPathBackup, self.ConfigPath)
+            
+if __name__ == "__main__":
+    unittest.main()

=== added file 'tests/testbase.py'
--- tests/testbase.py	1970-01-01 00:00:00 +0000
+++ tests/testbase.py	2009-05-12 13:37:15 +0000
@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#    https://launchpad.net/wxbanker
+#    alltests.py: Copyright 2007-2009 Mike Rooney <[e-mail]>
+#
+#    This file is part of wxBanker.
+#
+#    wxBanker 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.
+#
+#    wxBanker 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 wxBanker.  If not, see <http://www.gnu.org/licenses/>.
+
+import os, sys
+
+# make sure path contains both the test dir and its parent (wxbanker root dir)
+# we must insert since if wxbanker is installed on the system this would
+# otherwise pull in that package first.
+
+testdir = os.path.dirname(__file__)
+rootdir = os.path.dirname(testdir)
+
+sys.path.insert(0, testdir)
+sys.path.insert(0, rootdir)