John Chandler avatar John Chandler committed edab8c5

Minor tweaks to code

Comments (0)

Files changed (2)

qadpid/hierarchy.py

 
 class PHPHierarchyCreator( object ):
     """ Hierarchy Creator for PHP files
-        Not entirely sure about this yet - probably needs a redesign
+        Not entirely sure about this - needs a redesign. Also, 'Hierarchy' doesn't really make sense.
     """
     def __init__( self ):
         self.hierarchy = {}
         dirpath, _, files = directory
         for filepath in [ os.path.join( dirpath, x ) for x in files if x.endswith(".php") ]:
             self.hierarchy[ filepath ] = None
-            
-    

tests/test_hierarchy.py

 
 class TestHierarchyCreator( unittest.TestCase ):
     """ Tests the HierarchyCreator """
+    def setUp( self ):
+        self.creator = PHPHierarchyCreator()
+    
     def test_no_hierarchy( self ):
         """ Tests result when we have nothing to do """
-        self.assertEquals( PHPHierarchyCreator().hierarchy, {} )
+        self.assertEquals( self.creator.hierarchy, {} )
 
     def test_no_php( self ):
         """ Tests result when we add a dir with no PHP files """
-        creator = PHPHierarchyCreator()
-        creator.add( ('.', [], ["foo.js", "bar.py"]) )
+        self.creator.add( (".", [], ["foo.js", "bar.py"]) )
         
-        self.assertEquals( PHPHierarchyCreator().hierarchy, {} )
+        self.assertEquals( self.creator.hierarchy, {} )
 
     def test_php( self ):
         """ Tests result when we add a dir with PHP files """
-        creator = PHPHierarchyCreator()
-        creator.add( ('.', [], ["foo.php", "bar.php"]) )
+        self.creator.add( (".", [], ["foo.php", "bar.php"]) )
         
-        self.assertEquals( creator.hierarchy, { "./foo.php": None, "./bar.php": None } )
+        self.assertEquals( self.creator.hierarchy, { "./foo.php": None, "./bar.php": None } )
 
     def test_subdir( self ):
         """ Tests result when we add a sub dir with PHP files """
-        creator = PHPHierarchyCreator()
-        creator.add( ('./wibble', [], ["foo.php", "bar.php"]) )
+        self.creator.add( ("./wibble", [], ["foo.php", "bar.php"]) )
         
-        self.assertEquals( creator.hierarchy, { "./wibble/foo.php": None, "./wibble/bar.php": None } )
-        
+        self.assertEquals( self.creator.hierarchy, { "./wibble/foo.php": None, "./wibble/bar.php": None } )
 
 
 if __name__ == "__main__":
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.