[vcpkg] Refactor end-to-end tests (#15081)

* [vcpkg] Refactor end-to-end tests

* [vcpkg] Cherry-pick x-builtin-ports-root from #14999

* [vcpkg] Move create test from unit tests to e2e

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

2 files changed, 4 insertions, 27 deletions

diff --git a/toolsrc/src/vcpkg-test/arguments.cpp b/toolsrc/src/vcpkg-test/arguments.cpp
index 00a1beb81..f5cbf7b15 100644
--- a/toolsrc/src/vcpkg-test/arguments.cpp
+++ b/toolsrc/src/vcpkg-test/arguments.cpp
@@ -14,6 +14,7 @@ TEST_CASE ("VcpkgCmdArguments from lowercase argument sequence", "[arguments]")
     std::vector<std::string> t = {"--vcpkg-root",
                                   "C:\\vcpkg",
                                   "--x-scripts-root=C:\\scripts",
+                                  "--x-builtin-ports-root=C:\\ports",
                                   "--debug",
                                   "--sendmetrics",
                                   "--printmetrics",
@@ -25,6 +26,7 @@ TEST_CASE ("VcpkgCmdArguments from lowercase argument sequence", "[arguments]")
 
     REQUIRE(*v.vcpkg_root_dir == "C:\\vcpkg");
     REQUIRE(*v.scripts_root_dir == "C:\\scripts");
+    REQUIRE(*v.builtin_ports_root_dir == "C:\\ports");
     REQUIRE(v.debug);
     REQUIRE(*v.debug.get());
     REQUIRE(v.send_metrics);
@@ -46,6 +48,7 @@ TEST_CASE ("VcpkgCmdArguments from uppercase argument sequence", "[arguments]")
     std::vector<std::string> t = {"--VCPKG-ROOT",
                                   "C:\\vcpkg",
                                   "--X-SCRIPTS-ROOT=C:\\scripts",
+                                  "--X-BUILTIN-PORTS-ROOT=C:\\ports",
                                   "--DEBUG",
                                   "--SENDMETRICS",
                                   "--PRINTMETRICS",
@@ -57,6 +60,7 @@ TEST_CASE ("VcpkgCmdArguments from uppercase argument sequence", "[arguments]")
 
     REQUIRE(*v.vcpkg_root_dir == "C:\\vcpkg");
     REQUIRE(*v.scripts_root_dir == "C:\\scripts");
+    REQUIRE(*v.builtin_ports_root_dir == "C:\\ports");
     REQUIRE(v.debug);
     REQUIRE(*v.debug.get());
     REQUIRE(v.send_metrics);
diff --git a/toolsrc/src/vcpkg-test/commands.create.cpp b/toolsrc/src/vcpkg-test/commands.create.cpp
deleted file mode 100644
index 8b8dfa230..000000000
--- a/toolsrc/src/vcpkg-test/commands.create.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <catch2/catch.hpp>
-
-#include <vcpkg/base/files.h>
-
-#include <vcpkg/commands.create.h>
-#include <vcpkg/vcpkgcmdarguments.h>
-#include <vcpkg/vcpkgpaths.h>
-
-#include <iterator>
-#include <string>
-
-TEST_CASE ("create smoke test", "[commands-create]")
-{
-    using namespace vcpkg;
-    static const std::string argsRaw[] = {"create", "zlib2", "http://zlib.net/zlib-1.2.11.tar.gz", "zlib-1.2.11.zip"};
-
-    auto& fsWrapper = Files::get_real_filesystem();
-    VcpkgCmdArguments args = VcpkgCmdArguments::create_from_arg_sequence(std::begin(argsRaw), std::end(argsRaw));
-    VcpkgPaths paths(fsWrapper, args);
-    const auto exit_code = Commands::Create::perform(args, paths);
-    REQUIRE(exit_code == 0);
-    const auto expected_port = paths.builtin_ports_directory() / fs::u8path("zlib2");
-    const auto expected_portfile_cmake = expected_port / fs::u8path("portfile.cmake");
-    const auto lines = fsWrapper.read_lines(expected_portfile_cmake);
-    REQUIRE(lines.has_value());
-    fsWrapper.remove_all(expected_port, ignore_errors);
-}