From bffe447824b762f4c78e877a8a789aa74ed5cef4 Mon Sep 17 00:00:00 2001 From: Shing Zhan Date: Wed, 27 Jul 2022 16:30:12 +0100 Subject: [PATCH] Fix tests --- python/tests/test_genotypes.py | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/python/tests/test_genotypes.py b/python/tests/test_genotypes.py index c49a7096de..263430200b 100644 --- a/python/tests/test_genotypes.py +++ b/python/tests/test_genotypes.py @@ -2107,18 +2107,20 @@ def test_variant_str(self): """ Test using a simple dummy tree sequence for testing. It has only one tree and one site, whose variant has the alleles - ('A', 'T', 'G', None). + ('A', 'T', 'G', '💩', '', 'TAG', None). """ tables = tskit.TableCollection(10) - tables.nodes.add_row(flags=tskit.NODE_IS_SAMPLE, time=0) - tables.nodes.add_row(flags=tskit.NODE_IS_SAMPLE, time=0) - tables.nodes.add_row(flags=tskit.NODE_IS_SAMPLE, time=0) + for _ in np.arange(6): + tables.nodes.add_row(flags=tskit.NODE_IS_SAMPLE, time=0) tables.sites.add_row(position=5, ancestral_state="A") tables.mutations.add_row(site=0, node=0, derived_state="T") tables.mutations.add_row(site=0, node=1, derived_state="G") + tables.mutations.add_row(site=0, node=2, derived_state="💩") + tables.mutations.add_row(site=0, node=3, derived_state="") + tables.mutations.add_row(site=0, node=4, derived_state="TAG") ts = tables.tree_sequence() v = next(ts.variants()) - assert v.alleles == ("A", "T", "G", None) + assert v.alleles == ("A", "T", "G", "💩", "", "TAG", None) assert isinstance(str(v), str) assert re.match( textwrap.dedent( @@ -2128,7 +2130,7 @@ def test_variant_str(self): ╠═+╤═+╣ ║Site id\s*│\s*0║ ╟─+┼─+╢ - ║Site position\s*│\s*[0-9]+\.0║ + ║Site position\s*│\s*[0-9\.]+║ ╟─+┼─+╢ ║Number of samples\s*│\s*[0-9]+║ ╟─+┼─+╢ @@ -2140,6 +2142,12 @@ def test_variant_str(self): ╟─+┼─+╢ ║Samples with allele \'G\'\s*│\s*[0-9]+\s*\([0-9\.]+\%\)║ ╟─+┼─+╢ + ║Samples with allele \'💩\'\s*│\s*[0-9]+\s*\([0-9\.]+\%\)║ + ╟─+┼─+╢ + ║Samples with allele \'\'\s*│\s*[0-9]+\s*\([0-9\.]+\%\)║ + ╟─+┼─+╢ + ║Samples with allele \'TAG\'\s*│\s*[0-9]+\s*\([0-9\.]+\%\)║ + ╟─+┼─+╢ ║Samples with allele missing\s*│\s*[0-9]+\s*\([0-9\.]+\%\)║ ╟─+┼─+╢ ║Has missing data\s*│\s*True║ @@ -2157,6 +2165,7 @@ def test_variant_str_no_samples(self): tables = tskit.TableCollection(10) tables.nodes.add_row(flags=tskit.NODE_IS_SAMPLE, time=0) tables.sites.add_row(position=5, ancestral_state="A") + tables.mutations.add_row(site=0, node=0, derived_state="T") ts = tables.tree_sequence() v = next(ts.variants(samples=[])) for allele in v.alleles: @@ -2168,12 +2177,12 @@ def test_variant_str_no_samples(self): is not None ) - def test_variant_str_no_site(): + def test_variant_str_no_site(self): tables = tskit.TableCollection(10) ts = tables.tree_sequence() v = tskit.Variant(ts) s = str(v) - assert len(s.splitlines()) == 3 + assert len(s.splitlines()) == 5 assert ( "This variant has not yet been decoded at a specific site," + "call Variant.decode to set the site"