1313import cluecode_test_utils # NOQA
1414from commoncode .testcase import FileBasedTesting
1515from cluecode import copyrights
16+ from textcode import markup
17+ from cluecode .copyrights import prepare_text_line
1618
1719
1820class TestTextPreparation (FileBasedTesting ):
@@ -28,56 +30,56 @@ def test_strip_leading_numbers(self):
2830
2931 def test_prepare_text_line (self ):
3032 cp = 'test (C) all rights reserved'
31- result = copyrights . prepare_text_line (cp )
33+ result = prepare_text_line (cp )
3234 assert result == 'test (c) all rights reserved'
3335
3436 def test_prepare_text_line_debian (self ):
3537 cp = 'Parts Copyright (c) 1992 <s>Uri Blumentha<s>l, I</s>BM</s>'
36- result = copyrights . prepare_text_line (cp )
38+ result = prepare_text_line (cp )
3739 assert result == 'Parts Copyright (c) 1992 Uri Blumenthal, IBM'
3840
3941 def test_prepare_text_line_does_not_truncate_transliterable_unicode (self ):
4042 cp = 'Muła'
41- result = copyrights . prepare_text_line (cp )
43+ result = prepare_text_line (cp )
4244 assert result == 'Mula'
4345
44- def test_strip_markup (self ):
46+ def test_strip_markup_removes_debian_legacy_s_tags (self ):
4547 cp = 'Parts Copyright (c) 1992 <s>Uri Blumentha<s>l, I</s>BM</s>'
46- result = copyrights . strip_markup (cp )
48+ result = markup . strip_markup_text (cp )
4749 assert result == 'Parts Copyright (c) 1992 Uri Blumenthal, IBM'
4850
4951 def test_prepare_text_line_removes_C_comments (self ):
5052 cp = '/* Copyright 1996-2005, 2008-2011 by */'
51- result = copyrights . prepare_text_line (cp )
53+ result = prepare_text_line (cp )
5254 assert result == 'Copyright 1996-2005, 2008-2011 by'
5355
5456 def test_prepare_text_line_removes_C_comments2 (self ):
5557 cp = '/* David Turner, Robert Wilhelm, and Werner Lemberg. */'
56- result = copyrights . prepare_text_line (cp )
58+ result = prepare_text_line (cp )
5759 assert result == 'David Turner, Robert Wilhelm, and Werner Lemberg.'
5860
5961 def test_prepare_text_line_removes_Cpp_comments (self ):
6062 cp = '// David Turner, Robert Wilhelm, and Werner Lemberg. */'
61- result = copyrights . prepare_text_line (cp )
63+ result = prepare_text_line (cp )
6264 assert result == 'David Turner, Robert Wilhelm, and Werner Lemberg.'
6365
6466 def test_prepare_text_line_does_not_damage_urls (self ):
6567 cp = 'copyright (c) 2000 World Wide Web Consortium, http://www.w3.org'
66- result = copyrights . prepare_text_line (cp )
68+ result = prepare_text_line (cp )
6769 assert result == 'copyright (c) 2000 World Wide Web Consortium, http://www.w3.org'
6870
6971 def test_is_end_of_statement (self ):
7072 line = ''' "All rights reserved\\ n"'''
71- _line , char_only_line = copyrights . prep_line (line )
73+ _line , char_only_line = prepare_text_line (line )
7274 assert copyrights .is_end_of_statement (char_only_line )
7375
74- def test_candidate_lines_simple (self ):
76+ def test_collect_candidate_lines_simple (self ):
7577 lines = [(1 , ' test (C) all rights reserved' )]
76- result = list (copyrights .candidate_lines (lines ))
78+ result = list (copyrights .collect_candidate_lines (lines ))
7779 expected = [[(1 , ' test (C) all rights reserved' )]]
7880 assert result == expected
7981
80- def test_candidate_lines_complex (self ):
82+ def test_collect_candidate_lines_complex (self ):
8183 lines = '''
8284 Apache Xalan (Xalan XSLT processor)
8385 Copyright 1999-2006 The Apache Software Foundation
@@ -118,57 +120,57 @@ def test_candidate_lines_complex(self):
118120 [(22 , ' this product includes software developed by the following:' )]
119121 ]
120122
121- result = list (copyrights .candidate_lines (enumerate (lines , 1 )))
123+ result = list (copyrights .collect_candidate_lines (enumerate (lines , 1 )))
122124 assert result == expected
123125
124126 def test_is_candidates_should_not_select_line_with_bare_full_year (self ):
125127 line = '2012'
126- line , _char_only = copyrights . prep_line (line )
128+ line , _char_only = prepare_text_line (line )
127129 assert not copyrights .is_candidate (line )
128130
129131 def test_is_candidates_should_not_select_line_with_full_year_before_160_and_after_2018 (self ):
130132 line = '1959 2019'
131- line , _char_only = copyrights . prep_line (line )
133+ line , _char_only = prepare_text_line (line )
132134 assert not copyrights .is_candidate (line )
133135
134136 def test_is_candidate_should_not_select_line_with_only_two_digit_numbers (self ):
135137 line = 'template<class V> struct v_iter<V, mpl::int_<10> > { typedef typename V::item10 type; typedef v_iter<V, mpl::int_<10 + 1> > next; };'
136- line , _char_only = copyrights . prep_line (line )
138+ line , _char_only = prepare_text_line (line )
137139 assert not copyrights .is_candidate (line )
138140
139141 def test_is_candidate_should_select_line_with_sign (self ):
140142 line = 'template<class V> struct v_iter<V, mpl::int_<10> (c) { typedef typename V::item10 type; typedef v_iter<V, mpl::int_<10 + 1> > next; };'
141- line , _char_only = copyrights . prep_line (line )
143+ line , _char_only = prepare_text_line (line )
142144 assert copyrights .is_candidate (line )
143145
144146 def test_is_candidate_should_not_select_line_with_junk_hex (self ):
145147 line = '01061C3F5280CD4AC504152B81E452BD82015442014'
146- line , _char_only = copyrights . prep_line (line )
148+ line , _char_only = prepare_text_line (line )
147149 assert not copyrights .is_candidate (line )
148150
149151 def test_is_candidate_should_select_line_with_a_trailing_years (self ):
150152 line = '01061C3F5280CD4AC504152B81E452BD820154 2014\n '
151- line , _char_only = copyrights . prep_line (line )
153+ line , _char_only = prepare_text_line (line )
152154 assert copyrights .is_candidate (line )
153155
154156 def test_is_candidate_should_select_line_with_proper_years (self ):
155157 line = '01061C3F5280CD4AC504152B81E452BD820154 2014-'
156- line , _char_only = copyrights . prep_line (line )
158+ line , _char_only = prepare_text_line (line )
157159 assert copyrights .is_candidate (line )
158160
159161 def test_is_candidate_should_select_line_with_proper_years2 (self ):
160162 line = '01061C3F5280CD4,2016 152B81E452BD820154'
161- line , _char_only = copyrights . prep_line (line )
163+ line , _char_only = prepare_text_line (line )
162164 assert copyrights .is_candidate (line )
163165
164166 def test_is_candidate_should_select_line_with_dashed_year (self ):
165167 line = 'pub 1024D/CCD6F801 2006-11-15'
166- line , _char_only = copyrights . prep_line (line )
168+ line , _char_only = prepare_text_line (line )
167169 assert copyrights .is_candidate (line )
168170
169171 def test_is_candidate_should_select_line_with_iso_date_year (self ):
170172 line = 'sig 3 ccd6f801 2006-11-15 nathan mittler <[email protected] >' 171- line , _char_only = copyrights . prep_line (line )
173+ line , _char_only = prepare_text_line (line )
172174 assert copyrights .is_candidate (line )
173175
174176 def test_is_candidate_should_not_select_lines_made_only_of_punct_and_digits (self ):
@@ -189,7 +191,7 @@ def test_is_candidate_should_not_select_lines_made_only_of_punct_and_digits(self
189191 ''' .splitlines ()
190192
191193 for line in lines :
192- line , _ = copyrights . prep_line (line )
194+ line , _ = prepare_text_line (line )
193195 assert not copyrights .is_candidate (line )
194196
195197
0 commit comments