use capital letters for globals; little cleanup

--HG--
branch : astng2

1 files changed, 26 insertions, 20 deletions

diff --git a/test/unittest_pyreverse_diadefs.py b/test/unittest_pyreverse_diadefs.py
index 3d472b62c..ee848dc24 100644
--- a/test/unittest_pyreverse_diadefs.py
+++ b/test/unittest_pyreverse_diadefs.py
@@ -29,10 +29,10 @@ from utils import Config
 def astng_wrapper(func, modname):
     return func(modname)
 
-project = ASTNGManager().project_from_files(['data'], astng_wrapper)
+PROJECT = ASTNGManager().project_from_files(['data'], astng_wrapper)
 
-config = Config()
-handler = DiadefsHandler(config)
+CONFIG = Config()
+HANDLER = DiadefsHandler(CONFIG)
 
 def _process_classes(classes):
     result = []
@@ -54,10 +54,10 @@ class DiaDefGeneratorTC(unittest.TestCase):
     def test_option_values(self):
         """test for ancestor, associated and module options"""
         handler = DiadefsHandler( Config())
-        df_h = DiaDefGenerator(Linker(project), handler)
+        df_h = DiaDefGenerator(Linker(PROJECT), handler)
         cl_config = Config()
         cl_config.classes = ['Specialization']
-        cl_h = DiaDefGenerator(Linker(project), DiadefsHandler(cl_config) )
+        cl_h = DiaDefGenerator(Linker(PROJECT), DiadefsHandler(cl_config) )
         self.assertEquals( (0, 0), df_h._get_levels())
         self.assertEquals( False, df_h.module_names)
         self.assertEquals( (-1, -1), cl_h._get_levels())
@@ -70,10 +70,10 @@ class DiaDefGeneratorTC(unittest.TestCase):
             self.assertEquals( (-1, -1), hndl._get_levels())
             self.assertEquals( True, hndl.module_names)
         handler = DiadefsHandler( Config())
-        df_h = DiaDefGenerator(Linker(project), handler)
+        df_h = DiaDefGenerator(Linker(PROJECT), handler)
         cl_config = Config()
         cl_config.classes = ['Specialization']
-        cl_h = DiaDefGenerator(Linker(project), DiadefsHandler(cl_config) )
+        cl_h = DiaDefGenerator(Linker(PROJECT), DiadefsHandler(cl_config) )
         for hndl in [df_h, cl_h]:
             hndl.config.show_ancestors = 2
             hndl.config.show_associated = 1
@@ -81,11 +81,14 @@ class DiaDefGeneratorTC(unittest.TestCase):
             hndl._set_default_options()
             self.assertEquals( (2, 1), hndl._get_levels())
             self.assertEquals( False, hndl.module_names)
-
+    #def test_default_values(self):
+        """test efault values for package or class diagrams"""
+        # TODO : should test difference between default values for package
+        # or class diagrams
 
 class DefaultDiadefGeneratorTC(unittest.TestCase):
     def test_known_values1(self):
-        dd = DefaultDiadefGenerator(Linker(project), handler).visit(project)
+        dd = DefaultDiadefGenerator(Linker(PROJECT), HANDLER).visit(PROJECT)
         self.assertEquals(len(dd), 2)
         keys = [d.TYPE for d in dd]
         self.assertEquals(keys, ['package', 'class'])
@@ -103,10 +106,10 @@ class DefaultDiadefGeneratorTC(unittest.TestCase):
                                     {'node': True, 'name': 'Interface'},
                                     {'node': True, 'name': 'Specialization'}]
                           )
-        
+
     def test_known_values2(self):
         project = ASTNGManager().project_from_files(['data.clientmodule_test'], astng_wrapper)
-        dd = DefaultDiadefGenerator(Linker(project), handler).visit(project)
+        dd = DefaultDiadefGenerator(Linker(project), HANDLER).visit(project)
         self.assertEquals(len(dd), 1)
         keys = [d.TYPE for d in dd]
         self.assertEquals(keys, ['class'])
@@ -120,19 +123,22 @@ class DefaultDiadefGeneratorTC(unittest.TestCase):
 
 class ClassDiadefGeneratorTC(unittest.TestCase):
     def test_known_values1(self):
-        handler.config.classes = ['Specialization']
-        cdg = ClassDiadefGenerator(Linker(project), handler)
-        cd = cdg.class_diagram(project, 'data.clientmodule_test.Specialization')
-        self.assertEquals(cd.title, 'data.clientmodule_test.Specialization')
+        HANDLER.config.classes = ['Specialization']
+        cdg = ClassDiadefGenerator(Linker(PROJECT), HANDLER)
+        special = 'data.clientmodule_test.Specialization'
+        cd = cdg.class_diagram(PROJECT, special)
+        self.assertEquals(cd.title, special)
         classes = _process_classes(cd.objects)
-        self.assertEquals(classes, [{'node': True, 'name': 'data.clientmodule_test.Ancestor'},
-                                    {'node': True, 'name': 'data.clientmodule_test.Specialization'},
-                                    {'node': True, 'name': 'data.suppliermodule_test.DoNothing'},
+        self.assertEquals(classes, [{'node': True,
+                                    'name': 'data.clientmodule_test.Ancestor'},
+                                    {'node': True, 'name': special},
+                                    {'node': True,
+                                    'name': 'data.suppliermodule_test.DoNothing'},
                                     ])
         
     def test_known_values2(self):
-        handler.config.module_names = False
-        cd = ClassDiadefGenerator(Linker(project), handler).class_diagram(project, 'data.clientmodule_test.Specialization')
+        HANDLER.config.module_names = False
+        cd = ClassDiadefGenerator(Linker(PROJECT), HANDLER).class_diagram(PROJECT, 'data.clientmodule_test.Specialization')
         self.assertEquals(cd.title, 'data.clientmodule_test.Specialization')
         classes = _process_classes(cd.objects)
         self.assertEquals(classes, [{'node': True, 'name': 'Ancestor' },