From 7af9b60d49f70624f80bf2e54f399bb37cb94927 Mon Sep 17 00:00:00 2001
From: Hannes Vogt <hannes@havogt.de>
Date: Thu, 4 Aug 2022 08:50:47 +0000
Subject: [PATCH 1/2] Fix get_keys of empty hymap

---
 include/gridtools/common/hymap.hpp     |  1 +
 tests/unit_tests/common/test_hymap.cpp | 29 +++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/include/gridtools/common/hymap.hpp b/include/gridtools/common/hymap.hpp
index f410874d9..6ea750a18 100644
--- a/include/gridtools/common/hymap.hpp
+++ b/include/gridtools/common/hymap.hpp
@@ -256,6 +256,7 @@ namespace gridtools {
         template <>
         struct keys<>::values<> {
             friend values tuple_getter(values const &) { return {}; }
+            friend keys hymap_get_keys(values const &) { return {}; }
         };
 
         template <class HyMap>
diff --git a/tests/unit_tests/common/test_hymap.cpp b/tests/unit_tests/common/test_hymap.cpp
index 0775dcc05..b2f6966b0 100644
--- a/tests/unit_tests/common/test_hymap.cpp
+++ b/tests/unit_tests/common/test_hymap.cpp
@@ -15,6 +15,7 @@
 
 #include <gtest/gtest.h>
 
+#include <gridtools/common/integral_constant.hpp>
 #include <gridtools/common/tuple_util.hpp>
 #include <gridtools/meta.hpp>
 
@@ -32,6 +33,13 @@ namespace gridtools {
         static_assert(is_hymap<hymap::keys<a>::values<int>>::value);
         static_assert(is_hymap<hymap::keys<a, b>::values<int, double>>::value);
 
+        static_assert(std::is_same_v<get_keys<std::array<int, 2>>,
+            meta::list<integral_constant<int, 0>, integral_constant<int, 1>>>);
+        static_assert(std::is_same_v<get_keys<tuple<int, double>>,
+            meta::list<integral_constant<int, 0>, integral_constant<int, 1>>>);
+        static_assert(std::is_same_v<get_keys<hymap::keys<>::values<>>, hymap::keys<>>);
+        static_assert(std::is_same_v<get_keys<hymap::keys<a>::values<int>>, hymap::keys<a>>);
+
         TEST(tuple_like, smoke) {
             using testee_t = hymap::keys<a, b, c>::values<int, double, void *>;
 
@@ -188,7 +196,26 @@ namespace gridtools {
             EXPECT_EQ(16, at_key<c>(testee));
         }
 
-        TEST(assingment, smoke) {
+        TEST(concat, smoke) {
+            auto m1 = hymap::keys<a, b>::make_values(1, 2);
+            auto m2 = hymap::keys<c>::make_values(3.5);
+            auto testee = hymap::concat(m1, m2);
+
+            EXPECT_EQ(1, at_key<a>(testee));
+            EXPECT_EQ(2, at_key<b>(testee));
+            EXPECT_EQ(3.5, at_key<c>(testee));
+        }
+
+        TEST(concat, empty) {
+            auto m1 = hymap::keys<>::make_values();
+            auto m2 = hymap::keys<a>::make_values(42);
+
+            auto testee = hymap::concat(m1, m2);
+
+            EXPECT_EQ(42, at_key<a>(testee));
+        }
+
+        TEST(assignment, smoke) {
             hymap::keys<a, b>::values<double, double> testee;
             auto src = hymap::keys<b, a, c>::make_values(88, 3.5, 16);
             testee = src;

From e2f9345c73f43e2eed8eab6c08614c73619afa56 Mon Sep 17 00:00:00 2001
From: Hannes Vogt <hannes@havogt.de>
Date: Thu, 4 Aug 2022 08:52:23 +0000
Subject: [PATCH 2/2] remove an empty line

---
 tests/unit_tests/common/test_hymap.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit_tests/common/test_hymap.cpp b/tests/unit_tests/common/test_hymap.cpp
index b2f6966b0..f117e169b 100644
--- a/tests/unit_tests/common/test_hymap.cpp
+++ b/tests/unit_tests/common/test_hymap.cpp
@@ -209,7 +209,6 @@ namespace gridtools {
         TEST(concat, empty) {
             auto m1 = hymap::keys<>::make_values();
             auto m2 = hymap::keys<a>::make_values(42);
-
             auto testee = hymap::concat(m1, m2);
 
             EXPECT_EQ(42, at_key<a>(testee));