From 3fcdf510ce4b7f50e44445ff329d9019e73ba257 Mon Sep 17 00:00:00 2001 From: Rich Gowman Date: Fri, 2 Feb 2018 14:12:51 -0500 Subject: Hook up nanopb to firestorep project Use remote/serializer placeholder class as a hook for the test to ensure nanopb headers can be found, and test can be linked. --- .../test/firebase/firestore/remote/CMakeLists.txt | 1 + .../firebase/firestore/remote/serializer_test.cc | 28 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 Firestore/core/test/firebase/firestore/remote/serializer_test.cc (limited to 'Firestore/core/test') diff --git a/Firestore/core/test/firebase/firestore/remote/CMakeLists.txt b/Firestore/core/test/firebase/firestore/remote/CMakeLists.txt index 7d99e6f..d42b107 100644 --- a/Firestore/core/test/firebase/firestore/remote/CMakeLists.txt +++ b/Firestore/core/test/firebase/firestore/remote/CMakeLists.txt @@ -16,6 +16,7 @@ cc_test( firebase_firestore_remote_test SOURCES datastore_test.cc + serializer_test.cc DEPENDS firebase_firestore_remote ) diff --git a/Firestore/core/test/firebase/firestore/remote/serializer_test.cc b/Firestore/core/test/firebase/firestore/remote/serializer_test.cc new file mode 100644 index 0000000..6a58adb --- /dev/null +++ b/Firestore/core/test/firebase/firestore/remote/serializer_test.cc @@ -0,0 +1,28 @@ +/* + * 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/src/firebase/firestore/remote/serializer.h" + +#include +#include + +TEST(Serializer, CanLinkToNanopb) { + // This test doesn't actually do anything interesting as far as actually using + // nanopb is concerned but that it can run at all is proof that all the + // libraries required for nanopb to work are actually linked correctly into + // the test. + pb_ostream_from_buffer(NULL, 0); +} -- cgit v1.2.3 From c896fab35f0b37123175eb1011e6155ecb36a92b Mon Sep 17 00:00:00 2001 From: Rich Gowman Date: Fri, 2 Feb 2018 14:36:18 -0500 Subject: ./style.sh --- Firestore/core/src/firebase/firestore/remote/serializer.cc | 3 +-- Firestore/core/test/firebase/firestore/remote/serializer_test.cc | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'Firestore/core/test') diff --git a/Firestore/core/src/firebase/firestore/remote/serializer.cc b/Firestore/core/src/firebase/firestore/remote/serializer.cc index 1831222..d3cdd3f 100644 --- a/Firestore/core/src/firebase/firestore/remote/serializer.cc +++ b/Firestore/core/src/firebase/firestore/remote/serializer.cc @@ -18,9 +18,8 @@ // TODO(rsgowman): These are (currently!) unnecessary includes. Adding for now // to ensure we can find nanopb's generated header files. -#include "Firestore/Protos/nanopb/google/protobuf/timestamp.pb.h" #include "Firestore/Protos/nanopb/google/firestore/v1beta1/document.pb.h" - +#include "Firestore/Protos/nanopb/google/protobuf/timestamp.pb.h" namespace firebase { namespace firestore { diff --git a/Firestore/core/test/firebase/firestore/remote/serializer_test.cc b/Firestore/core/test/firebase/firestore/remote/serializer_test.cc index 6a58adb..1be5a87 100644 --- a/Firestore/core/test/firebase/firestore/remote/serializer_test.cc +++ b/Firestore/core/test/firebase/firestore/remote/serializer_test.cc @@ -16,8 +16,8 @@ #include "Firestore/core/src/firebase/firestore/remote/serializer.h" -#include #include +#include TEST(Serializer, CanLinkToNanopb) { // This test doesn't actually do anything interesting as far as actually using -- cgit v1.2.3