From 7977ad764446e9eef6f4780f0c5949b565ad4093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1n=20Ondru=C5=A1ek?= <ondrusek@fb.com>
Date: Thu, 23 Mar 2023 16:39:32 -0700
Subject: [PATCH] fix on() tag_invoke overload

- arguments in the concept were swapped
- add a regression test
---
 include/unifex/on.hpp |  2 +-
 test/on_test.cpp      | 81 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 test/on_test.cpp

diff --git a/include/unifex/on.hpp b/include/unifex/on.hpp
index fbad1216a..8a7415bb4 100644
--- a/include/unifex/on.hpp
+++ b/include/unifex/on.hpp
@@ -31,7 +31,7 @@ namespace _on {
   inline const struct _fn {
     template(typename Scheduler, typename Sender)
         (requires sender<Sender> AND scheduler<Scheduler> AND //
-          tag_invocable<_fn, Sender, Scheduler>)
+          tag_invocable<_fn, Scheduler, Sender>)
     auto operator()(Scheduler&& scheduler, Sender&& sender) const
         noexcept(is_nothrow_tag_invocable_v<_fn, Scheduler, Sender>)
         -> tag_invoke_result_t<_fn, Scheduler, Sender> {
diff --git a/test/on_test.cpp b/test/on_test.cpp
new file mode 100644
index 000000000..1364ffa5c
--- /dev/null
+++ b/test/on_test.cpp
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * Licensed under the Apache License Version 2.0 with LLVM Exceptions
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *   https://llvm.org/LICENSE.txt
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <unifex/just.hpp>
+#include <unifex/just_from.hpp>
+#include <unifex/on.hpp>
+#include <unifex/single_thread_context.hpp>
+#include <unifex/sync_wait.hpp>
+
+#include <gtest/gtest.h>
+#include <thread>
+
+using namespace unifex;
+
+namespace {
+struct Customized {
+  std::thread::id id2 = std::this_thread::get_id();
+  template <
+      template <typename...>
+      class Variant,
+      template <typename...>
+      class Tuple>
+  using value_types = Variant<Tuple<>>;
+
+  template <template <typename...> class Variant>
+  using error_types = Variant<>;
+
+  static constexpr bool sends_done = true;
+
+  struct op {};
+
+  template <typename Receiver>
+  op connect(Receiver&&) & {
+    return op{};
+  }
+
+  template <typename Scheduler>
+  friend auto tag_invoke(tag_t<on>, Scheduler&& scheduler, Customized& self) {
+    return on(static_cast<Scheduler&&>(scheduler), just_from([&self] {
+                self.id2 = std::this_thread::get_id();
+              }));
+  }
+};
+}  // namespace
+
+TEST(On, Smoke) {
+  auto id1 = std::this_thread::get_id();
+  auto id2 = std::this_thread::get_id();
+
+  single_thread_context thread;
+
+  auto result = sync_wait(on(thread.get_scheduler(), just_from([&id2] {
+                               id2 = std::this_thread::get_id();
+                             })));
+  EXPECT_NE(id1, id2);
+  EXPECT_EQ(id2, thread.get_thread_id());
+  EXPECT_TRUE(result.has_value());
+}
+
+TEST(On, Tag) {
+  auto id1 = std::this_thread::get_id();
+
+  single_thread_context thread;
+  Customized c;
+  auto result = sync_wait(on(thread.get_scheduler(), c));
+  EXPECT_NE(id1, c.id2);
+  EXPECT_EQ(c.id2, thread.get_thread_id());
+  EXPECT_TRUE(result.has_value());
+}