projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correctly use iters_ in ProducerConsumerQueueBenchmark
[folly.git]
/
folly
/
test
/
DynamicOtherTest.cpp
diff --git
a/folly/test/DynamicOtherTest.cpp
b/folly/test/DynamicOtherTest.cpp
index 63e3fe4490acdda6eb791a951f5fcc971c7e12d0..bf3b462f32ce516ce3ef68d3b973f3f862520519 100644
(file)
--- a/
folly/test/DynamicOtherTest.cpp
+++ b/
folly/test/DynamicOtherTest.cpp
@@
-18,8
+18,8
@@
#include <folly/gen/Base.h>
#include <folly/json.h>
#include <folly/gen/Base.h>
#include <folly/json.h>
+#include <folly/portability/GFlags.h>
-#include <gflags/gflags.h>
#include <gtest/gtest.h>
#include <iostream>
#include <gtest/gtest.h>
#include <iostream>
@@
-30,7
+30,7
@@
using folly::TypeError;
TEST(Dynamic, ArrayGenerator) {
// Make sure arrays can be used with folly::gen.
using namespace folly::gen;
TEST(Dynamic, ArrayGenerator) {
// Make sure arrays can be used with folly::gen.
using namespace folly::gen;
- dynamic arr
{ 1, 2, 3, 4 }
;
+ dynamic arr
= dynamic::array(1, 2, 3, 4)
;
EXPECT_EQ(from(arr) | take(3) | member(&dynamic::asInt) | sum, 6);
}
EXPECT_EQ(from(arr) | take(3) | member(&dynamic::asInt) | sum, 6);
}
@@
-102,7
+102,7
@@
TEST(Dynamic, FormattedIO) {
EXPECT_EQ(out.str(), "0xd 1e+02\n");
out.str("");
EXPECT_EQ(out.str(), "0xd 1e+02\n");
out.str("");
- dynamic arrr =
{ 1, 2, 3 }
;
+ dynamic arrr =
dynamic::array(1, 2, 3)
;
out << arrr;
EXPECT_EQ(out.str(), "[1,2,3]");
out << arrr;
EXPECT_EQ(out.str(), "[1,2,3]");
@@
-112,8
+112,9
@@
TEST(Dynamic, FormattedIO) {
EXPECT_EQ(out.str(), R"({"a":12})");
out.str("");
EXPECT_EQ(out.str(), R"({"a":12})");
out.str("");
- dynamic objy2 = { objy, dynamic::object(12, "str"),
- dynamic::object(true, false) };
+ dynamic objy2 = dynamic::array(objy,
+ dynamic::object(12, "str"),
+ dynamic::object(true, false));
out << objy2;
EXPECT_EQ(out.str(), R"([{"a":12},{12:"str"},{true:false}])");
}
out << objy2;
EXPECT_EQ(out.str(), R"([{"a":12},{12:"str"},{true:false}])");
}