Use an std::map for Configuration::Lock entries too (#624)

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

src/configuration/include/sourcemeta/blaze/configuration.h

@@ -83,8 +83,8 @@ struct SOURCEMETA_BLAZE_CONFIGURATION_EXPORT Configuration {
       };
     };
 
-    using const_iterator = std::unordered_map<sourcemeta::core::JSON::String,
-                                              Entry>::const_iterator;
+    using const_iterator =
+        std::map<sourcemeta::core::JSON::String, Entry>::const_iterator;
 
     auto
     emplace(const sourcemeta::core::JSON::String &uri,
@@ -109,7 +109,8 @@ struct SOURCEMETA_BLAZE_CONFIGURATION_EXPORT Configuration {
     auto to_json() const -> sourcemeta::core::JSON;
 
   private:
-    std::unordered_map<sourcemeta::core::JSON::String, Entry> entries_;
+    // Ordered to guarantee deterministic iteration
+    std::map<sourcemeta::core::JSON::String, Entry> entries_;
   };
 
   /// An event emitted during dependency fetching

test/configuration/configuration_fetch_frozen_test.cc

@@ -1289,64 +1289,12 @@ TEST(Configuration_fetch_frozen, multiple_orphaned_entries) {
       true);
 
   EXPECT_EQ(events.size(), 3);
-  if (events[0].uri == "https://example.com/orphaned1.json") {
-    EXPECT_FETCH_EVENT(events[0], Orphaned,
-                       "https://example.com/orphaned1.json", "orphaned1.json",
-                       0, 0, "");
-    if (events[1].uri == "https://example.com/orphaned2.json") {
-      EXPECT_FETCH_EVENT(events[1], Orphaned,
-                         "https://example.com/orphaned2.json", "orphaned2.json",
-                         0, 0, "");
-      EXPECT_FETCH_EVENT(events[2], Orphaned,
-                         "https://example.com/orphaned3.json", "orphaned3.json",
-                         0, 0, "");
-    } else {
-      EXPECT_FETCH_EVENT(events[1], Orphaned,
-                         "https://example.com/orphaned3.json", "orphaned3.json",
-                         0, 0, "");
-      EXPECT_FETCH_EVENT(events[2], Orphaned,
-                         "https://example.com/orphaned2.json", "orphaned2.json",
-                         0, 0, "");
-    }
-  } else if (events[0].uri == "https://example.com/orphaned2.json") {
-    EXPECT_FETCH_EVENT(events[0], Orphaned,
-                       "https://example.com/orphaned2.json", "orphaned2.json",
-                       0, 0, "");
-    if (events[1].uri == "https://example.com/orphaned1.json") {
-      EXPECT_FETCH_EVENT(events[1], Orphaned,
-                         "https://example.com/orphaned1.json", "orphaned1.json",
-                         0, 0, "");
-      EXPECT_FETCH_EVENT(events[2], Orphaned,
-                         "https://example.com/orphaned3.json", "orphaned3.json",
-                         0, 0, "");
-    } else {
-      EXPECT_FETCH_EVENT(events[1], Orphaned,
-                         "https://example.com/orphaned3.json", "orphaned3.json",
-                         0, 0, "");
-      EXPECT_FETCH_EVENT(events[2], Orphaned,
-                         "https://example.com/orphaned1.json", "orphaned1.json",
-                         0, 0, "");
-    }
-  } else {
-    EXPECT_FETCH_EVENT(events[0], Orphaned,
-                       "https://example.com/orphaned3.json", "orphaned3.json",
-                       0, 0, "");
-    if (events[1].uri == "https://example.com/orphaned1.json") {
-      EXPECT_FETCH_EVENT(events[1], Orphaned,
-                         "https://example.com/orphaned1.json", "orphaned1.json",
-                         0, 0, "");
-      EXPECT_FETCH_EVENT(events[2], Orphaned,
-                         "https://example.com/orphaned2.json", "orphaned2.json",
-                         0, 0, "");
-    } else {
-      EXPECT_FETCH_EVENT(events[1], Orphaned,
-                         "https://example.com/orphaned2.json", "orphaned2.json",
-                         0, 0, "");
-      EXPECT_FETCH_EVENT(events[2], Orphaned,
-                         "https://example.com/orphaned1.json", "orphaned1.json",
-                         0, 0, "");
-    }
-  }
+  EXPECT_FETCH_EVENT(events[0], Orphaned, "https://example.com/orphaned1.json",
+                     "orphaned1.json", 0, 0, "");
+  EXPECT_FETCH_EVENT(events[1], Orphaned, "https://example.com/orphaned2.json",
+                     "orphaned2.json", 0, 0, "");
+  EXPECT_FETCH_EVENT(events[2], Orphaned, "https://example.com/orphaned3.json",
+                     "orphaned3.json", 0, 0, "");
 }
 
 TEST(Configuration_fetch_frozen, resolver_returns_nullopt_during_bundle) {