984 lines
38 KiB
C++
984 lines
38 KiB
C++
#include <test.hpp>
|
|
|
|
#include <algorithm>
|
|
#include <chrono>
|
|
#include <cmath>
|
|
#include <cstddef>
|
|
#include <cstdio>
|
|
#include <cstdint>
|
|
#include <cstring>
|
|
#include <filesystem>
|
|
#include <fstream>
|
|
#include <future>
|
|
#include <initializer_list>
|
|
#include <limits>
|
|
#include <string>
|
|
#include <string_view>
|
|
#include <thread>
|
|
#include <utility>
|
|
#include <variant>
|
|
#include <vector>
|
|
|
|
#include <boost/asio/co_spawn.hpp>
|
|
#include <boost/asio/io_context.hpp>
|
|
#include <boost/asio/use_future.hpp>
|
|
|
|
#include <noto.hpp>
|
|
|
|
#include <vamp_pico/http_client.hpp>
|
|
#include <vamp_zero/database.hpp>
|
|
#include <vamp_zero/library.hpp>
|
|
#include <vamp_zero/score.hpp>
|
|
#include <vamp_zero/types.hpp>
|
|
|
|
namespace {
|
|
|
|
constexpr auto layout_any_index = std::numeric_limits<std::size_t>::max();
|
|
|
|
auto pitch(std::char_t letter, std::string accidental, std::int32_t octave = 4) -> vamp_zero::score_pitch {
|
|
return {
|
|
.letter = letter,
|
|
.octave = octave,
|
|
.accidental = std::move(accidental),
|
|
};
|
|
}
|
|
|
|
auto note(
|
|
std::initializer_list<vamp_zero::score_pitch> pitches,
|
|
std::bool_t tie_from_previous = false,
|
|
std::string notehead = {},
|
|
std::bool_t hidden = false
|
|
) -> vamp_zero::score_note {
|
|
return {
|
|
.kind = "note",
|
|
.hidden = hidden,
|
|
.duration_ticks = 4096,
|
|
.display_ticks = 4096,
|
|
.notehead = std::move(notehead),
|
|
.tie_from_previous = tie_from_previous,
|
|
.pitches = std::vector<vamp_zero::score_pitch>{pitches},
|
|
};
|
|
}
|
|
|
|
auto note_with_ticks(std::initializer_list<vamp_zero::score_pitch> pitches, std::int64_t ticks) -> vamp_zero::score_note {
|
|
auto value = note(pitches);
|
|
value.duration_ticks = ticks;
|
|
value.display_ticks = ticks;
|
|
return value;
|
|
}
|
|
|
|
auto rest(std::initializer_list<vamp_zero::score_pitch> pitches) -> vamp_zero::score_note {
|
|
return {
|
|
.kind = "rest",
|
|
.duration_ticks = 4096,
|
|
.display_ticks = 4096,
|
|
.pitches = std::vector<vamp_zero::score_pitch>{pitches},
|
|
};
|
|
}
|
|
|
|
auto mark_name(vamp_zero::score_accidental_mark mark) -> std::string {
|
|
switch (mark) {
|
|
case vamp_zero::score_accidental_mark::NONE:
|
|
return "none";
|
|
case vamp_zero::score_accidental_mark::FLAT:
|
|
return "flat";
|
|
case vamp_zero::score_accidental_mark::NATURAL:
|
|
return "natural";
|
|
case vamp_zero::score_accidental_mark::SHARP:
|
|
return "sharp";
|
|
}
|
|
return {};
|
|
}
|
|
|
|
auto mark_names(std::vector<vamp_zero::score_accidental_mark> const& marks) -> std::vector<std::string> {
|
|
auto names = std::vector<std::string>{};
|
|
names.reserve(marks.size());
|
|
for (auto mark : marks) {
|
|
names.push_back(mark_name(mark));
|
|
}
|
|
return names;
|
|
}
|
|
|
|
void expect_marks(std::vector<vamp_zero::score_accidental_mark> const& marks, std::initializer_list<std::string_view> expected) {
|
|
auto actual_names = mark_names(marks);
|
|
BOOST_REQUIRE_EQUAL(actual_names.size(), expected.size());
|
|
auto index = std::size_t{};
|
|
for (auto name : expected) {
|
|
BOOST_TEST(actual_names[index] == std::string{name});
|
|
++index;
|
|
}
|
|
}
|
|
|
|
auto score_with_measure(vamp_zero::score_measure measure, std::string key_signature = "C", std::string time_signature = "4/4", std::string clef = "treble") -> vamp_zero::score_document {
|
|
if (measure.key_signature.empty()) {
|
|
measure.key_signature = key_signature;
|
|
}
|
|
if (measure.time_signature.empty()) {
|
|
measure.time_signature = time_signature;
|
|
}
|
|
return {
|
|
.title = "Layout Tune",
|
|
.composer = "Composer",
|
|
.key_signature = std::move(key_signature),
|
|
.time_signature = std::move(time_signature),
|
|
.clef = std::move(clef),
|
|
.part = "Lead",
|
|
.measures = {std::move(measure)},
|
|
};
|
|
}
|
|
|
|
auto score_with_notes(std::vector<vamp_zero::score_note> notes, std::string key_signature = "C", std::string time_signature = "4/4", std::string clef = "treble") -> vamp_zero::score_document {
|
|
auto measure = vamp_zero::score_measure{
|
|
.time_signature = time_signature,
|
|
.key_signature = key_signature,
|
|
.notes = std::move(notes),
|
|
};
|
|
return score_with_measure(std::move(measure), std::move(key_signature), std::move(time_signature), std::move(clef));
|
|
}
|
|
|
|
auto layout_items(
|
|
vamp_zero::score_page_layout const& layout,
|
|
vamp_zero::score_layout_item_role role,
|
|
std::size_t system_index = layout_any_index,
|
|
std::size_t measure_index = layout_any_index,
|
|
std::size_t note_index = layout_any_index
|
|
) -> std::vector<vamp_zero::score_layout_item const*> {
|
|
auto result = std::vector<vamp_zero::score_layout_item const*>{};
|
|
for (auto const& item : layout.items) {
|
|
if (item.role != role) {
|
|
continue;
|
|
}
|
|
if (system_index != layout_any_index && item.system_index != system_index) {
|
|
continue;
|
|
}
|
|
if (measure_index != layout_any_index && item.measure_index != measure_index) {
|
|
continue;
|
|
}
|
|
if (note_index != layout_any_index && item.note_index != note_index) {
|
|
continue;
|
|
}
|
|
result.push_back(&item);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
auto center_x(vamp_zero::score_layout_item const& item) -> std::float32_t {
|
|
return item.bounds.x + item.bounds.width * 0.5F;
|
|
}
|
|
|
|
auto center_y(vamp_zero::score_layout_item const& item) -> std::float32_t {
|
|
return item.bounds.y + item.bounds.height * 0.5F;
|
|
}
|
|
|
|
auto right_edge(vamp_zero::score_layout_item const& item) -> std::float32_t {
|
|
return item.bounds.x + item.bounds.width;
|
|
}
|
|
|
|
auto left_edge(vamp_zero::score_layout_item const& item) -> std::float32_t {
|
|
return item.bounds.x;
|
|
}
|
|
|
|
auto bottom_edge(vamp_zero::score_layout_item const& item) -> std::float32_t {
|
|
return item.bounds.y + item.bounds.height;
|
|
}
|
|
|
|
auto near(std::float32_t left, std::float32_t right) -> std::bool_t {
|
|
return std::abs(left - right) < 0.02F;
|
|
}
|
|
|
|
void expect_up_stem_connected(vamp_zero::score_layout_item const& head, vamp_zero::score_layout_item const& stem, std::float32_t staff_spacing) {
|
|
auto const overlap = right_edge(head) - stem.from.x;
|
|
BOOST_TEST(overlap >= staff_spacing * 0.12F);
|
|
BOOST_TEST(overlap <= staff_spacing * 0.45F);
|
|
BOOST_TEST(stem.from.x > left_edge(head));
|
|
BOOST_TEST(stem.from.y > head.bounds.y);
|
|
BOOST_TEST(stem.from.y < bottom_edge(head));
|
|
BOOST_TEST(stem.to.y < stem.from.y);
|
|
}
|
|
|
|
void expect_down_stem_connected(vamp_zero::score_layout_item const& head, vamp_zero::score_layout_item const& stem, std::float32_t staff_spacing) {
|
|
auto const overlap = stem.from.x - left_edge(head);
|
|
BOOST_TEST(overlap >= staff_spacing * 0.12F);
|
|
BOOST_TEST(overlap <= staff_spacing * 0.45F);
|
|
BOOST_TEST(stem.from.x < right_edge(head));
|
|
BOOST_TEST(stem.from.y > head.bounds.y);
|
|
BOOST_TEST(stem.from.y < bottom_edge(head));
|
|
BOOST_TEST(stem.to.y > stem.from.y);
|
|
}
|
|
|
|
auto test_database_config(std::filesystem::path const& path) -> vamp_zero::database_config {
|
|
return {
|
|
.path = path.string(),
|
|
};
|
|
}
|
|
|
|
auto run_ensure_database(vamp_zero::database_config config) -> std::expected<void, modulus::error> {
|
|
auto io = boost::asio::io_context{};
|
|
auto future = boost::asio::co_spawn(io, vamp_zero::async_ensure_database(io.get_executor(), std::move(config)), boost::asio::use_future);
|
|
io.run();
|
|
return future.get();
|
|
}
|
|
|
|
auto run_import(vamp_zero::database_config config, std::filesystem::path const& assets_path) -> std::expected<void, modulus::error> {
|
|
auto io = boost::asio::io_context{};
|
|
auto future = boost::asio::co_spawn(io, vamp_zero::async_import_catalogs(io.get_executor(), std::move(config), assets_path.string()), boost::asio::use_future);
|
|
io.run();
|
|
return future.get();
|
|
}
|
|
|
|
auto query_database(std::filesystem::path const& path, std::string sql, std::vector<noto::sqlite_value> params = {}) -> std::expected<noto::query_result, modulus::error> {
|
|
auto io = boost::asio::io_context{};
|
|
auto future = boost::asio::co_spawn(
|
|
io,
|
|
[executor = io.get_executor(), path = path.string(), sql = std::move(sql), params = std::move(params)]() mutable -> boost::asio::awaitable<std::expected<noto::query_result, modulus::error>> {
|
|
auto config = noto::file_connection_config(path, "product-vamp-test");
|
|
config.foreign_keys = true;
|
|
auto connection = noto::connection{executor, std::move(config)};
|
|
auto connected = co_await connection.async_connect();
|
|
if (!connected) {
|
|
co_return std::unexpected(connected.error());
|
|
}
|
|
auto selected = co_await connection.async_execute(std::move(sql), std::move(params));
|
|
auto closed = co_await connection.async_close();
|
|
if (!selected) {
|
|
co_return std::unexpected(selected.error());
|
|
}
|
|
if (!closed) {
|
|
co_return std::unexpected(closed.error());
|
|
}
|
|
co_return selected;
|
|
},
|
|
boost::asio::use_future);
|
|
io.run();
|
|
return future.get();
|
|
}
|
|
|
|
auto text_value(noto::sqlite_value const& value) -> std::string {
|
|
auto text = std::get_if<std::string>(&value.value);
|
|
return text == nullptr ? std::string{} : *text;
|
|
}
|
|
|
|
auto integer_value(noto::sqlite_value const& value) -> std::int64_t {
|
|
auto integer = std::get_if<std::int64_t>(&value.value);
|
|
return integer == nullptr ? 0 : *integer;
|
|
}
|
|
|
|
auto has_value(noto::query_result const& result, std::size_t column, std::string_view expected) -> std::bool_t {
|
|
return std::any_of(result.rows.begin(), result.rows.end(), [&](auto const& row) {
|
|
return row.size() > column && text_value(row[column]) == expected;
|
|
});
|
|
}
|
|
|
|
auto score_asset_json(std::string title, std::string key = "C") -> std::string {
|
|
return std::string{R"json({
|
|
"metadata": {
|
|
"title": ")json"} + title + R"json(",
|
|
"composer": "Composer",
|
|
"key_signature": ")json" + key + R"json(",
|
|
"time_signature": "4/4"
|
|
},
|
|
"staves": [
|
|
{
|
|
"id": "staff-lead",
|
|
"name": "Lead",
|
|
"clef": "treble",
|
|
"role": "lead",
|
|
"measures": [
|
|
{
|
|
"id": "measure-1",
|
|
"time_signature": "4/4",
|
|
"key_signature": ")json" + key + R"json(",
|
|
"voices": [
|
|
{
|
|
"id": "voice-1",
|
|
"notes": [
|
|
{
|
|
"id": "note-1",
|
|
"kind": "note",
|
|
"duration_ticks": 4096,
|
|
"pitches": [
|
|
{"letter": "c", "octave": 4, "accidental": "n"}
|
|
]
|
|
}
|
|
]
|
|
}
|
|
]
|
|
}
|
|
]
|
|
}
|
|
]
|
|
}
|
|
)json";
|
|
}
|
|
|
|
void write_text(std::filesystem::path const& path, std::string const& text) {
|
|
std::filesystem::create_directories(path.parent_path());
|
|
auto output = std::ofstream{path, std::ios::binary | std::ios::trunc};
|
|
output << text;
|
|
}
|
|
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(score_parser_preserves_notation_preamble) {
|
|
auto parsed = vamp_zero::parse_score_document(R"json(
|
|
{
|
|
"metadata": {
|
|
"title": "Standard Tune",
|
|
"composer": "Composer",
|
|
"key_signature": "Eb",
|
|
"time_signature": "3/4"
|
|
},
|
|
"staves": [
|
|
{
|
|
"id": "staff-lead",
|
|
"name": "Lead",
|
|
"clef": "treble",
|
|
"role": "lead",
|
|
"measures": [
|
|
{
|
|
"id": "measure-1",
|
|
"time_signature": "3/4",
|
|
"key_signature": "Eb",
|
|
"voices": [
|
|
{
|
|
"id": "voice-1",
|
|
"notes": [
|
|
{
|
|
"id": "note-1",
|
|
"kind": "note",
|
|
"duration_ticks": 4096,
|
|
"tuplet_id": "triplet-1",
|
|
"pitches": [
|
|
{
|
|
"letter": "b",
|
|
"octave": 4,
|
|
"accidental": "b"
|
|
}
|
|
]
|
|
}
|
|
],
|
|
"tuplets": [
|
|
{
|
|
"id": "triplet-1",
|
|
"note_count": 3,
|
|
"space_count": 2
|
|
}
|
|
]
|
|
}
|
|
]
|
|
}
|
|
]
|
|
}
|
|
]
|
|
}
|
|
)json", "standard-tune.json");
|
|
|
|
BOOST_REQUIRE(static_cast<std::bool_t>(parsed));
|
|
BOOST_TEST(parsed->title == "Standard Tune");
|
|
BOOST_TEST(parsed->composer == "Composer");
|
|
BOOST_TEST(parsed->key_signature == "Eb");
|
|
BOOST_TEST(parsed->time_signature == "3/4");
|
|
BOOST_TEST(parsed->clef == "treble");
|
|
BOOST_TEST(parsed->part == "Lead");
|
|
BOOST_REQUIRE_EQUAL(parsed->measures.size(), 1U);
|
|
BOOST_TEST(parsed->measures.front().key_signature == "Eb");
|
|
BOOST_TEST(parsed->measures.front().time_signature == "3/4");
|
|
BOOST_REQUIRE_EQUAL(parsed->measures.front().notes.size(), 1U);
|
|
BOOST_TEST(parsed->measures.front().notes.front().tuplet_id == "triplet-1");
|
|
BOOST_REQUIRE_EQUAL(parsed->measures.front().tuplets.size(), 1U);
|
|
BOOST_TEST(parsed->measures.front().tuplets.front().id == "triplet-1");
|
|
BOOST_TEST(parsed->measures.front().tuplets.front().note_count == 3);
|
|
BOOST_TEST(parsed->measures.front().tuplets.front().space_count == 2);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(accidentals_are_suppressed_when_the_key_signature_already_covers_the_pitch) {
|
|
auto c_major = vamp_zero::score_measure{
|
|
.key_signature = "C",
|
|
.notes = {
|
|
note({pitch('c', "n")}),
|
|
note({pitch('d', "n")}),
|
|
note({pitch('e', "n")}),
|
|
},
|
|
};
|
|
expect_marks(vamp_zero::notated_accidentals_for_measure(c_major, "C"), {"none", "none", "none"});
|
|
|
|
auto f_major = vamp_zero::score_measure{
|
|
.key_signature = "F",
|
|
.notes = {
|
|
note({pitch('b', "b")}),
|
|
note({pitch('e', "n")}),
|
|
},
|
|
};
|
|
expect_marks(vamp_zero::notated_accidentals_for_measure(f_major, "C"), {"none", "none"});
|
|
|
|
auto d_major = vamp_zero::score_measure{
|
|
.key_signature = "D",
|
|
.notes = {
|
|
note({pitch('f', "#")}),
|
|
note({pitch('c', "#")}),
|
|
},
|
|
};
|
|
expect_marks(vamp_zero::notated_accidentals_for_measure(d_major, "C"), {"none", "none"});
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(accidentals_follow_measure_state_after_the_first_printed_change) {
|
|
auto measure = vamp_zero::score_measure{
|
|
.key_signature = "F",
|
|
.notes = {
|
|
note({pitch('b', "b")}),
|
|
note({pitch('b', "n")}),
|
|
note({pitch('b', "n")}),
|
|
note({pitch('b', "b")}),
|
|
note({pitch('b', "b")}),
|
|
},
|
|
};
|
|
expect_marks(vamp_zero::notated_accidentals_for_measure(measure, "C"), {"none", "natural", "none", "flat", "none"});
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(measure_state_resets_for_each_measure) {
|
|
auto first = vamp_zero::score_measure{
|
|
.key_signature = "C",
|
|
.notes = {
|
|
note({pitch('f', "#")}),
|
|
note({pitch('f', "#")}),
|
|
},
|
|
};
|
|
expect_marks(vamp_zero::notated_accidentals_for_measure(first, "C"), {"sharp", "none"});
|
|
|
|
auto second = vamp_zero::score_measure{
|
|
.key_signature = "C",
|
|
.notes = {
|
|
note({pitch('f', "#")}),
|
|
},
|
|
};
|
|
expect_marks(vamp_zero::notated_accidentals_for_measure(second, "C"), {"sharp"});
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(tied_rests_hidden_and_slash_notes_do_not_emit_accidentals) {
|
|
auto measure = vamp_zero::score_measure{
|
|
.key_signature = "C",
|
|
.notes = {
|
|
note({pitch('f', "#")}, true),
|
|
rest({pitch('b', "b")}),
|
|
note({pitch('c', "#")}, false, "slash"),
|
|
note({pitch('d', "#")}, false, {}, true),
|
|
note({pitch('e', "b")}),
|
|
},
|
|
};
|
|
expect_marks(vamp_zero::notated_accidentals_for_measure(measure, "C"), {"none", "flat"});
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(pico_remote_display_parser_accepts_crlf_payloads) {
|
|
auto state = vamp_pico::remote_display_state{};
|
|
BOOST_REQUIRE(vamp_pico::parse_remote_display_body("active=1\r\ntitle=Autumn Leaves\r\npart=Vocal\r\nmode=score\r\npage=2\r\npages=11\r\n", state));
|
|
|
|
BOOST_TEST(state.active);
|
|
BOOST_TEST(std::strcmp(state.title, "Autumn Leaves") == 0);
|
|
BOOST_TEST(std::strcmp(state.part, "Vocal") == 0);
|
|
BOOST_TEST(std::strcmp(state.mode, "score") == 0);
|
|
BOOST_TEST(state.page == 2U);
|
|
BOOST_TEST(state.pages == 11U);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(pico_remote_display_parser_rejects_bad_numbers_and_preserves_state) {
|
|
auto state = vamp_pico::remote_display_state{};
|
|
std::snprintf(state.title, sizeof(state.title), "Keep");
|
|
|
|
BOOST_TEST(!vamp_pico::parse_remote_display_body("page=1x\npages=2\n", state));
|
|
BOOST_TEST(std::strcmp(state.title, "Keep") == 0);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(pico_remote_display_parser_truncates_long_fields_safely) {
|
|
auto state = vamp_pico::remote_display_state{};
|
|
auto body = std::string{"title="} + std::string(140U, 'A') + "\npart=" + std::string(80U, 'B') + "\nmode=performance-score";
|
|
|
|
BOOST_REQUIRE(vamp_pico::parse_remote_display_body(body, state));
|
|
BOOST_TEST(std::strlen(state.title) == sizeof(state.title) - 1U);
|
|
BOOST_TEST(std::strlen(state.part) == sizeof(state.part) - 1U);
|
|
BOOST_TEST(std::strcmp(state.mode, "performance-score") == 0);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(database_ensure_creates_current_schema_without_version_bookkeeping) {
|
|
auto root = std::filesystem::temp_directory_path()
|
|
/ ("product-vamp-db-schema-test-" + std::to_string(std::chrono::steady_clock::now().time_since_epoch().count()));
|
|
auto database_path = root / "vamp.db";
|
|
std::filesystem::remove_all(root);
|
|
|
|
auto config = test_database_config(database_path);
|
|
BOOST_REQUIRE(run_ensure_database(config));
|
|
BOOST_REQUIRE(run_ensure_database(config));
|
|
|
|
auto tables = query_database(database_path, "SELECT name FROM sqlite_schema WHERE type = 'table' ORDER BY name");
|
|
BOOST_REQUIRE(tables);
|
|
BOOST_TEST(has_value(*tables, 0U, "songs"));
|
|
BOOST_TEST(has_value(*tables, 0U, "practice_exercises"));
|
|
BOOST_TEST(has_value(*tables, 0U, "page_state"));
|
|
BOOST_TEST(!has_value(*tables, 0U, "_noto_schema_migrations"));
|
|
|
|
auto version = query_database(database_path, "PRAGMA user_version");
|
|
BOOST_REQUIRE(version);
|
|
BOOST_REQUIRE_EQUAL(version->rows.size(), 1U);
|
|
BOOST_TEST(integer_value(version->rows[0][0]) == 0);
|
|
|
|
std::filesystem::remove_all(root);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(database_ensure_updates_legacy_schema_in_place) {
|
|
auto root = std::filesystem::temp_directory_path()
|
|
/ ("product-vamp-db-legacy-test-" + std::to_string(std::chrono::steady_clock::now().time_since_epoch().count()));
|
|
auto database_path = root / "vamp.db";
|
|
std::filesystem::remove_all(root);
|
|
std::filesystem::create_directories(root);
|
|
|
|
BOOST_REQUIRE(query_database(database_path, R"sql(
|
|
CREATE TABLE songs (
|
|
id TEXT PRIMARY KEY NOT NULL CHECK(length(trim(id)) BETWEEN 1 AND 120),
|
|
title TEXT NOT NULL CHECK(length(trim(title)) BETWEEN 1 AND 200),
|
|
composer TEXT NOT NULL DEFAULT '',
|
|
source_json TEXT NOT NULL CHECK(json_valid(source_json)),
|
|
created_at_ms INTEGER NOT NULL CHECK(created_at_ms >= 0),
|
|
updated_at_ms INTEGER NOT NULL CHECK(updated_at_ms >= created_at_ms)
|
|
) STRICT
|
|
)sql"));
|
|
BOOST_REQUIRE(query_database(database_path, R"sql(
|
|
CREATE TABLE practice_exercises (
|
|
id TEXT PRIMARY KEY NOT NULL CHECK(length(trim(id)) BETWEEN 1 AND 160),
|
|
title TEXT NOT NULL CHECK(length(trim(title)) BETWEEN 1 AND 200),
|
|
composer TEXT NOT NULL DEFAULT '',
|
|
key_signature TEXT NOT NULL DEFAULT 'C',
|
|
source_json TEXT NOT NULL CHECK(json_valid(source_json)),
|
|
source_path TEXT NOT NULL DEFAULT '',
|
|
created_at_ms INTEGER NOT NULL CHECK(created_at_ms >= 0),
|
|
updated_at_ms INTEGER NOT NULL CHECK(updated_at_ms >= created_at_ms)
|
|
) STRICT
|
|
)sql"));
|
|
BOOST_REQUIRE(query_database(database_path, "CREATE TABLE _noto_schema_migrations(id TEXT PRIMARY KEY NOT NULL) STRICT"));
|
|
BOOST_REQUIRE(query_database(database_path, "PRAGMA user_version = 5"));
|
|
|
|
auto config = test_database_config(database_path);
|
|
BOOST_REQUIRE(run_ensure_database(config));
|
|
|
|
auto song_columns = query_database(database_path, "PRAGMA table_info(songs)");
|
|
BOOST_REQUIRE(song_columns);
|
|
BOOST_TEST(has_value(*song_columns, 1U, "part"));
|
|
BOOST_TEST(has_value(*song_columns, 1U, "source_path"));
|
|
BOOST_TEST(has_value(*song_columns, 1U, "key_signature"));
|
|
BOOST_TEST(has_value(*song_columns, 1U, "catalog_managed"));
|
|
|
|
auto practice_columns = query_database(database_path, "PRAGMA table_info(practice_exercises)");
|
|
BOOST_REQUIRE(practice_columns);
|
|
BOOST_TEST(has_value(*practice_columns, 1U, "practice_type_id"));
|
|
BOOST_TEST(has_value(*practice_columns, 1U, "practice_type_title"));
|
|
BOOST_TEST(has_value(*practice_columns, 1U, "lesson_group_id"));
|
|
BOOST_TEST(has_value(*practice_columns, 1U, "lesson_group_title"));
|
|
BOOST_TEST(has_value(*practice_columns, 1U, "catalog_managed"));
|
|
|
|
auto tables = query_database(database_path, "SELECT name FROM sqlite_schema WHERE type = 'table'");
|
|
BOOST_REQUIRE(tables);
|
|
BOOST_TEST(!has_value(*tables, 0U, "_noto_schema_migrations"));
|
|
|
|
auto version = query_database(database_path, "PRAGMA user_version");
|
|
BOOST_REQUIRE(version);
|
|
BOOST_REQUIRE_EQUAL(version->rows.size(), 1U);
|
|
BOOST_TEST(integer_value(version->rows[0][0]) == 0);
|
|
|
|
std::filesystem::remove_all(root);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(database_import_upserts_catalog_rows_and_keeps_unmanaged_rows) {
|
|
auto root = std::filesystem::temp_directory_path()
|
|
/ ("product-vamp-db-test-" + std::to_string(std::chrono::steady_clock::now().time_since_epoch().count()));
|
|
auto assets = root / "assets";
|
|
auto database_path = root / "vamp.db";
|
|
auto song_path = assets / "songs" / "tune.json";
|
|
std::filesystem::remove_all(root);
|
|
write_text(song_path, score_asset_json("Catalog Tune"));
|
|
|
|
auto config = test_database_config(database_path);
|
|
BOOST_REQUIRE(run_ensure_database(config));
|
|
BOOST_REQUIRE(run_import(config, assets));
|
|
|
|
auto first = query_database(database_path, "SELECT title, created_at_ms, updated_at_ms, catalog_managed FROM songs WHERE id = 'tune'");
|
|
BOOST_REQUIRE(first);
|
|
BOOST_REQUIRE_EQUAL(first->rows.size(), 1U);
|
|
auto created = integer_value(first->rows[0][1]);
|
|
auto updated = integer_value(first->rows[0][2]);
|
|
BOOST_TEST(text_value(first->rows[0][0]) == "Catalog Tune");
|
|
BOOST_TEST(integer_value(first->rows[0][3]) == 1);
|
|
|
|
BOOST_REQUIRE(run_import(config, assets));
|
|
auto unchanged = query_database(database_path, "SELECT created_at_ms, updated_at_ms FROM songs WHERE id = 'tune'");
|
|
BOOST_REQUIRE(unchanged);
|
|
BOOST_REQUIRE_EQUAL(unchanged->rows.size(), 1U);
|
|
BOOST_TEST(integer_value(unchanged->rows[0][0]) == created);
|
|
BOOST_TEST(integer_value(unchanged->rows[0][1]) == updated);
|
|
|
|
std::this_thread::sleep_for(std::chrono::milliseconds{2});
|
|
write_text(song_path, score_asset_json("Catalog Tune Updated"));
|
|
BOOST_REQUIRE(run_import(config, assets));
|
|
auto changed = query_database(database_path, "SELECT title, created_at_ms, updated_at_ms FROM songs WHERE id = 'tune'");
|
|
BOOST_REQUIRE(changed);
|
|
BOOST_REQUIRE_EQUAL(changed->rows.size(), 1U);
|
|
BOOST_TEST(text_value(changed->rows[0][0]) == "Catalog Tune Updated");
|
|
BOOST_TEST(integer_value(changed->rows[0][1]) == created);
|
|
BOOST_TEST(integer_value(changed->rows[0][2]) >= updated);
|
|
|
|
auto inserted_custom = query_database(
|
|
database_path,
|
|
"INSERT INTO songs(id, title, composer, source_json, created_at_ms, updated_at_ms, part, source_path, key_signature, catalog_managed) VALUES('custom', 'Custom Tune', 'Composer', ?1, 1, 1, 'Lead', 'custom.json', 'C', 0)",
|
|
{noto::sqlite_value{score_asset_json("Custom Tune")}});
|
|
BOOST_REQUIRE(inserted_custom);
|
|
|
|
std::filesystem::remove(song_path);
|
|
BOOST_REQUIRE(run_import(config, assets));
|
|
auto counts = query_database(database_path, "SELECT sum(CASE WHEN id = 'tune' THEN 1 ELSE 0 END), sum(CASE WHEN id = 'custom' THEN 1 ELSE 0 END) FROM songs");
|
|
BOOST_REQUIRE(counts);
|
|
BOOST_REQUIRE_EQUAL(counts->rows.size(), 1U);
|
|
BOOST_TEST(integer_value(counts->rows[0][0]) == 0);
|
|
BOOST_TEST(integer_value(counts->rows[0][1]) == 1);
|
|
|
|
std::filesystem::remove_all(root);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(score_layout_orders_preamble_on_staff_baselines) {
|
|
auto score = score_with_notes({note({pitch('e', "n")})}, "F", "4/4", "treble");
|
|
auto layout = vamp_zero::layout_score_page({.x = 0.0F, .y = 0.0F, .width = 976.0F, .height = 484.0F}, score, 0U);
|
|
|
|
auto clefs = layout_items(layout, vamp_zero::score_layout_item_role::CLEF, 0U);
|
|
auto keys = layout_items(layout, vamp_zero::score_layout_item_role::KEY_SIGNATURE, 0U);
|
|
auto times = layout_items(layout, vamp_zero::score_layout_item_role::TIME_SIGNATURE, 0U);
|
|
auto staff_lines = layout_items(layout, vamp_zero::score_layout_item_role::STAFF_LINE, 0U);
|
|
BOOST_REQUIRE_EQUAL(clefs.size(), 1U);
|
|
BOOST_REQUIRE(!keys.empty());
|
|
BOOST_REQUIRE(!times.empty());
|
|
BOOST_REQUIRE_GE(staff_lines.size(), 5U);
|
|
|
|
BOOST_TEST(clefs.front()->bounds.x < keys.front()->bounds.x);
|
|
BOOST_TEST(keys.front()->bounds.x < times.front()->bounds.x);
|
|
BOOST_TEST(near(clefs.front()->origin.y, staff_lines.front()->from.y + layout.staff_spacing * 4.0F));
|
|
BOOST_TEST(near(keys.front()->origin.y, staff_lines.front()->from.y + layout.staff_spacing * 2.5F));
|
|
BOOST_REQUIRE_GE(times.size(), 2U);
|
|
BOOST_TEST(near(times[0]->origin.y, staff_lines.front()->from.y + layout.staff_spacing * 2.0F));
|
|
BOOST_TEST(near(times[1]->origin.y, staff_lines.front()->from.y + layout.staff_spacing * 4.0F));
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(score_system_ranges_force_breaks_before_key_changes) {
|
|
auto score = vamp_zero::score_document{
|
|
.title = "Key Change",
|
|
.composer = "Composer",
|
|
.key_signature = "C",
|
|
.time_signature = "4/4",
|
|
.clef = "treble",
|
|
.part = "Lead",
|
|
.measures = {
|
|
{.time_signature = "4/4", .key_signature = "C", .notes = {note({pitch('c', "n")})}},
|
|
{.time_signature = "4/4", .key_signature = "C", .notes = {note({pitch('d', "n")})}},
|
|
{.time_signature = "4/4", .key_signature = "G", .notes = {note({pitch('f', "#")})}},
|
|
{.time_signature = "4/4", .key_signature = "G", .notes = {note({pitch('g', "n")})}},
|
|
},
|
|
};
|
|
|
|
auto ranges = vamp_zero::score_system_ranges(score);
|
|
BOOST_REQUIRE_EQUAL(ranges.size(), 2U);
|
|
BOOST_TEST(ranges[0].first_measure == 0U);
|
|
BOOST_TEST(ranges[0].measure_count == 2U);
|
|
BOOST_TEST(ranges[1].first_measure == 2U);
|
|
BOOST_TEST(ranges[1].measure_count == 2U);
|
|
|
|
auto layout = vamp_zero::layout_score_page({.x = 0.0F, .y = 0.0F, .width = 976.0F, .height = 484.0F}, score, 0U);
|
|
BOOST_REQUIRE(!layout_items(layout, vamp_zero::score_layout_item_role::NOTEHEAD, 1U, 2U, 0U).empty());
|
|
BOOST_TEST(!layout_items(layout, vamp_zero::score_layout_item_role::KEY_SIGNATURE, 1U).empty());
|
|
BOOST_TEST(layout_items(layout, vamp_zero::score_layout_item_role::TIME_SIGNATURE, 1U).empty());
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(score_system_ranges_force_breaks_before_time_changes) {
|
|
auto score = vamp_zero::score_document{
|
|
.title = "Time Change",
|
|
.composer = "Composer",
|
|
.key_signature = "C",
|
|
.time_signature = "4/4",
|
|
.clef = "treble",
|
|
.part = "Lead",
|
|
.measures = {
|
|
{.time_signature = "4/4", .key_signature = "C", .notes = {note({pitch('c', "n")})}},
|
|
{.time_signature = "4/4", .key_signature = "C", .notes = {note({pitch('d', "n")})}},
|
|
{.time_signature = "3/4", .key_signature = "C", .notes = {note({pitch('e', "n")})}},
|
|
},
|
|
};
|
|
|
|
auto ranges = vamp_zero::score_system_ranges(score);
|
|
BOOST_REQUIRE_EQUAL(ranges.size(), 2U);
|
|
BOOST_TEST(ranges[1].first_measure == 2U);
|
|
BOOST_TEST(ranges[1].measure_count == 1U);
|
|
|
|
auto layout = vamp_zero::layout_score_page({.x = 0.0F, .y = 0.0F, .width = 976.0F, .height = 484.0F}, score, 0U);
|
|
BOOST_REQUIRE(!layout_items(layout, vamp_zero::score_layout_item_role::NOTEHEAD, 1U, 2U, 0U).empty());
|
|
BOOST_TEST(!layout_items(layout, vamp_zero::score_layout_item_role::TIME_SIGNATURE, 1U).empty());
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(score_page_count_uses_forced_notation_breaks) {
|
|
auto measures = std::vector<vamp_zero::score_measure>{};
|
|
for (auto index = std::size_t{}; index < 10U; ++index) {
|
|
measures.push_back({
|
|
.time_signature = "4/4",
|
|
.key_signature = (index / 2U) % 2U == 0U ? "C" : "G",
|
|
.notes = {note({pitch('c', "n")})},
|
|
});
|
|
}
|
|
auto score = vamp_zero::score_document{
|
|
.title = "Many Breaks",
|
|
.composer = "Composer",
|
|
.key_signature = "C",
|
|
.time_signature = "4/4",
|
|
.clef = "treble",
|
|
.part = "Lead",
|
|
.measures = std::move(measures),
|
|
};
|
|
|
|
BOOST_TEST(vamp_zero::score_page_count(score) == 2U);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(score_layout_attaches_stems_to_notehead_anchors) {
|
|
auto up_score = score_with_notes({note({pitch('d', "n")})});
|
|
auto up_layout = vamp_zero::layout_score_page({.x = 0.0F, .y = 0.0F, .width = 976.0F, .height = 484.0F}, up_score, 0U);
|
|
auto up_heads = layout_items(up_layout, vamp_zero::score_layout_item_role::NOTEHEAD, 0U, 0U, 0U);
|
|
auto up_stems = layout_items(up_layout, vamp_zero::score_layout_item_role::STEM, 0U, 0U, 0U);
|
|
BOOST_REQUIRE_EQUAL(up_heads.size(), 1U);
|
|
BOOST_REQUIRE_EQUAL(up_stems.size(), 1U);
|
|
expect_up_stem_connected(*up_heads.front(), *up_stems.front(), up_layout.staff_spacing);
|
|
|
|
auto down_score = score_with_notes({note({pitch('c', "n", 6)})});
|
|
auto down_layout = vamp_zero::layout_score_page({.x = 0.0F, .y = 0.0F, .width = 976.0F, .height = 484.0F}, down_score, 0U);
|
|
auto down_heads = layout_items(down_layout, vamp_zero::score_layout_item_role::NOTEHEAD, 0U, 0U, 0U);
|
|
auto down_stems = layout_items(down_layout, vamp_zero::score_layout_item_role::STEM, 0U, 0U, 0U);
|
|
BOOST_REQUIRE_EQUAL(down_heads.size(), 1U);
|
|
BOOST_REQUIRE_EQUAL(down_stems.size(), 1U);
|
|
expect_down_stem_connected(*down_heads.front(), *down_stems.front(), down_layout.staff_spacing);
|
|
|
|
auto half_score = score_with_notes({note_with_ticks({pitch('d', "n")}, 8192)});
|
|
auto half_layout = vamp_zero::layout_score_page({.x = 0.0F, .y = 0.0F, .width = 976.0F, .height = 484.0F}, half_score, 0U);
|
|
auto half_heads = layout_items(half_layout, vamp_zero::score_layout_item_role::NOTEHEAD, 0U, 0U, 0U);
|
|
auto half_stems = layout_items(half_layout, vamp_zero::score_layout_item_role::STEM, 0U, 0U, 0U);
|
|
BOOST_REQUIRE_EQUAL(half_heads.size(), 1U);
|
|
BOOST_REQUIRE_EQUAL(half_stems.size(), 1U);
|
|
expect_up_stem_connected(*half_heads.front(), *half_stems.front(), half_layout.staff_spacing);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(score_layout_displaces_chord_seconds_and_columns_accidentals) {
|
|
auto score = score_with_notes({note({pitch('c', "#"), pitch('d', "#")})});
|
|
auto layout = vamp_zero::layout_score_page({.x = 0.0F, .y = 0.0F, .width = 976.0F, .height = 484.0F}, score, 0U);
|
|
|
|
auto heads = layout_items(layout, vamp_zero::score_layout_item_role::NOTEHEAD, 0U, 0U, 0U);
|
|
auto accidentals = layout_items(layout, vamp_zero::score_layout_item_role::ACCIDENTAL, 0U, 0U, 0U);
|
|
BOOST_REQUIRE_EQUAL(heads.size(), 2U);
|
|
BOOST_REQUIRE_EQUAL(accidentals.size(), 2U);
|
|
|
|
auto const* lower_head = *std::max_element(heads.begin(), heads.end(), [](auto const* left, auto const* right) {
|
|
return center_y(*left) < center_y(*right);
|
|
});
|
|
auto const* upper_head = *std::min_element(heads.begin(), heads.end(), [](auto const* left, auto const* right) {
|
|
return center_y(*left) < center_y(*right);
|
|
});
|
|
BOOST_TEST(center_x(*upper_head) > center_x(*lower_head) + layout.staff_spacing * 0.30F);
|
|
|
|
auto const* leftmost_head = *std::min_element(heads.begin(), heads.end(), [](auto const* left, auto const* right) {
|
|
return left->bounds.x < right->bounds.x;
|
|
});
|
|
auto const* leftmost_accidental = *std::min_element(accidentals.begin(), accidentals.end(), [](auto const* left, auto const* right) {
|
|
return left->bounds.x < right->bounds.x;
|
|
});
|
|
auto const* rightmost_accidental = *std::max_element(accidentals.begin(), accidentals.end(), [](auto const* left, auto const* right) {
|
|
return left->bounds.x < right->bounds.x;
|
|
});
|
|
|
|
for (auto const* accidental : accidentals) {
|
|
BOOST_TEST(accidental->bounds.x + accidental->bounds.width < leftmost_head->bounds.x);
|
|
}
|
|
BOOST_TEST(rightmost_accidental->bounds.x - leftmost_accidental->bounds.x > layout.staff_spacing * 0.50F);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(score_layout_beams_eighth_tuplets_and_labels_them) {
|
|
auto first = note_with_ticks({pitch('c', "n")}, 2048);
|
|
auto second = note_with_ticks({pitch('d', "n")}, 2048);
|
|
auto third = note_with_ticks({pitch('e', "n")}, 2048);
|
|
first.tuplet_id = "triplet-1";
|
|
second.tuplet_id = "triplet-1";
|
|
third.tuplet_id = "triplet-1";
|
|
|
|
auto score = score_with_measure({
|
|
.time_signature = "4/4",
|
|
.key_signature = "C",
|
|
.notes = {std::move(first), std::move(second), std::move(third)},
|
|
.tuplets = {{
|
|
.id = "triplet-1",
|
|
.note_count = 3,
|
|
.space_count = 2,
|
|
}},
|
|
});
|
|
auto layout = vamp_zero::layout_score_page({.x = 0.0F, .y = 0.0F, .width = 976.0F, .height = 484.0F}, score, 0U);
|
|
|
|
auto beams = layout_items(layout, vamp_zero::score_layout_item_role::BEAM, 0U, 0U);
|
|
auto flags = layout_items(layout, vamp_zero::score_layout_item_role::FLAG, 0U, 0U);
|
|
auto tuplets = layout_items(layout, vamp_zero::score_layout_item_role::TUPLET, 0U, 0U);
|
|
BOOST_REQUIRE_EQUAL(beams.size(), 1U);
|
|
BOOST_TEST(flags.empty());
|
|
BOOST_REQUIRE_EQUAL(tuplets.size(), 1U);
|
|
BOOST_TEST(tuplets.front()->text == "3");
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(score_layout_keeps_dense_notation_inside_measure_guard) {
|
|
auto first = note_with_ticks({pitch('c', "#")}, 2048);
|
|
auto second = note_with_ticks({pitch('d', "#")}, 2048);
|
|
auto third = note_with_ticks({pitch('e', "n")}, 6144);
|
|
auto fourth = note_with_ticks({pitch('f', "#")}, 4096);
|
|
auto fifth = note_with_ticks({pitch('g', "#")}, 2048);
|
|
fourth.tie_to_next = true;
|
|
|
|
auto score = score_with_measure({
|
|
.time_signature = "4/4",
|
|
.key_signature = "C",
|
|
.notes = {std::move(first), std::move(second), std::move(third), std::move(fourth), std::move(fifth)},
|
|
});
|
|
auto layout = vamp_zero::layout_score_page({.x = 0.0F, .y = 0.0F, .width = 976.0F, .height = 484.0F}, score, 0U);
|
|
|
|
auto barlines = layout_items(layout, vamp_zero::score_layout_item_role::FINAL_BARLINE, 0U, 0U);
|
|
BOOST_REQUIRE_EQUAL(barlines.size(), 1U);
|
|
auto guarded_right = barlines.front()->from.x - layout.staff_spacing;
|
|
auto roles = {
|
|
vamp_zero::score_layout_item_role::NOTEHEAD,
|
|
vamp_zero::score_layout_item_role::ACCIDENTAL,
|
|
vamp_zero::score_layout_item_role::STEM,
|
|
vamp_zero::score_layout_item_role::FLAG,
|
|
vamp_zero::score_layout_item_role::BEAM,
|
|
vamp_zero::score_layout_item_role::DOT,
|
|
vamp_zero::score_layout_item_role::TIE,
|
|
};
|
|
for (auto role : roles) {
|
|
for (auto const* item : layout_items(layout, role, 0U, 0U)) {
|
|
BOOST_TEST(right_edge(*item) <= guarded_right);
|
|
}
|
|
}
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(score_layout_places_lyrics_below_low_vocal_notation) {
|
|
auto low = note({pitch('c', "n", 3)});
|
|
low.lyric = "low";
|
|
auto score = score_with_notes({std::move(low)});
|
|
auto layout = vamp_zero::layout_score_page({.x = 0.0F, .y = 0.0F, .width = 976.0F, .height = 484.0F}, score, 0U);
|
|
|
|
auto lyrics = layout_items(layout, vamp_zero::score_layout_item_role::LYRIC, 0U, 0U, 0U);
|
|
BOOST_REQUIRE_EQUAL(lyrics.size(), 1U);
|
|
|
|
auto notation_bottom = std::numeric_limits<std::float32_t>::lowest();
|
|
auto roles = {
|
|
vamp_zero::score_layout_item_role::NOTEHEAD,
|
|
vamp_zero::score_layout_item_role::ACCIDENTAL,
|
|
vamp_zero::score_layout_item_role::STEM,
|
|
vamp_zero::score_layout_item_role::FLAG,
|
|
vamp_zero::score_layout_item_role::DOT,
|
|
vamp_zero::score_layout_item_role::STAFF_LINE,
|
|
};
|
|
for (auto role : roles) {
|
|
for (auto const* item : layout_items(layout, role, 0U, 0U, 0U)) {
|
|
notation_bottom = std::max(notation_bottom, bottom_edge(*item));
|
|
}
|
|
}
|
|
|
|
BOOST_TEST(lyrics.front()->bounds.y >= notation_bottom + layout.staff_spacing * 0.70F);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(score_layout_ties_to_the_actual_next_measure_notehead) {
|
|
auto tied = note_with_ticks({pitch('b', "b")}, 16384);
|
|
tied.tie_to_next = true;
|
|
auto target = note_with_ticks({pitch('b', "b")}, 4096);
|
|
target.tie_from_previous = true;
|
|
auto score = score_with_measure({
|
|
.time_signature = "4/4",
|
|
.key_signature = "F",
|
|
.notes = {std::move(tied)},
|
|
}, "F");
|
|
score.measures.push_back({
|
|
.time_signature = "4/4",
|
|
.key_signature = "F",
|
|
.notes = {std::move(target)},
|
|
});
|
|
|
|
auto layout = vamp_zero::layout_score_page({.x = 0.0F, .y = 0.0F, .width = 976.0F, .height = 484.0F}, score, 0U);
|
|
|
|
auto ties = layout_items(layout, vamp_zero::score_layout_item_role::TIE, 0U, 0U, 0U);
|
|
auto start_heads = layout_items(layout, vamp_zero::score_layout_item_role::NOTEHEAD, 0U, 0U, 0U);
|
|
auto target_heads = layout_items(layout, vamp_zero::score_layout_item_role::NOTEHEAD, 0U, 1U, 0U);
|
|
BOOST_REQUIRE_EQUAL(ties.size(), 1U);
|
|
BOOST_REQUIRE_EQUAL(start_heads.size(), 1U);
|
|
BOOST_REQUIRE_EQUAL(target_heads.size(), 1U);
|
|
|
|
BOOST_TEST(ties.front()->from.x > right_edge(*start_heads.front()));
|
|
BOOST_TEST(ties.front()->to.x < target_heads.front()->bounds.x);
|
|
BOOST_TEST(ties.front()->to.x > right_edge(*start_heads.front()));
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(score_layout_draws_tie_continuations_across_system_breaks) {
|
|
auto measures = std::vector<vamp_zero::score_measure>{};
|
|
for (auto index = std::size_t{}; index < 5U; ++index) {
|
|
auto value = note_with_ticks({pitch('a', "n")}, 16384);
|
|
if (index == 3U) {
|
|
value.tie_to_next = true;
|
|
}
|
|
if (index == 4U) {
|
|
value.tie_from_previous = true;
|
|
}
|
|
measures.push_back({
|
|
.time_signature = "4/4",
|
|
.key_signature = "C",
|
|
.notes = {std::move(value)},
|
|
});
|
|
}
|
|
auto score = vamp_zero::score_document{
|
|
.title = "Break Tie",
|
|
.composer = "Composer",
|
|
.key_signature = "C",
|
|
.time_signature = "4/4",
|
|
.clef = "treble",
|
|
.part = "Lead",
|
|
.measures = std::move(measures),
|
|
};
|
|
|
|
auto layout = vamp_zero::layout_score_page({.x = 0.0F, .y = 0.0F, .width = 976.0F, .height = 484.0F}, score, 0U);
|
|
auto outgoing = layout_items(layout, vamp_zero::score_layout_item_role::TIE, 0U, 3U, 0U);
|
|
auto incoming = layout_items(layout, vamp_zero::score_layout_item_role::TIE, 1U, 4U, 0U);
|
|
|
|
BOOST_REQUIRE_EQUAL(outgoing.size(), 1U);
|
|
BOOST_REQUIRE_EQUAL(incoming.size(), 1U);
|
|
BOOST_TEST(outgoing.front()->to.x > outgoing.front()->from.x);
|
|
BOOST_TEST(incoming.front()->to.x > incoming.front()->from.x);
|
|
}
|
|
|
|
BOOST_AUTO_TEST_CASE(score_layout_raises_chord_symbols_above_high_notation) {
|
|
auto high = note({pitch('c', "n", 6)});
|
|
high.chord_symbol = "Cmaj7";
|
|
auto score = score_with_notes({std::move(high)});
|
|
auto layout = vamp_zero::layout_score_page({.x = 0.0F, .y = 0.0F, .width = 976.0F, .height = 484.0F}, score, 0U);
|
|
|
|
auto chords = layout_items(layout, vamp_zero::score_layout_item_role::CHORD_SYMBOL, 0U, 0U);
|
|
BOOST_REQUIRE_EQUAL(chords.size(), 1U);
|
|
auto top_y = std::numeric_limits<std::float32_t>::max();
|
|
auto roles = {
|
|
vamp_zero::score_layout_item_role::NOTEHEAD,
|
|
vamp_zero::score_layout_item_role::ACCIDENTAL,
|
|
vamp_zero::score_layout_item_role::STEM,
|
|
vamp_zero::score_layout_item_role::FLAG,
|
|
vamp_zero::score_layout_item_role::BEAM,
|
|
vamp_zero::score_layout_item_role::DOT,
|
|
vamp_zero::score_layout_item_role::TUPLET,
|
|
vamp_zero::score_layout_item_role::TUPLET_BRACKET,
|
|
vamp_zero::score_layout_item_role::TIE,
|
|
};
|
|
for (auto role : roles) {
|
|
for (auto const* item : layout_items(layout, role, 0U, 0U)) {
|
|
top_y = std::min(top_y, item->bounds.y);
|
|
}
|
|
}
|
|
BOOST_TEST(right_edge(*chords.front()) <= layout.bounds.x + layout.bounds.width);
|
|
BOOST_TEST(chords.front()->bounds.y + chords.front()->bounds.height <= top_y - layout.staff_spacing * 0.40F);
|
|
}
|