aboutsummaryrefslogtreecommitdiffhomepage
path: root/Firestore/core/test
diff options
context:
space:
mode:
authorGravatar Gil <mcg@google.com>2018-05-22 13:21:08 -0700
committerGravatar GitHub <noreply@github.com>2018-05-22 13:21:08 -0700
commitd439bbccd4b90583a89d209d2cc81308aabca8ac (patch)
tree13fb14cc905f667e1470bcc14a3c84dfb6a7a109 /Firestore/core/test
parent476be0ba2ba8340296a5b5b05f27f3ded4bd6c72 (diff)
Add a HARD_ASSERT C++ assertion macro (#1304)
* Add HARD_ASSERT * Use HARD_ASSERT * Remove FIREBASE_ASSERT * Remove StringPrintf
Diffstat (limited to 'Firestore/core/test')
-rw-r--r--Firestore/core/test/firebase/firestore/util/CMakeLists.txt5
-rw-r--r--Firestore/core/test/firebase/firestore/util/hard_assert_test.cc (renamed from Firestore/core/test/firebase/firestore/util/assert_test.cc)27
-rw-r--r--Firestore/core/test/firebase/firestore/util/string_printf_test.cc78
3 files changed, 10 insertions, 100 deletions
diff --git a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt
index c133e23..bcb1c84 100644
--- a/Firestore/core/test/firebase/firestore/util/CMakeLists.txt
+++ b/Firestore/core/test/firebase/firestore/util/CMakeLists.txt
@@ -23,7 +23,7 @@ if(APPLE)
cc_test(
firebase_firestore_util_log_apple_test
SOURCES
- assert_test.cc
+ hard_assert_test.cc
log_test.cc
DEPENDS
firebase_firestore_util_log_apple
@@ -33,7 +33,7 @@ endif(APPLE)
cc_test(
firebase_firestore_util_log_stdio_test
SOURCES
- assert_test.cc
+ hard_assert_test.cc
log_test.cc
DEPENDS
firebase_firestore_util_log_stdio
@@ -130,7 +130,6 @@ cc_test(
status_test_util.h
statusor_test.cc
string_format_test.cc
- string_printf_test.cc
string_util_test.cc
DEPENDS
absl_base
diff --git a/Firestore/core/test/firebase/firestore/util/assert_test.cc b/Firestore/core/test/firebase/firestore/util/hard_assert_test.cc
index fb15e61..fab6475 100644
--- a/Firestore/core/test/firebase/firestore/util/assert_test.cc
+++ b/Firestore/core/test/firebase/firestore/util/hard_assert_test.cc
@@ -16,7 +16,7 @@
#include <exception>
-#include "Firestore/core/src/firebase/firestore/util/firebase_assert.h"
+#include "Firestore/core/src/firebase/firestore/util/hard_assert.h"
#include "gtest/gtest.h"
namespace firebase {
@@ -25,37 +25,26 @@ namespace util {
namespace {
-void AssertWithExpression(bool condition) {
- FIREBASE_ASSERT_WITH_EXPRESSION(condition, 1 + 2 + 3);
-}
-
void Assert(bool condition) {
- FIREBASE_ASSERT(condition == true);
+ HARD_ASSERT(condition == true);
}
-void AssertMessageWithExpression(bool condition) {
- FIREBASE_ASSERT_MESSAGE_WITH_EXPRESSION(condition, 1 + 2 + 3, "connection %s",
- condition ? "succeeded" : "failed");
+void AssertWithMessage(bool condition) {
+ HARD_ASSERT(condition, "condition %s", condition ? "succeeded" : "failed");
}
} // namespace
-TEST(Assert, WithExpression) {
- AssertWithExpression(true);
-
- EXPECT_ANY_THROW(AssertWithExpression(false));
-}
-
-TEST(Assert, Vanilla) {
+TEST(HardAssertTest, Vanilla) {
Assert(true);
EXPECT_ANY_THROW(Assert(false));
}
-TEST(Assert, WithMessageAndExpression) {
- AssertMessageWithExpression(true);
+TEST(HardAssertTest, WithMessage) {
+ AssertWithMessage(true);
- EXPECT_ANY_THROW(AssertMessageWithExpression(false));
+ EXPECT_ANY_THROW(AssertWithMessage(false));
}
} // namespace util
diff --git a/Firestore/core/test/firebase/firestore/util/string_printf_test.cc b/Firestore/core/test/firebase/firestore/util/string_printf_test.cc
deleted file mode 100644
index 14cc9c8..0000000
--- a/Firestore/core/test/firebase/firestore/util/string_printf_test.cc
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2017 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/util/string_printf.h"
-
-#include "gtest/gtest.h"
-
-namespace firebase {
-namespace firestore {
-namespace util {
-
-TEST(StringPrintf, Empty) {
- EXPECT_EQ("", StringPrintf(""));
- EXPECT_EQ("", StringPrintf("%s", std::string().c_str()));
- EXPECT_EQ("", StringPrintf("%s", ""));
-}
-
-TEST(StringAppendFTest, Empty) {
- std::string value("Hello");
- const char* empty = "";
- StringAppendF(&value, "%s", empty);
- EXPECT_EQ("Hello", value);
-}
-
-TEST(StringAppendFTest, EmptyString) {
- std::string value("Hello");
- StringAppendF(&value, "%s", "");
- EXPECT_EQ("Hello", value);
-}
-
-TEST(StringAppendFTest, String) {
- std::string value("Hello");
- StringAppendF(&value, " %s", "World");
- EXPECT_EQ("Hello World", value);
-}
-
-TEST(StringAppendFTest, Int) {
- std::string value("Hello");
- StringAppendF(&value, " %d", 123);
- EXPECT_EQ("Hello 123", value);
-}
-
-TEST(StringPrintf, DontOverwriteErrno) {
- // Check that errno isn't overwritten unless we're printing
- // something significantly larger than what people are normally
- // printing in their badly written PLOG() statements.
- errno = ECHILD;
- std::string value = StringPrintf("Hello, %s!", "World");
- EXPECT_EQ(ECHILD, errno);
-}
-
-TEST(StringPrintf, LargeBuf) {
- // Check that the large buffer is handled correctly.
- size_t n = 2048;
- char* buf = new char[n + 1];
- memset(buf, ' ', n);
- buf[n] = 0;
- std::string value = StringPrintf("%s", buf);
- EXPECT_EQ(buf, value);
- delete[] buf;
-}
-
-} // namespace util
-} // namespace firestore
-} // namespace firebase