diff --git a/testing/data/ia6cho.tja b/testing/data/ia6cho.tja new file mode 100644 index 0000000..251491b --- /dev/null +++ b/testing/data/ia6cho.tja @@ -0,0 +1,745 @@ +BPM:186 +OFFSET:-11.432 + +COURSE:Edit +LEVEL:9 +BALLOON: +SCOREINIT:400 +SCOREDIFF:102 + + +#START + + +#BARLINEOFF +, + +#GOGOSTART +#BARLINEON +33000000, +33000000, +33000000, +500000000000000000000000000000000000000008000000, +1000200012111020, +1010200012111020, +1121101212101222, +1022122000000000, + +#GOGOEND +11, +12, +11, +12, +10022010, +10022010, +10101011, +11111020, +1020002020200022, +1020002010202222, +1020002020200022, +1020002010202222, +1020002010002022, +1020002010002022, +10210021, +0040000010102222, +10010030, +, +10210030, +000000211211, +11, +1000001120002222, +11113333, +3022, + +#GOGOSTART +1102102011021020, +1122102012221020, +1102102011021021, +1102102012221020, +1102102011021020, +1122102012221020, +1122112211221122, +11111040, +1000400011021021, +1102102012221020, +1102102011211020, +3000300012221020, +1102102011021020, +1122102012221020, +1122112211022122, +1010101020222220, + +#GOGOEND +1010112011012020, +1010112011221121, +10222022, +1111200022022111, +1102112011021120, +1020112211112111, +1122112212121122, +100200100200100200100200500000000000000008000000, +33003300, +300000000000300000000000600000000008000000000000, +33003300, +400000000000400000000000600000000008000000000000, +10101110, +100100100100201010201010, +10012001, +0010001020001011, +2000200020112010, +200000200200202020202020, +, +3, +, +, +30333022, + +#GOGOSTART +1102102011021020, +1122102012221020, +1122112211022122, +11111040, +1000400011021021, +1102102012221020, +1102102011211020, +3000300012221020, +1102102011021020, +1122102012221020, +1122112211221122, +11111022, +110210201102 +#BPMCHANGE 160 +#SCROLL 1.1625 +1020, +#MEASURE 5/4 +#SCROLL 1 +11 +#BPMCHANGE 142 +11 +#BPMCHANGE 125 +33 + +#GOGOEND +#BPMCHANGE 115 +33 +#BPMCHANGE 59 +00, + +#GOGOSTART +#MEASURE 2/4 +#BPMCHANGE 186 +40112010, +#MEASURE 4/4 +1122112211022122, +11111040, +1000200012111020, +1010200012111020, +1000200012111020, +1020121110001010, +1011202012111020, +1011202012111120, +1121101212101222, +100000200200100200200000500000000000000008000000, +1121101212101222, +1022122 + +#GOGOEND +000000000, + + +#END + + +COURSE:Oni +LEVEL:9 +BALLOON: +SCOREINIT:370 +SCOREDIFF:80 + + +#START + + +#BARLINEOFF +0000000000001122, + +#GOGOSTART +#BARLINEON +1010201022111020, +1010201022111020, +1010201022111020, +1020221110222222, +1011201022111020, +1011201022111020, +2211102211102211, +1022111000000000, + +#GOGOEND +10011001, +10111011, +10011011, +10111000, +10011001, +10011010, +10110111, +00211020, +1000201010201120, +1010201022102011, +1000201010201120, +1010201022102022, +1000201010202011, +1010201010202011, +1010201020111020, +0020111010202222, +10230230, +0022, +30230230, +000000221111, +1121, +1000000020222222, +10333333, +3034, + +#GOGOSTART +3002102010112010, +1022102010112010, +1022112011102010, +1011221010002222, +1022102010112010, +1011221010001010, +2021202120212021, +2020101020002211, +2000221120021020, +1022102010112010, +1022112011102010, +3000300030222222, +1022102010112010, +1011221010001010, +2021202120212021, +2020101020002222, + +#GOGOEND +1020112010201121, +1020112011112222, +1, +1111200011112222, +1020102210201122, +1020112211112222, +1111221212112212, +2211221111222210, +33003300, +3000300030002211, +13003300, +3000300030222222, +10111111, +100100100100202010101010, +10012022, +1020101020001011, +2010201120102011, +100000100100101010101010, +, +3, +, +0002, +30333040, + +#GOGOSTART +1022102010112010, +1011221010001010, +2021202120212021, +2020101020002211, +2000221120021020, +1022102010112010, +1022112011102010, +1011221010002222, +1022102010112010, +1011221010001010, +2021202120212021, +2020101020002222, +101120101011 +#BPMCHANGE 160 +#SCROLL 1.1625 +2020, +#MEASURE 5/4 +#SCROLL 1 +11 +#BPMCHANGE 142 +21 +#BPMCHANGE 125 +33 + +#GOGOEND +#BPMCHANGE 115 +33 +#BPMCHANGE 59 +00, + +#GOGOSTART +#MEASURE 2/4 +#BPMCHANGE 186 +20112010, +#MEASURE 4/4 +2021202120212021, +2020101020001122, +1010201022111020, +1010201022111020, +1010201022111020, +1020221110001020, +1011201022111020, +1011201022111020, +2211102211102211, +1022111011112222, +1122101122101122, +10112210 +#GOGOEND +00000000, + + +#END + + +COURSE:Hard +LEVEL:7 +BALLOON:11 +SCOREINIT:450 +SCOREDIFF:100 + + +#START + + +#BARLINEOFF +, + +#GOGOSTART +#BARLINEON +33000000, +33000000, +33000000, +1010111010001010, +1000200011101000, +1000200011101000, +1110101110101110, +1011101000000000, + +#GOGOEND +10011001, +1110, +10011011, +1110, +10011001, +10011010, +10110011, +00211020, +10211021, +10202021, +1000201010002011, +1220, +10211020, +1000201010002011, +10210012, +0022, +30230230, +0022, +30230230, +0011, +2212, +1044, +3333, +3033, + +#GOGOSTART +4000101020011010, +1001101010001010, +10112210, +10112011, +20112011, +11102011, +1011101110111011, +11102011, +2000101020011010, +1001101010001010, +10112210, +30303011, +20112011, +11102011, +1011101110111011, +11104000, + +#GOGOEND +2000101020011010, +11102000, +1000202020222000, +10112000, +10101210, +11101000, +6, +000000000000000000000000000000000008000000000000, +33003300, +3330, +33003300, +3330, +10112010, +11102000, +12, +11102000, +1121, +100000100000100000000000600000000000000000000008, +, +3, +, +, +30333040, + +#GOGOSTART +10112011, +11102011, +1011101110111011, +11102011, +2000101020011010, +1001101010001010, +10112210, +30303011, +20112011, +11102011, +1011101110111011, +11102011, +201120 +#BPMCHANGE 160 +#SCROLL 1.1625 +11, +#MEASURE 5/4 +#SCROLL 1 +70 +#BPMCHANGE 142 +00 +#BPMCHANGE 125 +00 + +#GOGOEND +#BPMCHANGE 115 +00 +#BPMCHANGE 59 +80, + +#GOGOSTART +#MEASURE 2/4 +#BPMCHANGE 186 +22, +#MEASURE 4/4 +1011101110111011, +11102000, +1000200011101000, +1000200011101000, +1000200011101000, +1020111010000000, +1010200011101000, +1010200011101000, +1110101110101110, +1011101000000000, +1110101110101110, +10111010 + +#GOGOEND +00000000, + + +#END + + +COURSE:Normal +LEVEL:5 +BALLOON:9,9 +SCOREINIT:560 +SCOREDIFF:120 + + +#START + + +#BARLINEOFF +, + +#GOGOSTART +#BARLINEON +33000000, +33000000, +33000000, +3330, +10101110, +10101110, +6, +000000000000008000000000000000000000000000000000, + +#GOGOEND +11, +1, +11, +1, +11, +11, +500000000000000000000000000000000000000000000008, +, +12, +1110, +12, +1110, +12, +12, +500000000000000000000000000000000000000000000008, +0022, +10010010, +0022, +10010010, +0011, +2211, +1044, +3333, +3, + +#GOGOSTART +30111010, +10111000, +10111010, +10111000, +10111010, +10111000, +600000000000000000000000000000000008000000000000, +33304000, +10111010, +10111000, +10111010, +3330, +10111010, +10111000, +600000000000000000000000000000000008000000000000, +33304000, + +#GOGOEND +1110, +1110, +3, +10111000, +1111, +10111000, +6, +000000000000000008000000000000000000000000000000, +11, +1110, +11, +1110, +12, +1120, +12, +1120, +1120, +100000000000100000000000600000000000000000000008, +, +3, +, +, +3330, + +#GOGOSTART +10111010, +10111000, +600000000000000000000000000000000008000000000000, +33304000, +10111010, +10111000, +10111010, +3330, +10111010, +10111000, +600000000000000000000000000000000008000000000000, +33304000, +101110 +#BPMCHANGE 160 +#SCROLL 1.1625 +10, +#MEASURE 5/4 +#SCROLL 1 +70 +#BPMCHANGE 142 +00 +#BPMCHANGE 125 +00 + +#GOGOEND +#BPMCHANGE 115 +00 +#BPMCHANGE 59 +80, + +#GOGOSTART +#MEASURE 2/4 +#BPMCHANGE 186 +22, +#MEASURE 4/4 +600000000000000000000000000000000008000000000000, +33304000, +10201110, +10201110, +10201110, +10111000, +10201110, +10201110, +6, +000000000000008000000000000000000000000000000000, +9, +0 + +#GOGOEND +8, + + +#END + + +COURSE:Easy +LEVEL:3 +BALLOON:5,7,6 +SCOREINIT:500 +SCOREDIFF:110 + + +#START + + +#BARLINEOFF +, + +#GOGOSTART +#BARLINEON +3, +3, +3, +31, +1110, +1110, +6, +000000000008000000000000000000000000000000000000, + +#GOGOEND +1, +, +1, +, +1, +1, +500000000000000000000000000000000000000000000008, +, +11, +1, +11, +1, +12, +12, +500000000000000000000000000000000000000000000008, +, +10010010, +, +10010010, +, +12, +13, +3333, +3, + +#GOGOSTART +12, +1110, +12, +1110, +12, +1110, +600000000000000000000000000008000000000000000000, +3330, +12, +1110, +12, +3330, +12, +1110, +600000000000000000000000000008000000000000000000, +3330, + +#GOGOEND +1, +11, +3, +1110, +12, +12, +7, +8, +11, +1110, +11, +1110, +1, +1, +12, +1, +1110, +100000000000100000000000500000000000000000000008, +, +3, +, +, +3330, + +#GOGOSTART +12, +1110, +600000000000000000000000000008000000000000000000, +3330, +12, +1110, +12, +3330, +12, +1110, +600000000000000000000000000008000000000000000000, +3330, +101 +#BPMCHANGE 160 +#SCROLL 1.1625 +0, +#MEASURE 5/4 +#SCROLL 1 +70 +#BPMCHANGE 142 +00 +#BPMCHANGE 125 +00 + +#GOGOEND +#BPMCHANGE 115 +00 +#BPMCHANGE 59 +80, + +#GOGOSTART +#MEASURE 2/4 +#BPMCHANGE 186 +, +#MEASURE 4/4 +600000000000000000000000000008000000000000000000, +3330, +1110, +1110, +1110, +2220, +1110, +1110, +6, +000000000008000000000000000000000000000000000000, +9, +0 +#GOGOEND +8, + + +#END + diff --git a/testing/data/ia6cho.zip b/testing/data/ia6cho.zip new file mode 100644 index 0000000..1e937e2 Binary files /dev/null and b/testing/data/ia6cho.zip differ diff --git a/testing/test_conversion.py b/testing/test_conversion.py index 3a7a580..1908149 100644 --- a/testing/test_conversion.py +++ b/testing/test_conversion.py @@ -30,7 +30,13 @@ def assert_song_property(obj1, obj2, prop, measure=None, branch=None, note=None, assert obj1[prop] == obj2[prop], msg_failure -@pytest.mark.parametrize('id_song', ['mikdp']) +@pytest.mark.parametrize('id_song', [ + # Passing charts + pytest.param('mikdp'), + # Failing charts (NB: These will be XFAIL in CI, but FAIL in local tests.) + pytest.param('ia6cho', marks=pytest.mark.xfail("CI" in os.environ, + reason='Fumen has several inexplicable empty measures at start.')), +]) def test_converted_tja_vs_cached_fumen(id_song, tmp_path, entry_point): # Define the testing directory path_test = os.path.dirname(os.path.realpath(__file__))