#326 - Fix incorrect data for boolean value

 * Added some tests

Author: chinyeungli

src/attributecode/model.py

@@ -910,7 +910,6 @@ def process(self, fields, about_file_path, running_inventory=False,
         afp = self.about_file_path
 
         errors = self.hydrate(fields)
-
         # We want to copy the license_files before the validation
         if reference_dir:
             copy_license_notice_files(
@@ -997,6 +996,7 @@ def load_dict(self, fields_dict, base_dir, running_inventory=False, reference_di
                 # 'Field licenses is a custom field.'
                 licenses_field = (key, value)
                 fields.remove(licenses_field)
+
         errors = self.process(
             fields=fields,
             about_file_path=self.about_file_path,
@@ -1027,9 +1027,9 @@ def dumps(self):
         license_file = []
         license_url = []
         file_fields = ['about_resource', 'notice_file', 'changelog_file', 'author_file']
-        bool_fields = ['redistribute', 'attribute', 'track_changes', 'modified']
+        bool_fields = ['redistribute', 'attribute', 'track_changes', 'modified', 'internal_use_only']
         for field in self.all_fields():
-            if not field.value:
+            if not field.value and not field.name in bool_fields:
                 continue
 
             if field.name == 'license_key' and field.value:
@@ -1046,8 +1046,10 @@ def dumps(self):
             # value of 'about_resource'
             elif field.name in file_fields and field.value:
                 data[field.name] = list(field.value.keys())[0]
+            elif field.name in bool_fields and not field.value == None:
+                data[field.name] = field.value
             else:
-                if field.value or (field.name in bool_fields and not field.value == None):
+                if field.value:
                     data[field.name] = field.value
 
         # Group the same license information in a list

src/attributecode/util.py

@@ -134,13 +134,10 @@ def wrap_boolean_value(context):
         key = line.partition(':')[0]
         value = line.partition(':')[2].strip()
         value = '"' + value + '"'
-        print(value)
         if key in boolean_fields and not value == "":
             updated_context += key + ': ' + value + '\n'
         else:
             updated_context += line + '\n'
-    print("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@")
-    print(updated_context)
     return updated_context
 
 # TODO: rename to normalize_path

tests/test_gen.py

@@ -199,3 +199,18 @@ def test_generate_not_overwrite_original_license_file(self):
             'licenses:\n'
             '    -   file: this.LICENSE\n')
         assert expected == result
+
+    def test_boolean_value_not_lost(self):
+        location = get_test_loc('test_gen/inv6.csv')
+        base_dir = get_temp_dir()
+
+        _errors, abouts = gen.generate(location, base_dir)
+
+        in_mem_result = [a.dumps() for a in abouts][0]
+        expected = (u'about_resource: .\n'
+                    u'name: AboutCode\n'
+                    u'version: 0.11.0\n'
+                    u'redistribute: yes\n'
+                    u'attribute: yes\n'
+                    u'modified: no\n')
+        assert expected == in_mem_result

tests/test_model.py

@@ -681,6 +681,8 @@ def test_About_dumps_does_all_non_empty_present_fields(self):
             Error(INFO, 'Field custom2 is a custom field.'),
             Error(INFO, 'Field custom2 is present but empty.')
         ]
+        print("########################################")
+        print(a.errors)
         assert sorted(expected_error) == sorted(a.errors)
 
         expected = '''about_resource: .

tests/testdata/test_gen/inv6.csv

@@ -0,0 +1,2 @@
+about_file_path,about_resource,name,version,download_url,description,homepage_url,notes,license_name,license_file,license_url,copyright,notice_file,notice_url,redistribute,attribute,track_change,modified,changelog_file,owner,owner_url,contact,author,vcs_tool,vcs_repository,vcs_path,vcs_tag,vcs_branch,vcs_revision,checksum_md5,checksum_sha1,spec_version
+inv/this.ABOUT,.,AboutCode,0.11.0,,,,,,,,,,,Yes,Y,,N,,,,,,,,,,,,,,