changeset 615:6b173390b0e8 pytest2

test for wikiutil.containsConflictMarker() added in _test/test_wikiutil
author pkumar <contactprashantat@gmail.com>
date Mon, 04 Jul 2011 01:03:54 +0530
parents b016b5b3c0e2
children 12057005a39f
files MoinMoin/_tests/test_wikiutil.py
diffstat 1 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/_tests/test_wikiutil.py	Sun Jul 03 22:55:35 2011 +0530
+++ b/MoinMoin/_tests/test_wikiutil.py	Mon Jul 04 01:03:54 2011 +0530
@@ -215,6 +215,16 @@
     # invalid schema
     result = wikiutil.is_URL('invalid_schema:MoinMoin')
     assert result == False
+
+def testcontainsConflictMarker():
+    # text with conflict marker
+    result = wikiutil.containsConflictMarker("/!\\ '''Edit conflict - Conflict marker is present")
+    assert result
     
+    #text without conflict marker
+    result = wikiutil.containsConflictMarker('No conflict marker')
+    assert result == False
+    
+        
 coverage_modules = ['MoinMoin.wikiutil']