diff --git a/rpg/enzyme.py b/rpg/enzyme.py index 12287ad84f44ea6faaaefbe6b7aee05d5524f8e5..b098f1b31f4b76056f93e0cb02fefe7f402c522a 100644 --- a/rpg/enzyme.py +++ b/rpg/enzyme.py @@ -78,7 +78,6 @@ class Enzyme: :param enz_file: location of user file (default: ~/rpg_user.py) :type enz_file: str """ - #print(self) if self.rules != []: # Comment and first line of the Enzyme ret = "\n\n\n# User defined enzyme " + self.name + "\nENZ = []\n\n" diff --git a/tests/test_enzyme.py b/tests/test_enzyme.py index b07c2bb66f2bd8bc1117493792468a350d662c34..90de9ac9ae70e1e166fc0650b3e74de2a8eaee03 100644 --- a/tests/test_enzyme.py +++ b/tests/test_enzyme.py @@ -42,25 +42,21 @@ def test_enzyme(tmpdir): """Test function 'write_enzyme_in_user_file(self, enz_file=DEFUSERENZFILE)' """ - ''' - fil = tmpdir.join("test.tmp") + output_file = tmpdir.join("test_enzuser.py") dict_rule = {} rule_txt = "(D)(E,)" - dict_rule[rule_txt] = False + dict_rule[rule_txt] = True all_rules = rule.create_rules(dict_rule) new_enz = enzyme.Enzyme(-1, "fake_enzyme", all_rules) - new_enz.write_enzyme_in_user_file(fil) - # ICI BUG - - assert fil.read() == '\n\n\n# User defined enzyme fake_enzyme\nENZ = []\n'\ - '\nE_1 = rule.Rule(0, "E", True, 1) # Always cut '\ + new_enz.write_enzyme_in_user_file(str(output_file)) + assert output_file.read() == '\n\n\n# User defined enzyme fake_enzyme\nENZ = []\n'\ + '\nE_1 = rule.Rule(0, "E", False, 1) # Never cut '\ 'after E, except...\nD_E_1M1 = rule.Rule(-1, "D", '\ - 'False, -1) # Never cut after E, preceded by D, '\ + 'True, -1) # Always cut after E, preceded by D, '\ 'except...\nE_1.rules.append(D_E_1M1)\nENZ.append('\ 'E_1)\n\nENZYME = enzyme.Enzyme(CPT_ENZ, "fake_enzym'\ 'e", ENZ, 0)\n# Add it to available enzymes\nAVAILAB'\ 'LE_ENZYMES_USER.append(ENZYME)\nCPT_ENZ += 1\n' - ''' def test_check_enzyme_name(): """Test function 'check_enzyme_name(name_new_enz, all_name_enz)'."""