Fixed #326

 * fixed the has_content function
 * added test code

Signed-off-by: Chin Yeung Li <[email protected]>

Author: chinyeungli

src/attributecode/model.py

@@ -542,7 +542,7 @@ class BooleanField(SingleLineField):
     def default_value(self):
         return None
 
-    flags = {'yes': True, 'y': True, 'no': False, 'n': False, }
+    flags = {'yes': True, 'y': True, 'no': False, 'n': False, 'true' : True, 'false': False, }
 
     flag_values = ', '.join(flags)
 
@@ -552,7 +552,6 @@ def _validate(self, *args, **kwargs):
         False. Return a list of errors.
         """
         errors = super(BooleanField, self)._validate(*args, ** kwargs)
-
         flag = self.get_flag(self.original_value)
         if flag is False:
             name = self.name
@@ -575,7 +574,8 @@ def _validate(self, *args, **kwargs):
     def get_flag(self, value):
         """
         Return a normalized existing flag value if found in the list of
-        possible values or None if empty or False if not found.
+        possible values or None if empty or False if not found or original value
+        if it is not a boolean value
         """
         if value is None or value == '':
             return None
@@ -599,12 +599,12 @@ def get_flag(self, value):
 
     @property
     def has_content(self):
-        # Special for flags: None means False AND content not defined
-        flag = self.get_flag(self.original_value)
-        if flag:
+        """
+        Return true if it has content regardless of what value, False otherwise
+        """
+        if self.original_value:
             return True
-        else:
-            return flag
+        return False
 
     def _serialized_value(self):
         # default normalized values for serialization

tests/test_model.py

@@ -564,6 +564,14 @@ def test_About_rejects_non_ascii_names_and_accepts_unicode_values(self):
             Error(INFO, u'Field Mat\xedas is not a supported field and is ignored.')]
         assert expected == result
 
+    def test_About_invalid_boolean_value(self):
+        test_file = get_test_loc('parse/invalid_boolean.about')
+        a = model.About(test_file)
+        result = a.errors
+        expected = [
+            Error(ERROR, "Field modified: Invalid flag value: 'blah' is not one of: false, no, n, y, yes, true")]
+        assert expected == result
+
     def test_About_contains_about_file_path(self):
         test_file = get_test_loc('parse/complete/about.ABOUT')
         a = model.About(test_file, about_file_path='complete/about.ABOUT')

tests/testdata/parse/invalid_boolean.about

@@ -0,0 +1,3 @@
+name: invalid_boolean
+about_resource: .
+modified: blah