Revert no-longer-necessary test changes now that expected is move-ass…

…ignable.
microsoft · May 25, 2022 · 79b5b65 · 79b5b65
1 parent 2963e03
commit 79b5b65
Show file tree

Hide file tree

Showing 5 changed files with 254 additions and 391 deletions.
diff --git a/src/vcpkg-test/dependencies.cpp b/src/vcpkg-test/dependencies.cpp
@@ -2114,35 +2114,23 @@ TEST_CASE ("respect supports expression", "[versionplan]")
     vp.emplace("a", {"1", 1});
     MockCMakeVarProvider var_provider;
     var_provider.dep_info_vars[{"a", toplevel_spec().triplet()}]["VCPKG_CMAKE_SYSTEM_NAME"] = "";
-
-    {
-        auto install_plan = create_versioned_install_plan(vp, bp, {{"a", {}}}, var_provider);
-        CHECK(install_plan.has_value());
-        var_provider.dep_info_vars[{"a", toplevel_spec().triplet()}]["VCPKG_CMAKE_SYSTEM_NAME"] = "Linux";
-    }
-
-    {
-        auto install_plan = create_versioned_install_plan(vp, bp, {{"a", {}}}, var_provider);
-        CHECK_FALSE(install_plan.has_value());
-    }
-
+    auto install_plan = create_versioned_install_plan(vp, bp, {{"a", {}}}, var_provider);
+    CHECK(install_plan.has_value());
+    var_provider.dep_info_vars[{"a", toplevel_spec().triplet()}]["VCPKG_CMAKE_SYSTEM_NAME"] = "Linux";
+    install_plan = create_versioned_install_plan(vp, bp, {{"a", {}}}, var_provider);
+    CHECK_FALSE(install_plan.has_value());
     SECTION ("override")
     {
         // override from non supported to supported version
         MockOverlayProvider oprovider;
-        {
-            auto install_plan = create_versioned_install_plan(
-                vp, bp, oprovider, var_provider, {Dependency{"a"}}, {DependencyOverride{"a", "1", 1}}, toplevel_spec());
-            CHECK(install_plan.has_value());
-        }
-
+        install_plan = create_versioned_install_plan(
+            vp, bp, oprovider, var_provider, {Dependency{"a"}}, {DependencyOverride{"a", "1", 1}}, toplevel_spec());
+        CHECK(install_plan.has_value());
         // override from supported to non supported version
         bp.v["a"] = {"1", 1};
-        {
-            auto install_plan = create_versioned_install_plan(
-                vp, bp, oprovider, var_provider, {Dependency{"a"}}, {DependencyOverride{"a", "1", 0}}, toplevel_spec());
-            CHECK_FALSE(install_plan.has_value());
-        }
+        install_plan = create_versioned_install_plan(
+            vp, bp, oprovider, var_provider, {Dependency{"a"}}, {DependencyOverride{"a", "1", 0}}, toplevel_spec());
+        CHECK_FALSE(install_plan.has_value());
     }
 }
 
@@ -2164,44 +2152,32 @@ TEST_CASE ("respect supports expressions of features", "[versionplan]")
 
     MockCMakeVarProvider var_provider;
     var_provider.dep_info_vars[{"a", toplevel_spec().triplet()}]["VCPKG_CMAKE_SYSTEM_NAME"] = "";
-    {
-        auto install_plan = create_versioned_install_plan(vp, bp, {{"a", {"x"}}}, var_provider);
-        CHECK(install_plan.has_value());
-    }
-
+    auto install_plan = create_versioned_install_plan(vp, bp, {{"a", {"x"}}}, var_provider);
+    CHECK(install_plan.has_value());
     var_provider.dep_info_vars[{"a", toplevel_spec().triplet()}]["VCPKG_CMAKE_SYSTEM_NAME"] = "Linux";
-
-    {
-        auto install_plan = create_versioned_install_plan(vp, bp, {{"a", {"x"}}}, var_provider);
-        CHECK_FALSE(install_plan.has_value());
-    }
-
+    install_plan = create_versioned_install_plan(vp, bp, {{"a", {"x"}}}, var_provider);
+    CHECK_FALSE(install_plan.has_value());
     SECTION ("override")
     {
         // override from non supported to supported version
         MockOverlayProvider oprovider;
-        {
-            auto install_plan = create_versioned_install_plan(vp,
-                                                              bp,
-                                                              oprovider,
-                                                              var_provider,
-                                                              {Dependency{"a", {"x"}}},
-                                                              {DependencyOverride{"a", "1", 1}},
-                                                              toplevel_spec());
-            CHECK(install_plan.has_value());
-        }
-
+        install_plan = create_versioned_install_plan(vp,
+                                                     bp,
+                                                     oprovider,
+                                                     var_provider,
+                                                     {Dependency{"a", {"x"}}},
+                                                     {DependencyOverride{"a", "1", 1}},
+                                                     toplevel_spec());
+        CHECK(install_plan.has_value());
         // override from supported to non supported version
         bp.v["a"] = {"1", 1};
-        {
-            auto install_plan = create_versioned_install_plan(vp,
-                                                              bp,
-                                                              oprovider,
-                                                              var_provider,
-                                                              {Dependency{"a", {"x"}}},
-                                                              {DependencyOverride{"a", "1", 0}},
-                                                              toplevel_spec());
-            CHECK_FALSE(install_plan.has_value());
-        }
+        install_plan = create_versioned_install_plan(vp,
+                                                     bp,
+                                                     oprovider,
+                                                     var_provider,
+                                                     {Dependency{"a", {"x"}}},
+                                                     {DependencyOverride{"a", "1", 0}},
+                                                     toplevel_spec());
+        CHECK_FALSE(install_plan.has_value());
     }
 }