Skip to content

Commit

Permalink
Update tests to take new remote name
Browse files Browse the repository at this point in the history
  • Loading branch information
@patmaddox
patmaddox committed Oct 21, 2022
1 parent d155e1d commit 9ec6bbd
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 38 deletions.
12 changes: 6 additions & 6 deletions test/index.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ TEST_CASE("future version", M) {
TEST_CASE("add a category", M) {
Index ri("a");
Category *cat = new Category("a", &ri);
Package *pack = new Package(Package::ScriptType, "name", cat);
Package *pack = new Package(Package::ScriptType, "name", cat, "remote");
Version *ver = new Version("1", pack);
Source *source = new Source({}, "google.com", ver);

Expand Down Expand Up @@ -134,7 +134,7 @@ TEST_CASE("drop empty category", M) {
TEST_CASE("add a package", M) {
Index ri("a");
Category cat("a", &ri);
Package *pack = new Package(Package::ScriptType, "name", &cat);
Package *pack = new Package(Package::ScriptType, "name", &cat, "remote");
Version *ver = new Version("1", pack);
ver->addSource(new Source({}, "google.com", ver));
pack->addVersion(ver);
Expand All @@ -151,7 +151,7 @@ TEST_CASE("add a package", M) {

TEST_CASE("add owned package", M) {
Category cat1("a", nullptr);
Package *pack = new Package(Package::ScriptType, "name", &cat1);
Package *pack = new Package(Package::ScriptType, "name", &cat1, "remote");

try {
Category cat2("b", nullptr);
Expand All @@ -166,14 +166,14 @@ TEST_CASE("add owned package", M) {

TEST_CASE("drop empty package", M) {
Category cat("a", nullptr);
const Package pkg(Package::ScriptType, "name", &cat);
const Package pkg(Package::ScriptType, "name", &cat, "remote");
REQUIRE_FALSE(cat.addPackage(&pkg));
REQUIRE(cat.packages().empty());
}

TEST_CASE("drop unknown package", M) {
Category cat("a", nullptr);
const Package pkg(Package::UnknownType, "name", &cat);
const Package pkg(Package::UnknownType, "name", &cat, "remote");
REQUIRE_FALSE(cat.addPackage(&pkg));
REQUIRE(cat.packages().size() == 0);
}
Expand Down Expand Up @@ -217,7 +217,7 @@ TEST_CASE("set index name", M) {
TEST_CASE("find package", M) {
Index ri("index name");
Category *cat = new Category("cat", &ri);
Package *pack = new Package(Package::ScriptType, "pkg", cat);
Package *pack = new Package(Package::ScriptType, "pkg", cat, "remote");
Version *ver = new Version("1", pack);
Source *source = new Source({}, "google.com", ver);

Expand Down
28 changes: 14 additions & 14 deletions test/package.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ TEST_CASE("package type to string", M) {
TEST_CASE("invalid package name", M) {
SECTION("empty") {
try {
Package pack(Package::ScriptType, {}, nullptr);
Package pack(Package::ScriptType, {}, nullptr, "remote");
FAIL();
}
catch(const reapack_error &e) {
Expand All @@ -60,7 +60,7 @@ TEST_CASE("invalid package name", M) {

SECTION("slash") {
try {
Package pack(Package::ScriptType, "hello/world", nullptr);
Package pack(Package::ScriptType, "hello/world", nullptr, "remote");
FAIL();
}
catch(const reapack_error &e) {
Expand All @@ -70,7 +70,7 @@ TEST_CASE("invalid package name", M) {

SECTION("backslash") {
try {
Package pack(Package::ScriptType, "hello\\world", nullptr);
Package pack(Package::ScriptType, "hello\\world", nullptr, "remote");
FAIL();
}
catch(const reapack_error &e) {
Expand All @@ -83,7 +83,7 @@ TEST_CASE("package versions are sorted", M) {
Index ri("Remote Name");
Category cat("Category Name", &ri);

Package pack(Package::ScriptType, "a", &cat);
Package pack(Package::ScriptType, "a", &cat, "remote");
CHECK(pack.versions().size() == 0);

Version *final = new Version("1", &pack);
Expand All @@ -107,7 +107,7 @@ TEST_CASE("package versions are sorted", M) {
TEST_CASE("get latest stable version", M) {
Index ri("Remote Name");
Category cat("Category Name", &ri);
Package pack(Package::ScriptType, "a", &cat);
Package pack(Package::ScriptType, "a", &cat, "remote");

Version *alpha = new Version("2.0-alpha", &pack);
alpha->addSource(new Source({}, "google.com", alpha));
Expand All @@ -131,7 +131,7 @@ TEST_CASE("get latest stable version", M) {
TEST_CASE("pre-release updates", M) {
Index ri("Remote Name");
Category cat("Category Name", &ri);
Package pack(Package::ScriptType, "a", &cat);
Package pack(Package::ScriptType, "a", &cat, "remote");

Version *stable1 = new Version("0.9", &pack);
stable1->addSource(new Source({}, "google.com", stable1));
Expand Down Expand Up @@ -166,16 +166,16 @@ TEST_CASE("pre-release updates", M) {
}

TEST_CASE("drop empty version", M) {
Package pack(Package::ScriptType, "a", nullptr);
Package pack(Package::ScriptType, "a", nullptr, "remote");
const Version ver("1", &pack);
REQUIRE_FALSE(pack.addVersion(&ver));
REQUIRE(pack.versions().empty());
REQUIRE(pack.lastVersion() == nullptr);
}

TEST_CASE("add owned version", M) {
Package pack1(Package::ScriptType, "a", nullptr);
Package pack2(Package::ScriptType, "a", nullptr);
Package pack1(Package::ScriptType, "a", nullptr, "remote");
Package pack2(Package::ScriptType, "a", nullptr, "remote");

Version *ver = new Version("1", &pack1);

Expand All @@ -192,7 +192,7 @@ TEST_CASE("add owned version", M) {
TEST_CASE("add duplicate version", M) {
Index ri("r");
Category cat("c", &ri);
Package pack(Package::ScriptType, "p", &cat);
Package pack(Package::ScriptType, "p", &cat, "remote");

Version *ver = new Version("1", &pack);
ver->addSource(new Source({}, "google.com", ver));
Expand All @@ -211,7 +211,7 @@ TEST_CASE("find matching version", M) {
Index ri("Remote Name");
Category cat("Category Name", &ri);

Package pack(Package::ScriptType, "a", &cat);
Package pack(Package::ScriptType, "a", &cat, "remote");
CHECK(pack.versions().size() == 0);

Version *ver = new Version("1", &pack);
Expand All @@ -229,7 +229,7 @@ TEST_CASE("find matching version", M) {
TEST_CASE("package full name", M) {
const Index ri("Index Name");
const Category cat("Category Name", &ri);
Package pack(Package::ScriptType, "file.name", &cat);
Package pack(Package::ScriptType, "file.name", &cat, "remote");

REQUIRE(pack.fullName() == "Index Name/Category Name/file.name");

Expand All @@ -238,15 +238,15 @@ TEST_CASE("package full name", M) {
}

TEST_CASE("package description", M) {
Package pack(Package::ScriptType, "test.lua", nullptr);
Package pack(Package::ScriptType, "test.lua", nullptr, "remote");
REQUIRE(pack.description().empty());

pack.setDescription("hello world");
REQUIRE(pack.description() == "hello world");
}

TEST_CASE("package display name", M) {
Package pack(Package::ScriptType, "test.lua", nullptr);
Package pack(Package::ScriptType, "test.lua", nullptr, "remote");
REQUIRE(pack.displayName() == "test.lua");

pack.setDescription("hello world");
Expand Down
16 changes: 8 additions & 8 deletions test/receipt.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ TEST_CASE("non-empty receipt", M) {
SECTION("install") {
IndexPtr ri = std::make_shared<Index>("Index Name");
Category cat("Category Name", ri.get());
Package pkg(Package::ScriptType, "Package Name", &cat);
Package pkg(Package::ScriptType, "Package Name", &cat, "remote");
Version ver("1.0", &pkg);
r.addInstall(&ver, {});
}
Expand All @@ -41,7 +41,7 @@ TEST_CASE("set receipt flags", M) {
SECTION("install") {
IndexPtr ri = std::make_shared<Index>("Index Name");
Category cat("Category Name", ri.get());
Package pkg(Package::ScriptType, "Package Name", &cat);
Package pkg(Package::ScriptType, "Package Name", &cat, "remote");
Version ver("1.0", &pkg);
r.addInstall(&ver, {});

Expand Down Expand Up @@ -77,8 +77,8 @@ TEST_CASE("set receipt flags", M) {
TEST_CASE("set restart needed flag", M) {
IndexPtr ri = std::make_shared<Index>("Index Name");
Category cat("Category Name", ri.get());
Package script(Package::ScriptType, "Package Name", &cat);
Package ext(Package::ExtensionType, "Package Name", &cat);
Package script(Package::ScriptType, "Package Name", &cat, "remote");
Package ext(Package::ExtensionType, "Package Name", &cat, "remote");
Version scriptVer("1.0", &script);
Version extVer("1.0", &ext);

Expand Down Expand Up @@ -147,7 +147,7 @@ TEST_CASE("format receipt page contents", M) {
TEST_CASE("format install ticket", M) {
IndexPtr ri = std::make_shared<Index>("Index Name");
Category cat("Category Name", ri.get());
Package pkg(Package::ScriptType, "Package Name", &cat);
Package pkg(Package::ScriptType, "Package Name", &cat, "remote");

Version *v1 = new Version("1.0", &pkg);
v1->addSource(new Source({}, "https://google.com", v1));
Expand Down Expand Up @@ -207,13 +207,13 @@ TEST_CASE("format install ticket", M) {
TEST_CASE("sort InstallTickets (case insensitive)", M) {
IndexPtr ri = std::make_shared<Index>("Index Name");
Category cat("Category Name", ri.get());
Package pkg1(Package::ScriptType, "a test", &cat);
Package pkg1(Package::ScriptType, "a test", &cat, "remote");
Version ver1("1.0", &pkg1);

Package pkg2(Package::ScriptType, "Uppercase Name", &cat);
Package pkg2(Package::ScriptType, "Uppercase Name", &cat, "remote");
Version ver2("1.0", &pkg2);

Package pkg3(Package::ScriptType, "unused name", &cat);
Package pkg3(Package::ScriptType, "unused name", &cat, "remote");
pkg3.setDescription("z is the last letter");
Version ver3("1.0", &pkg3);

Expand Down
6 changes: 3 additions & 3 deletions test/registry.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ static const char *M = "[registry]";
#define MAKE_PACKAGE \
Index ri("Remote Name"); \
Category cat("Category Name", &ri); \
Package pkg(Package::ScriptType, "Hello", &cat); \
Package pkg(Package::ScriptType, "Hello", &cat, "remote"); \
pkg.setDescription("Hello World"); \
Version ver("1.0", &pkg); \
ver.setAuthor("John Doe"); \
Expand Down Expand Up @@ -77,7 +77,7 @@ TEST_CASE("bump version", M) {
REQUIRE(entry2.version.toString() == "2.0");
CHECK(entry2.author == "");
REQUIRE(entry2.flags == 2);

REQUIRE(entry2.id == entry1.id);
}

Expand Down Expand Up @@ -137,7 +137,7 @@ TEST_CASE("file conflicts", M) {

Index ri("Remote Name");
Category cat("Category Name", &ri);
Package pkg(Package::ScriptType, "Duplicate Package", &cat);
Package pkg(Package::ScriptType, "Duplicate Package", &cat, "remote");
Version ver("1.0", &pkg);
Source *src1 = new Source("file", "url", &ver);
ver.addSource(src1);
Expand Down
12 changes: 6 additions & 6 deletions test/source.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ static const char *M = "[source]";
#define MAKE_VERSION \
Index ri("Index Name"); \
Category cat("Category Name", &ri); \
Package pkg(Package::DataType, "Package Name", &cat); \
Package pkg(Package::DataType, "Package Name", &cat, "remote"); \
Version ver("1.0", &pkg);

TEST_CASE("source platform", M) {
Expand Down Expand Up @@ -97,7 +97,7 @@ TEST_CASE("implicit section detection from source (v1.0 compatibility)") {

SECTION("main") {
Category cat("Category Name", &ri);
Package pack(Package::ScriptType, "package name", &cat);
Package pack(Package::ScriptType, "package name", &cat, "remote");
Version ver("1.0", &pack);

Source source("filename", "url", &ver);
Expand All @@ -107,7 +107,7 @@ TEST_CASE("implicit section detection from source (v1.0 compatibility)") {

SECTION("midi editor") {
Category cat("MIDI Editor", &ri);
Package pack(Package::ScriptType, "package name", &cat);
Package pack(Package::ScriptType, "package name", &cat, "remote");
Version ver("1.0", &pack);

Source source("filename", "url", &ver);
Expand Down Expand Up @@ -154,7 +154,7 @@ TEST_CASE("source target path", M) {
TEST_CASE("target path with parent directory traversal", M) {
Index ri("Index Name");
Category cat("Category Name", &ri);
Package pack(Package::ScriptType, "package name", &cat);
Package pack(Package::ScriptType, "package name", &cat, "remote");
Version ver("1.0", &pack);
Source source("../../../file.name", "url", &ver);

Expand All @@ -180,7 +180,7 @@ TEST_CASE("target path with parent directory traversal", M) {
TEST_CASE("target path for unknown package type", M) {
Index ri("name");
Category cat("name", &ri);
Package pack(Package::UnknownType, "a", &cat);
Package pack(Package::UnknownType, "a", &cat, "remote");
Version ver("1.0", &pack);
Source src({}, "url", &ver);

Expand All @@ -190,7 +190,7 @@ TEST_CASE("target path for unknown package type", M) {
TEST_CASE("directory traversal in category name", M) {
Index ri("Remote Name");
Category cat("../..", &ri);
Package pack(Package::ScriptType, "file.name", &cat);
Package pack(Package::ScriptType, "file.name", &cat, "remote");
Version ver("1.0", &pack);
Source src({}, "url", &ver);

Expand Down
2 changes: 1 addition & 1 deletion test/version.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#define MAKE_PACKAGE \
Index ri("Index Name"); \
Category cat("Category Name", &ri); \
Package pkg(Package::ScriptType, "Package Name", &cat); \
Package pkg(Package::ScriptType, "Package Name", &cat, "remote"); \

static const char *M = "[version]";

Expand Down

0 comments on commit 9ec6bbd

Please sign in to comment.