Delete QuicheStrCat(). PiperOrigin-RevId: 346975871 Change-Id: I9fd631480ad3d2656373603237d24e6a7de716c1
diff --git a/common/platform/api/quiche_str_cat.h b/common/platform/api/quiche_str_cat.h index 36d054f..b996401 100644 --- a/common/platform/api/quiche_str_cat.h +++ b/common/platform/api/quiche_str_cat.h
@@ -12,12 +12,6 @@ namespace quiche { -// Merges given strings or numbers with no delimiter. -template <typename... Args> -inline std::string QuicheStrCat(const Args&... args) { - return quiche::QuicheStrCatImpl(std::forward<const Args&>(args)...); -} - template <typename... Args> inline std::string QuicheStringPrintf(const Args&... args) { return QuicheStringPrintfImpl(std::forward<const Args&>(args)...);
diff --git a/common/platform/api/quiche_str_cat_test.cc b/common/platform/api/quiche_str_cat_test.cc deleted file mode 100644 index c9a5bfc..0000000 --- a/common/platform/api/quiche_str_cat_test.cc +++ /dev/null
@@ -1,169 +0,0 @@ -// Copyright (c) 2016 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "net/third_party/quiche/src/common/platform/api/quiche_str_cat.h" - -#include <string> - -#include "absl/strings/string_view.h" -#include "net/third_party/quiche/src/common/platform/api/quiche_test.h" - -namespace quiche { -namespace test { -namespace { - -class QuicheStrCatTest : public QuicheTest {}; - -TEST_F(QuicheStrCatTest, Ints) { - const int16_t s = -1; - const uint16_t us = 2; - const int i = -3; - const uint32_t ui = 4; - const int64_t l = -5; - const uint64_t ul = 6; - const ptrdiff_t ptrdiff = -7; - const size_t size = 8; - const intptr_t intptr = -9; - const uintptr_t uintptr = 10; - std::string answer; - answer = QuicheStrCat(s, us); - EXPECT_EQ(answer, "-12"); - answer = QuicheStrCat(i, ui); - EXPECT_EQ(answer, "-34"); - answer = QuicheStrCat(l, ul); - EXPECT_EQ(answer, "-56"); - answer = QuicheStrCat(ptrdiff, size); - EXPECT_EQ(answer, "-78"); - answer = QuicheStrCat(size, intptr); - EXPECT_EQ(answer, "8-9"); - answer = QuicheStrCat(uintptr, 0); - EXPECT_EQ(answer, "100"); -} - -TEST_F(QuicheStrCatTest, Basics) { - std::string result; - - std::string strs[] = {"Hello", "Cruel", "World"}; - - absl::string_view pieces[] = {"Hello", "Cruel", "World"}; - - const char* c_strs[] = {"Hello", "Cruel", "World"}; - - int32_t i32s[] = {'H', 'C', 'W'}; - uint64_t ui64s[] = {12345678910LL, 10987654321LL}; - - result = QuicheStrCat(false, true, 2, 3); - EXPECT_EQ(result, "0123"); - - result = QuicheStrCat(-1); - EXPECT_EQ(result, "-1"); - - result = QuicheStrCat(0.5); - EXPECT_EQ(result, "0.5"); - - result = QuicheStrCat(strs[1], pieces[2]); - EXPECT_EQ(result, "CruelWorld"); - - result = QuicheStrCat(strs[0], ", ", pieces[2]); - EXPECT_EQ(result, "Hello, World"); - - result = QuicheStrCat(strs[0], ", ", strs[1], " ", strs[2], "!"); - EXPECT_EQ(result, "Hello, Cruel World!"); - - result = QuicheStrCat(pieces[0], ", ", pieces[1], " ", pieces[2]); - EXPECT_EQ(result, "Hello, Cruel World"); - - result = QuicheStrCat(c_strs[0], ", ", c_strs[1], " ", c_strs[2]); - EXPECT_EQ(result, "Hello, Cruel World"); - - result = QuicheStrCat("ASCII ", i32s[0], ", ", i32s[1], " ", i32s[2], "!"); - EXPECT_EQ(result, "ASCII 72, 67 87!"); - - result = QuicheStrCat(ui64s[0], ", ", ui64s[1], "!"); - EXPECT_EQ(result, "12345678910, 10987654321!"); - - std::string one = "1"; - result = QuicheStrCat("And a ", one.size(), " and a ", - &result[2] - &result[0], " and a ", one, " 2 3 4", "!"); - EXPECT_EQ(result, "And a 1 and a 2 and a 1 2 3 4!"); - - result = - QuicheStrCat("To output a char by ASCII/numeric value, use +: ", '!' + 0); - EXPECT_EQ(result, "To output a char by ASCII/numeric value, use +: 33"); - - float f = 10000.5; - result = QuicheStrCat("Ten K and a half is ", f); - EXPECT_EQ(result, "Ten K and a half is 10000.5"); - - double d = 99999.9; - result = QuicheStrCat("This double number is ", d); - EXPECT_EQ(result, "This double number is 99999.9"); - - result = QuicheStrCat(1, 22, 333, 4444, 55555, 666666, 7777777, 88888888, - 999999999); - EXPECT_EQ(result, "122333444455555666666777777788888888999999999"); -} - -TEST_F(QuicheStrCatTest, MaxArgs) { - std::string result; - // Test 10 up to 26 arguments, the current maximum - result = QuicheStrCat(1, 2, 3, 4, 5, 6, 7, 8, 9, "a"); - EXPECT_EQ(result, "123456789a"); - result = QuicheStrCat(1, 2, 3, 4, 5, 6, 7, 8, 9, "a", "b"); - EXPECT_EQ(result, "123456789ab"); - result = QuicheStrCat(1, 2, 3, 4, 5, 6, 7, 8, 9, "a", "b", "c"); - EXPECT_EQ(result, "123456789abc"); - result = QuicheStrCat(1, 2, 3, 4, 5, 6, 7, 8, 9, "a", "b", "c", "d"); - EXPECT_EQ(result, "123456789abcd"); - result = QuicheStrCat(1, 2, 3, 4, 5, 6, 7, 8, 9, "a", "b", "c", "d", "e"); - EXPECT_EQ(result, "123456789abcde"); - result = - QuicheStrCat(1, 2, 3, 4, 5, 6, 7, 8, 9, "a", "b", "c", "d", "e", "f"); - EXPECT_EQ(result, "123456789abcdef"); - result = QuicheStrCat(1, 2, 3, 4, 5, 6, 7, 8, 9, "a", "b", "c", "d", "e", "f", - "g"); - EXPECT_EQ(result, "123456789abcdefg"); - result = QuicheStrCat(1, 2, 3, 4, 5, 6, 7, 8, 9, "a", "b", "c", "d", "e", "f", - "g", "h"); - EXPECT_EQ(result, "123456789abcdefgh"); - result = QuicheStrCat(1, 2, 3, 4, 5, 6, 7, 8, 9, "a", "b", "c", "d", "e", "f", - "g", "h", "i"); - EXPECT_EQ(result, "123456789abcdefghi"); - result = QuicheStrCat(1, 2, 3, 4, 5, 6, 7, 8, 9, "a", "b", "c", "d", "e", "f", - "g", "h", "i", "j"); - EXPECT_EQ(result, "123456789abcdefghij"); - result = QuicheStrCat(1, 2, 3, 4, 5, 6, 7, 8, 9, "a", "b", "c", "d", "e", "f", - "g", "h", "i", "j", "k"); - EXPECT_EQ(result, "123456789abcdefghijk"); - result = QuicheStrCat(1, 2, 3, 4, 5, 6, 7, 8, 9, "a", "b", "c", "d", "e", "f", - "g", "h", "i", "j", "k", "l"); - EXPECT_EQ(result, "123456789abcdefghijkl"); - result = QuicheStrCat(1, 2, 3, 4, 5, 6, 7, 8, 9, "a", "b", "c", "d", "e", "f", - "g", "h", "i", "j", "k", "l", "m"); - EXPECT_EQ(result, "123456789abcdefghijklm"); - result = QuicheStrCat(1, 2, 3, 4, 5, 6, 7, 8, 9, "a", "b", "c", "d", "e", "f", - "g", "h", "i", "j", "k", "l", "m", "n"); - EXPECT_EQ(result, "123456789abcdefghijklmn"); - result = QuicheStrCat(1, 2, 3, 4, 5, 6, 7, 8, 9, "a", "b", "c", "d", "e", "f", - "g", "h", "i", "j", "k", "l", "m", "n", "o"); - EXPECT_EQ(result, "123456789abcdefghijklmno"); - result = QuicheStrCat(1, 2, 3, 4, 5, 6, 7, 8, 9, "a", "b", "c", "d", "e", "f", - "g", "h", "i", "j", "k", "l", "m", "n", "o", "p"); - EXPECT_EQ(result, "123456789abcdefghijklmnop"); - result = QuicheStrCat(1, 2, 3, 4, 5, 6, 7, 8, 9, "a", "b", "c", "d", "e", "f", - "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q"); - EXPECT_EQ(result, "123456789abcdefghijklmnopq"); - // No limit thanks to C++11's variadic templates - result = QuicheStrCat( - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, "a", "b", "c", "d", "e", "f", "g", "h", - "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", - "x", "y", "z", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", - "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"); - EXPECT_EQ(result, - "12345678910abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"); -} - -} // namespace -} // namespace test -} // namespace quiche