aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/vcpkg-test
diff options
context:
space:
mode:
Diffstat (limited to 'toolsrc/src/vcpkg-test')
-rw-r--r--toolsrc/src/vcpkg-test/json.cpp43
-rw-r--r--toolsrc/src/vcpkg-test/manifests.cpp78
-rw-r--r--toolsrc/src/vcpkg-test/paragraph.cpp12
3 files changed, 114 insertions, 19 deletions
diff --git a/toolsrc/src/vcpkg-test/json.cpp b/toolsrc/src/vcpkg-test/json.cpp
index 90a3537ab..0b9941861 100644
--- a/toolsrc/src/vcpkg-test/json.cpp
+++ b/toolsrc/src/vcpkg-test/json.cpp
@@ -80,6 +80,49 @@ TEST_CASE ("JSON parse strings", "[json]")
REQUIRE(res.get()->first.string() == grin);
}
+TEST_CASE ("JSON parse strings with escapes", "[json]")
+{
+ auto res = Json::parse(R"("\t")");
+ REQUIRE(res);
+ REQUIRE(res.get()->first.is_string());
+ REQUIRE(res.get()->first.string() == "\t");
+
+ res = Json::parse(R"("\\")");
+ REQUIRE(res);
+ REQUIRE(res.get()->first.is_string());
+ REQUIRE(res.get()->first.string() == "\\");
+
+ res = Json::parse(R"("\/")");
+ REQUIRE(res);
+ REQUIRE(res.get()->first.is_string());
+ REQUIRE(res.get()->first.string() == "/");
+
+ res = Json::parse(R"("\b")");
+ REQUIRE(res);
+ REQUIRE(res.get()->first.is_string());
+ REQUIRE(res.get()->first.string() == "\b");
+
+ res = Json::parse(R"("\f")");
+ REQUIRE(res);
+ REQUIRE(res.get()->first.is_string());
+ REQUIRE(res.get()->first.string() == "\f");
+
+ res = Json::parse(R"("\n")");
+ REQUIRE(res);
+ REQUIRE(res.get()->first.is_string());
+ REQUIRE(res.get()->first.string() == "\n");
+
+ res = Json::parse(R"("\r")");
+ REQUIRE(res);
+ REQUIRE(res.get()->first.is_string());
+ REQUIRE(res.get()->first.string() == "\r");
+
+ res = Json::parse(R"("This is a \"test\", hopefully it worked")");
+ REQUIRE(res);
+ REQUIRE(res.get()->first.is_string());
+ REQUIRE(res.get()->first.string() == R"(This is a "test", hopefully it worked)");
+}
+
TEST_CASE ("JSON parse integers", "[json]")
{
auto res = Json::parse("0");
diff --git a/toolsrc/src/vcpkg-test/manifests.cpp b/toolsrc/src/vcpkg-test/manifests.cpp
index 108b2d0c5..9fc041a19 100644
--- a/toolsrc/src/vcpkg-test/manifests.cpp
+++ b/toolsrc/src/vcpkg-test/manifests.cpp
@@ -68,10 +68,10 @@ TEST_CASE ("manifest construct maximum", "[manifests]")
"name": "iroh",
"description": "zuko's uncle",
"dependencies": [
+ "firebending",
{
"name": "tea"
},
- "firebending",
{
"name": "order.white-lotus",
"features": [ "the-ancient-ways" ],
@@ -105,18 +105,20 @@ TEST_CASE ("manifest construct maximum", "[manifests]")
REQUIRE(pgh.feature_paragraphs[0]->description.size() == 1);
REQUIRE(pgh.feature_paragraphs[0]->description[0] == "zuko's uncle");
REQUIRE(pgh.feature_paragraphs[0]->dependencies.size() == 3);
- REQUIRE(pgh.feature_paragraphs[0]->dependencies[0].name == "tea");
- REQUIRE(pgh.feature_paragraphs[0]->dependencies[1].name == "firebending");
- REQUIRE(pgh.feature_paragraphs[0]->dependencies[2].name == "order.white-lotus");
- REQUIRE(pgh.feature_paragraphs[0]->dependencies[2].features.size() == 1);
- REQUIRE(pgh.feature_paragraphs[0]->dependencies[2].features[0] == "the-ancient-ways");
- REQUIRE_FALSE(pgh.feature_paragraphs[0]->dependencies[2].platform.evaluate(
+ REQUIRE(pgh.feature_paragraphs[0]->dependencies[0].name == "firebending");
+
+ REQUIRE(pgh.feature_paragraphs[0]->dependencies[1].name == "order.white-lotus");
+ REQUIRE(pgh.feature_paragraphs[0]->dependencies[1].features.size() == 1);
+ REQUIRE(pgh.feature_paragraphs[0]->dependencies[1].features[0] == "the-ancient-ways");
+ REQUIRE_FALSE(pgh.feature_paragraphs[0]->dependencies[1].platform.evaluate(
{{"VCPKG_CMAKE_SYSTEM_NAME", ""}, {"VCPKG_TARGET_ARCHITECTURE", "arm"}}));
- REQUIRE(pgh.feature_paragraphs[0]->dependencies[2].platform.evaluate(
+ REQUIRE(pgh.feature_paragraphs[0]->dependencies[1].platform.evaluate(
{{"VCPKG_CMAKE_SYSTEM_NAME", ""}, {"VCPKG_TARGET_ARCHITECTURE", "x86"}}));
- REQUIRE(pgh.feature_paragraphs[0]->dependencies[2].platform.evaluate(
+ REQUIRE(pgh.feature_paragraphs[0]->dependencies[1].platform.evaluate(
{{"VCPKG_CMAKE_SYSTEM_NAME", "Linux"}, {"VCPKG_TARGET_ARCHITECTURE", "x86"}}));
+ REQUIRE(pgh.feature_paragraphs[0]->dependencies[2].name == "tea");
+
REQUIRE(pgh.feature_paragraphs[1]->name == "zuko");
REQUIRE(pgh.feature_paragraphs[1]->description.size() == 2);
REQUIRE(pgh.feature_paragraphs[1]->description[0] == "son of the fire lord");
@@ -134,8 +136,8 @@ TEST_CASE ("SourceParagraph manifest two dependencies", "[manifests]")
auto& pgh = **m_pgh.get();
REQUIRE(pgh.core_paragraph->dependencies.size() == 2);
- REQUIRE(pgh.core_paragraph->dependencies[0].name == "z");
- REQUIRE(pgh.core_paragraph->dependencies[1].name == "openssl");
+ REQUIRE(pgh.core_paragraph->dependencies[0].name == "openssl");
+ REQUIRE(pgh.core_paragraph->dependencies[1].name == "z");
}
TEST_CASE ("SourceParagraph manifest three dependencies", "[manifests]")
@@ -149,9 +151,10 @@ TEST_CASE ("SourceParagraph manifest three dependencies", "[manifests]")
auto& pgh = **m_pgh.get();
REQUIRE(pgh.core_paragraph->dependencies.size() == 3);
- REQUIRE(pgh.core_paragraph->dependencies[0].name == "z");
- REQUIRE(pgh.core_paragraph->dependencies[1].name == "openssl");
- REQUIRE(pgh.core_paragraph->dependencies[2].name == "xyz");
+ // should be ordered
+ REQUIRE(pgh.core_paragraph->dependencies[0].name == "openssl");
+ REQUIRE(pgh.core_paragraph->dependencies[1].name == "xyz");
+ REQUIRE(pgh.core_paragraph->dependencies[2].name == "z");
}
TEST_CASE ("SourceParagraph manifest construct qualified dependencies", "[manifests]")
@@ -239,3 +242,50 @@ TEST_CASE ("SourceParagraph manifest empty supports", "[manifests]")
true);
REQUIRE_FALSE(m_pgh.has_value());
}
+
+TEST_CASE ("Serialize all the ports", "[manifests]")
+{
+ std::vector<std::string> args_list = {"x-format-manifest"};
+ auto& fs = Files::get_real_filesystem();
+ auto args = VcpkgCmdArguments::create_from_arg_sequence(args_list.data(), args_list.data() + args_list.size());
+ auto paths = VcpkgPaths{fs, args};
+
+ std::vector<SourceControlFile> scfs;
+
+ for (auto dir : fs::directory_iterator(paths.ports))
+ {
+ const auto control = dir / fs::u8path("CONTROL");
+ const auto manifest = dir / fs::u8path("vcpkg.json");
+ if (fs.exists(control))
+ {
+ auto contents = fs.read_contents(control, VCPKG_LINE_INFO);
+ auto pghs = Paragraphs::parse_paragraphs(contents, control.u8string());
+ REQUIRE(pghs);
+
+ scfs.push_back(std::move(
+ *SourceControlFile::parse_control_file(control, std::move(pghs).value_or_exit(VCPKG_LINE_INFO))
+ .value_or_exit(VCPKG_LINE_INFO)));
+ }
+ else if (fs.exists(manifest))
+ {
+ std::error_code ec;
+ auto contents = Json::parse_file(fs, manifest, ec);
+ REQUIRE_FALSE(ec);
+ REQUIRE(contents);
+
+ auto scf = SourceControlFile::parse_manifest_file(manifest,
+ contents.value_or_exit(VCPKG_LINE_INFO).first.object());
+ REQUIRE(scf);
+
+ scfs.push_back(std::move(*scf.value_or_exit(VCPKG_LINE_INFO)));
+ }
+ }
+
+ for (auto& scf : scfs)
+ {
+ auto serialized = serialize_manifest(scf);
+ auto serialized_scf = SourceControlFile::parse_manifest_file({}, serialized).value_or_exit(VCPKG_LINE_INFO);
+
+ REQUIRE(*serialized_scf == scf);
+ }
+}
diff --git a/toolsrc/src/vcpkg-test/paragraph.cpp b/toolsrc/src/vcpkg-test/paragraph.cpp
index 2638a3900..05ba8cfba 100644
--- a/toolsrc/src/vcpkg-test/paragraph.cpp
+++ b/toolsrc/src/vcpkg-test/paragraph.cpp
@@ -87,8 +87,9 @@ TEST_CASE ("SourceParagraph two dependencies", "[paragraph]")
auto& pgh = **m_pgh.get();
REQUIRE(pgh.core_paragraph->dependencies.size() == 2);
- REQUIRE(pgh.core_paragraph->dependencies[0].name == "z");
- REQUIRE(pgh.core_paragraph->dependencies[1].name == "openssl");
+ // should be ordered
+ REQUIRE(pgh.core_paragraph->dependencies[0].name == "openssl");
+ REQUIRE(pgh.core_paragraph->dependencies[1].name == "z");
}
TEST_CASE ("SourceParagraph three dependencies", "[paragraph]")
@@ -102,9 +103,10 @@ TEST_CASE ("SourceParagraph three dependencies", "[paragraph]")
auto& pgh = **m_pgh.get();
REQUIRE(pgh.core_paragraph->dependencies.size() == 3);
- REQUIRE(pgh.core_paragraph->dependencies[0].name == "z");
- REQUIRE(pgh.core_paragraph->dependencies[1].name == "openssl");
- REQUIRE(pgh.core_paragraph->dependencies[2].name == "xyz");
+ // should be ordered
+ REQUIRE(pgh.core_paragraph->dependencies[0].name == "openssl");
+ REQUIRE(pgh.core_paragraph->dependencies[1].name == "xyz");
+ REQUIRE(pgh.core_paragraph->dependencies[2].name == "z");
}
TEST_CASE ("SourceParagraph construct qualified dependencies", "[paragraph]")
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-24 01:31:21 +0000