[Gzz-commits] navidoc ./TODO-navidoc navidoc/mp/__init__.py n...

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Branch:         
Changes by:     Asko Soukka <address@hidden>    03/06/27 09:17:00

Modified files:
        .              : TODO-navidoc 
        navidoc/mp     : __init__.py 
        navidoc/util   : parser.py 
        test           : path.test 
Added files:
        test           : parser.test 

Log message:
        some tests, fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/TODO-navidoc.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/__init__.py.diff?tr1=1.41&tr2=1.42&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/util/parser.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/test/parser.test?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/test/path.test.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: navidoc/TODO-navidoc
diff -u navidoc/TODO-navidoc:1.23 navidoc/TODO-navidoc:1.24
--- navidoc/TODO-navidoc:1.23   Thu Jun 26 11:19:59 2003
+++ navidoc/TODO-navidoc        Fri Jun 27 09:16:59 2003
@@ -7,18 +7,23 @@
 
 tasks in humppake's journal
 
+continuous:
+  - more descriptive error messages from parser
+  - solution for avoiding metapost errors
+  - unit tests for syntax :)
+  - unit test for routines
+
 0.2alpha1:
 ==========
 
-  - syntax to follow Fenfire coding standards
-    * or is this necessary?
+  - syntax to follow Fenfire coding standards; if it is necessary?
   - add a subtitle into javodoc/docxx output before
     diagrams from different projects?
   - NavBar update for gzz.css, to allow using NavBar with
     design documentation
   - documenting, tests
-  - document docutils.conf:datestamp -additions (CVS_DATE,
-    CVS_VERSION, SSI_LASTMOD) somewhere
+  - fix drawing of naryassoc connections
+  - fix drawing of component
   - more?
 
 Design Issues
Index: navidoc/navidoc/mp/__init__.py
diff -u navidoc/navidoc/mp/__init__.py:1.41 navidoc/navidoc/mp/__init__.py:1.42
--- navidoc/navidoc/mp/__init__.py:1.41 Tue Jun 17 08:04:04 2003
+++ navidoc/navidoc/mp/__init__.py      Fri Jun 27 09:17:00 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: __init__.py,v 1.41 2003/06/17 12:04:04 humppake Exp $
+# $Id: __init__.py,v 1.42 2003/06/27 13:17:00 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -195,7 +195,7 @@
     if len(context) > 0:
         context = '_'+context
         if config.mp_context_menu: draw_extra = context_menu(diagram);
-        config.mp_context_menu = 0
+    config.mp_context_menu = 0
 
     dir = slashify(config.mp_directory)
 
Index: navidoc/navidoc/util/parser.py
diff -u navidoc/navidoc/util/parser.py:1.2 navidoc/navidoc/util/parser.py:1.3
--- navidoc/navidoc/util/parser.py:1.2  Wed Jun 11 03:49:34 2003
+++ navidoc/navidoc/util/parser.py      Fri Jun 27 09:17:00 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: parser.py,v 1.2 2003/06/11 07:49:34 humppake Exp $
+# $Id: parser.py,v 1.3 2003/06/27 13:17:00 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -35,7 +35,8 @@
     """
     match_remove(p, s)
 
-    Match pattern p in s and remove the match, return (match, ns).
+    Match pattern p in s and remove the match, return match and the
+    rest of the string.).
     """
     m = re.match(p,s)
     if m: s = re.sub(p, "", s)
@@ -51,7 +52,7 @@
 
 def init_spaces(s, tokenize=0):
     """
-    init_spaces(s)
+    init_spaces(s, tokenize=0)
 
     Strip whitespaces and calculates the amount of them in the
     beginning of the string. Return the amount and stripped
@@ -75,7 +76,7 @@
 
 def parse_indented(s, tokenize=1):
     """
-    parse_indented(s, tokenize=true)
+    parse_indented(s, tokenize=1)
 
     Split the string into lines after "\n"s. Parse the string
     array into array tree after indentions in consecutive strings.
@@ -105,8 +106,8 @@
     """
     keys_for_classes(module, top_class)
     
-    Gather a key -> class dictionary for all classes containing
-    'key' in the given module. In Navidoc this is used to
+    Gather a key -> class dictionary for all subclasses of top_class
+    containing 'key' in the given module. In Navidoc this is used to
     collect UML elements from modules.
     """
     d = {}
Index: navidoc/test/path.test
diff -u navidoc/test/path.test:1.1 navidoc/test/path.test:1.2
--- navidoc/test/path.test:1.1  Mon Jun  2 09:58:14 2003
+++ navidoc/test/path.test      Fri Jun 27 09:17:00 2003
@@ -16,7 +16,18 @@
 # MA  02111-1307  USA
 #  
 
+def test_slashify():
+    """Test slashifying a path."""
+    from navidoc.util.path import slashify
+    assert slashify('') == '', slashify('')
+    assert slashify('foo') == 'foo/', slashify('foo')
+    assert slashify('foo/') == 'foo/', slashify('foo/') 
+
 def test_relative_path():
     """Test building of relative path."""
     from navidoc.util.path import relative_path
     assert relative_path('navidoc', 'test') == '../test/', 
relative_path('navidoc', 'test')
+    assert relative_path('', 'test') == 'test', relative_path('', 'test')
+    assert relative_path('navidoc', 'Makefile') == '../Makefile', 
relative_path('navidoc', 'Makefile')
+    assert relative_path('navidoc/__init__.py', 'Makefile') == '../Makefile', 
relative_path('navidoc/__init__.py', 'Makefile')
+    assert relative_path('navidoc/util', 'test/path.test') == 
'../../test/path.test', relative_path('navidoc/util', 'test/path.test')