From dbcd179788a4cce4e9e3ae545e736148438c5c6f Mon Sep 17 00:00:00 2001 From: Konstantin Varlamov Date: Tue, 8 May 2018 19:37:20 -0400 Subject: Firestore C++: compile ExecutorLibdispatch in Objective-C++ mode (#1237) dispatch_queue_t is defined differently in libdispatch depending on whether the library header is being include from Objective-C (or Objective-C++) code, or else from C or C++ code. Make sure that all source files in Firestore that include executor_libdispatch.h are compiled in the same mode (Objective-C++) to avoid linker errors. --- .../test/firebase/firestore/util/CMakeLists.txt | 6 +- .../firestore/util/async_queue_libdispatch_test.mm | 87 ++++++++++++++++++++++ .../firestore/util/async_queue_std_test.cc | 41 ++++++++++ .../firestore/util/async_queue_test_libdispatch.cc | 86 --------------------- .../firestore/util/async_queue_test_std.cc | 41 ---------- .../firestore/util/executor_libdispatch_test.cc | 43 ----------- .../firestore/util/executor_libdispatch_test.mm | 43 +++++++++++ 7 files changed, 174 insertions(+), 173 deletions(-) create mode 100644 Firestore/core/test/firebase/firestore/util/async_queue_libdispatch_test.mm create mode 100644 Firestore/core/test/firebase/firestore/util/async_queue_std_test.cc delete mode 100644 Firestore/core/test/firebase/firestore/util/async_queue_test_libdispatch.cc delete mode 100644 Firestore/core/test/firebase/firestore/util/async_queue_test_std.cc delete mode 100644 Firestore/core/test/firebase/firestore/util/executor_libdispatch_test.cc create mode 100644 Firestore/core/test/firebase/firestore/util/executor_libdispatch_test.mm (limited to 'Firestore/core/test') diff --git a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt index 2e1e2f9..ea80ea2 100644 --- a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt +++ b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt @@ -80,7 +80,7 @@ if(HAVE_LIBDISPATCH) SOURCES executor_test.h executor_test.cc - executor_libdispatch_test.cc + executor_libdispatch_test.mm async_tests_util.h DEPENDS firebase_firestore_util_executor_libdispatch @@ -94,7 +94,7 @@ cc_test( SOURCES async_queue_test.h async_queue_test.cc - async_queue_test_std.cc + async_queue_std_test.cc async_tests_util.h DEPENDS firebase_firestore_util_executor_std @@ -107,7 +107,7 @@ if(HAVE_LIBDISPATCH) SOURCES async_queue_test.h async_queue_test.cc - async_queue_test_libdispatch.cc + async_queue_libdispatch_test.mm async_tests_util.h DEPENDS firebase_firestore_util_executor_libdispatch diff --git a/Firestore/core/test/firebase/firestore/util/async_queue_libdispatch_test.mm b/Firestore/core/test/firebase/firestore/util/async_queue_libdispatch_test.mm new file mode 100644 index 0000000..5452266 --- /dev/null +++ b/Firestore/core/test/firebase/firestore/util/async_queue_libdispatch_test.mm @@ -0,0 +1,87 @@ +/* + * Copyright 2018 Google + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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 "Firestore/core/test/firebase/firestore/util/async_queue_test.h" + +#include + +#include "Firestore/core/src/firebase/firestore/util/executor_libdispatch.h" +#include "absl/memory/memory.h" +#include "gtest/gtest.h" + +namespace firebase { +namespace firestore { +namespace util { + +namespace { + +dispatch_queue_t CreateDispatchQueue() { + return dispatch_queue_create("AsyncQueueTests", DISPATCH_QUEUE_SERIAL); +} + +std::unique_ptr CreateExecutorFromQueue( + const dispatch_queue_t queue) { + return absl::make_unique(queue); +} + +std::unique_ptr CreateExecutorLibdispatch() { + return CreateExecutorFromQueue(CreateDispatchQueue()); +} + +} // namespace + +INSTANTIATE_TEST_CASE_P(AsyncQueueLibdispatch, + AsyncQueueTest, + ::testing::Values(CreateExecutorLibdispatch)); + +class AsyncQueueTestLibdispatchOnly : public TestWithTimeoutMixin, + public ::testing::Test { + public: + AsyncQueueTestLibdispatchOnly() + : underlying_queue{CreateDispatchQueue()}, + queue{CreateExecutorFromQueue(underlying_queue)} { + } + + dispatch_queue_t underlying_queue; + AsyncQueue queue; +}; + +// Additional tests to see how libdispatch-based version of `AsyncQueue` +// interacts with raw usage of libdispatch. + +TEST_F(AsyncQueueTestLibdispatchOnly, SameQueueIsAllowedForUnownedActions) { + internal::DispatchAsync(underlying_queue, [this] { + queue.Enqueue([this] { signal_finished(); }); + }); + EXPECT_TRUE(WaitForTestToFinish()); +} + +TEST_F(AsyncQueueTestLibdispatchOnly, + VerifyIsCurrentQueueRequiresOperationInProgress) { + internal::DispatchSync(underlying_queue, [this] { + EXPECT_ANY_THROW(queue.VerifyIsCurrentQueue()); + }); +} + +TEST_F(AsyncQueueTestLibdispatchOnly, + VerifyIsCurrentQueueRequiresBeingCalledAsync) { + ASSERT_NE(underlying_queue, dispatch_get_main_queue()); + EXPECT_ANY_THROW(queue.VerifyIsCurrentQueue()); +} + +} // namespace util +} // namespace firestore +} // namespace firebase diff --git a/Firestore/core/test/firebase/firestore/util/async_queue_std_test.cc b/Firestore/core/test/firebase/firestore/util/async_queue_std_test.cc new file mode 100644 index 0000000..9e69ad0 --- /dev/null +++ b/Firestore/core/test/firebase/firestore/util/async_queue_std_test.cc @@ -0,0 +1,41 @@ +/* + * Copyright 2018 Google + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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 "Firestore/core/test/firebase/firestore/util/async_queue_test.h" + +#include "Firestore/core/src/firebase/firestore/util/executor_std.h" + +#include "absl/memory/memory.h" +#include "gtest/gtest.h" + +namespace firebase { +namespace firestore { +namespace util { + +namespace { + +std::unique_ptr ExecutorFactory() { + return absl::make_unique(); +} + +} // namespace + +INSTANTIATE_TEST_CASE_P(AsyncQueueStd, + AsyncQueueTest, + ::testing::Values(ExecutorFactory)); +} // namespace util +} // namespace firestore +} // namespace firebase diff --git a/Firestore/core/test/firebase/firestore/util/async_queue_test_libdispatch.cc b/Firestore/core/test/firebase/firestore/util/async_queue_test_libdispatch.cc deleted file mode 100644 index b4b9c63..0000000 --- a/Firestore/core/test/firebase/firestore/util/async_queue_test_libdispatch.cc +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright 2018 Google - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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 "Firestore/core/test/firebase/firestore/util/async_queue_test.h" - -#include "Firestore/core/src/firebase/firestore/util/executor_libdispatch.h" - -#include "absl/memory/memory.h" -#include "gtest/gtest.h" - -namespace firebase { -namespace firestore { -namespace util { - -namespace { - -dispatch_queue_t CreateDispatchQueue() { - return dispatch_queue_create("AsyncQueueTests", DISPATCH_QUEUE_SERIAL); -} - -std::unique_ptr CreateExecutorFromQueue( - const dispatch_queue_t queue) { - return absl::make_unique(queue); -} - -std::unique_ptr CreateExecutorLibdispatch() { - return CreateExecutorFromQueue(CreateDispatchQueue()); -} - -} // namespace - -INSTANTIATE_TEST_CASE_P(AsyncQueueLibdispatch, - AsyncQueueTest, - ::testing::Values(CreateExecutorLibdispatch)); - -class AsyncQueueTestLibdispatchOnly : public TestWithTimeoutMixin, - public ::testing::Test { - public: - AsyncQueueTestLibdispatchOnly() - : underlying_queue{CreateDispatchQueue()}, - queue{CreateExecutorFromQueue(underlying_queue)} { - } - - dispatch_queue_t underlying_queue; - AsyncQueue queue; -}; - -// Additional tests to see how libdispatch-based version of `AsyncQueue` -// interacts with raw usage of libdispatch. - -TEST_F(AsyncQueueTestLibdispatchOnly, SameQueueIsAllowedForUnownedActions) { - internal::DispatchAsync(underlying_queue, [this] { - queue.Enqueue([this] { signal_finished(); }); - }); - EXPECT_TRUE(WaitForTestToFinish()); -} - -TEST_F(AsyncQueueTestLibdispatchOnly, - VerifyIsCurrentQueueRequiresOperationInProgress) { - internal::DispatchSync(underlying_queue, [this] { - EXPECT_ANY_THROW(queue.VerifyIsCurrentQueue()); - }); -} - -TEST_F(AsyncQueueTestLibdispatchOnly, - VerifyIsCurrentQueueRequiresBeingCalledAsync) { - ASSERT_NE(underlying_queue, dispatch_get_main_queue()); - EXPECT_ANY_THROW(queue.VerifyIsCurrentQueue()); -} - -} // namespace util -} // namespace firestore -} // namespace firebase diff --git a/Firestore/core/test/firebase/firestore/util/async_queue_test_std.cc b/Firestore/core/test/firebase/firestore/util/async_queue_test_std.cc deleted file mode 100644 index 9e69ad0..0000000 --- a/Firestore/core/test/firebase/firestore/util/async_queue_test_std.cc +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2018 Google - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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 "Firestore/core/test/firebase/firestore/util/async_queue_test.h" - -#include "Firestore/core/src/firebase/firestore/util/executor_std.h" - -#include "absl/memory/memory.h" -#include "gtest/gtest.h" - -namespace firebase { -namespace firestore { -namespace util { - -namespace { - -std::unique_ptr ExecutorFactory() { - return absl::make_unique(); -} - -} // namespace - -INSTANTIATE_TEST_CASE_P(AsyncQueueStd, - AsyncQueueTest, - ::testing::Values(ExecutorFactory)); -} // namespace util -} // namespace firestore -} // namespace firebase diff --git a/Firestore/core/test/firebase/firestore/util/executor_libdispatch_test.cc b/Firestore/core/test/firebase/firestore/util/executor_libdispatch_test.cc deleted file mode 100644 index 0167c83..0000000 --- a/Firestore/core/test/firebase/firestore/util/executor_libdispatch_test.cc +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2018 Google - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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 "Firestore/core/test/firebase/firestore/util/executor_test.h" - -#include - -#include "Firestore/core/src/firebase/firestore/util/executor_libdispatch.h" -#include "absl/memory/memory.h" -#include "gtest/gtest.h" - -namespace firebase { -namespace firestore { -namespace util { - -namespace { - -std::unique_ptr ExecutorFactory() { - return absl::make_unique(); -} - -} // namespace - -INSTANTIATE_TEST_CASE_P(ExecutorTestLibdispatch, - ExecutorTest, - ::testing::Values(ExecutorFactory)); - -} // namespace util -} // namespace firestore -} // namespace firebase diff --git a/Firestore/core/test/firebase/firestore/util/executor_libdispatch_test.mm b/Firestore/core/test/firebase/firestore/util/executor_libdispatch_test.mm new file mode 100644 index 0000000..0167c83 --- /dev/null +++ b/Firestore/core/test/firebase/firestore/util/executor_libdispatch_test.mm @@ -0,0 +1,43 @@ +/* + * Copyright 2018 Google + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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 "Firestore/core/test/firebase/firestore/util/executor_test.h" + +#include + +#include "Firestore/core/src/firebase/firestore/util/executor_libdispatch.h" +#include "absl/memory/memory.h" +#include "gtest/gtest.h" + +namespace firebase { +namespace firestore { +namespace util { + +namespace { + +std::unique_ptr ExecutorFactory() { + return absl::make_unique(); +} + +} // namespace + +INSTANTIATE_TEST_CASE_P(ExecutorTestLibdispatch, + ExecutorTest, + ::testing::Values(ExecutorFactory)); + +} // namespace util +} // namespace firestore +} // namespace firebase -- cgit v1.2.3