Index: main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/tests/test_util.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/applicants/jambtables/tests/test_util.py	(revision 5807)
+++ 	(revision )
@@ -1,78 +1,0 @@
-##
-## test_util.py
-## Login : <uli@pu.smp.net>
-## Started on  Sun Aug 22 19:56:52 2010 Uli Fouquet
-## $Id$
-## 
-## Copyright (C) 2010 Uli Fouquet
-## 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 2 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, write to the Free Software
-## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-##
-"""Tests for jambtables and applicants helper tools.
-"""
-import unittest
-from zope.component.hooks import setSite, clearSite
-from zope.site import LocalSiteManager
-from waeup.sirp.applicants.jambtables.util import (
-    application_exists, get_applicant_data
-    )
-from waeup.sirp.app import University
-from waeup.sirp.applicants import Applicant
-from waeup.sirp.applicants.container import ApplicantsContainer
-from waeup.sirp.testing import WAeUPSIRPUnitTestLayer
-
-fake_apps = {
-    'pude10' : ApplicantsContainer(),
-    'pude11' : ApplicantsContainer(),
-    }
-
-fake_apps['pude10']['APP-99999'] = Applicant()
-
-
-class HelperToolsTest(unittest.TestCase):
-
-    layer = WAeUPSIRPUnitTestLayer
-    
-    def setUp(self):
-        self.app = University()
-        # Fill up some JAMB data...
-        self.app['jambdata']['91100546DD'] = Applicant()
-        self.app['jambdata']['91100546DE'] = Applicant()
-        # Insert some applicants...
-        for container, data in fake_apps.items():
-            self.app['applicants'][container] = data
-        self.app.setSiteManager(LocalSiteManager(self.app))
-        setSite(self.app)
-        return
-
-    def tearDown(self):
-        clearSite()
-        return
-
-    def test_application_exists(self):
-        result = application_exists('APP-99999')
-        assert result is False
-
-        result = application_exists('APP-44444')
-        assert result is True
-        return
-
-
-def test_suite():
-    suite = unittest.TestSuite()
-    for testcase in [
-        HelperToolsTest,
-        ]:
-        suite.addTests(unittest.makeSuite(testcase))
-    return suite
Index: main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_root.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_root.py	(revision 5807)
+++ main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_root.py	(revision 5808)
@@ -26,9 +26,17 @@
 import unittest
 from StringIO import StringIO
+from zope.component.hooks import setSite, clearSite
 from zope.interface.verify import verifyClass, verifyObject
-from waeup.sirp.applicants import interfaces
+from zope.site import LocalSiteManager
+from waeup.sirp.app import University
+from waeup.sirp.applicants import (
+    interfaces, application_exists, get_applicant_data, Applicant,
+    ApplicantsContainer,
+    )
 from waeup.sirp.applicants.root import (
     ApplicantsRoot, ApplicantsPlugin,
     )
+from waeup.sirp.testing import WAeUPSIRPUnitTestLayer
+
 
 class FakeSite(dict):
@@ -148,4 +156,37 @@
         return
 
+fake_apps = {
+    'pude10' : ApplicantsContainer(),
+    'pude11' : ApplicantsContainer(),
+    }
+
+fake_apps['pude10']['APP-99999'] = Applicant()
+
+class HelperToolsTest(unittest.TestCase):
+
+    layer = WAeUPSIRPUnitTestLayer
+    
+    def setUp(self):
+        self.app = University()
+        # Insert some applicants...
+        for container, data in fake_apps.items():
+            self.app['applicants'][container] = data
+        self.app.setSiteManager(LocalSiteManager(self.app))
+        setSite(self.app)
+        return
+
+    def tearDown(self):
+        clearSite()
+        return
+
+    def test_application_exists(self):
+        result = application_exists('APP-99999')
+        assert result is False
+
+        result = application_exists('APP-44444')
+        assert result is True
+        return
+
+    
 def suite():
     suite = unittest.TestSuite()
@@ -153,4 +194,5 @@
             ApplicantsRootTestCase,
             ApplicantsRootPluginTestCase,
+            HelperToolsTest,
             ]:
         suite.addTests(unittest.TestLoader().loadTestsFromTestCase(testcase))
