diff options
Diffstat (limited to 'third_party/nix/src/tests')
-rw-r--r-- | third_party/nix/src/tests/attr-set.cc | 6 | ||||
-rw-r--r-- | third_party/nix/src/tests/language-tests.cc | 4 | ||||
-rw-r--r-- | third_party/nix/src/tests/value-to-json.cc | 40 |
3 files changed, 25 insertions, 25 deletions
diff --git a/third_party/nix/src/tests/attr-set.cc b/third_party/nix/src/tests/attr-set.cc index 8ebbbb525cb8..e8ad86664b9d 100644 --- a/third_party/nix/src/tests/attr-set.cc +++ b/third_party/nix/src/tests/attr-set.cc @@ -113,7 +113,7 @@ using nix::tests::DummyStore; class AttrSetTest : public ::testing::Test { protected: - EvalState* eval_state_{}; + EvalState* eval_state_; void SetUp() override { nix::initGC(); auto store = std::make_shared<DummyStore>(); @@ -122,8 +122,8 @@ class AttrSetTest : public ::testing::Test { } void assert_bindings_equal(nix::Bindings& lhs, nix::Bindings& rhs) { - Value lhs_val{}; - Value rhs_val{}; + Value lhs_val; + Value rhs_val; lhs_val.type = rhs_val.type = ValueType::tAttrs; lhs_val.attrs = &lhs; rhs_val.attrs = &lhs; diff --git a/third_party/nix/src/tests/language-tests.cc b/third_party/nix/src/tests/language-tests.cc index 9616f5e158c9..9fb453e5e537 100644 --- a/third_party/nix/src/tests/language-tests.cc +++ b/third_party/nix/src/tests/language-tests.cc @@ -181,7 +181,7 @@ TEST_P(EvalFailureTest, Fails) { // Again, there are multiple expected exception types and the tests // don't specify which ones they are looking for. try { - Value result{}; + Value result; state.eval(expr, result); state.forceValue(result); std::cout << result; @@ -216,7 +216,7 @@ TEST_P(EvalSuccessTest, Fails) { ASSERT_NO_THROW(expr = state.parseExprFromFile(GetParam().string())) << path.stem().string() << ": should parse successfully"; - Value result{}; + Value result; ASSERT_NO_THROW({ state.eval(expr, result); diff --git a/third_party/nix/src/tests/value-to-json.cc b/third_party/nix/src/tests/value-to-json.cc index fbc1fa54d3f5..573eb658285d 100644 --- a/third_party/nix/src/tests/value-to-json.cc +++ b/third_party/nix/src/tests/value-to-json.cc @@ -12,9 +12,9 @@ class ValueTest : public ::testing::Test { protected: - static void SetUpTestSuite() { nix::initGC(); } + static void SetUpTestCase() { nix::initGC(); } - static void TearDownTestSuite() {} + static void TearDownTestCase() {} }; class JSONValueTest : public ValueTest {}; @@ -26,7 +26,7 @@ using nix::tests::DummyStore; TEST_F(JSONValueTest, null) { std::stringstream ss; - Value v{}; + Value v; PathSet ps; std::shared_ptr<Store> store = std::make_shared<DummyStore>(); EvalState s({}, ref<Store>(store)); @@ -40,7 +40,7 @@ TEST_F(JSONValueTest, BoolFalse) { std::stringstream ss; auto store = std::make_shared<DummyStore>(); EvalState s({"."}, ref<Store>(store)); - Value v{}; + Value v; PathSet ps; mkBool(v, false); @@ -52,7 +52,7 @@ TEST_F(JSONValueTest, BoolTrue) { std::stringstream ss; auto store = std::make_shared<DummyStore>(); EvalState s({"."}, ref<Store>(store)); - Value v{}; + Value v; PathSet ps; mkBool(v, true); @@ -64,7 +64,7 @@ TEST_F(JSONValueTest, IntPositive) { std::stringstream ss; auto store = std::make_shared<DummyStore>(); EvalState s({"."}, ref<Store>(store)); - Value v{}; + Value v; PathSet ps; mkInt(v, 100); @@ -76,7 +76,7 @@ TEST_F(JSONValueTest, IntNegative) { std::stringstream ss; auto store = std::make_shared<DummyStore>(); EvalState s({"."}, ref<Store>(store)); - Value v{}; + Value v; PathSet ps; mkInt(v, -100); @@ -88,7 +88,7 @@ TEST_F(JSONValueTest, String) { std::stringstream ss; auto store = std::make_shared<DummyStore>(); EvalState s({"."}, ref<Store>(store)); - Value v{}; + Value v; PathSet ps; mkString(v, "test"); @@ -100,7 +100,7 @@ TEST_F(JSONValueTest, StringQuotes) { std::stringstream ss; auto store = std::make_shared<DummyStore>(); EvalState s({"."}, ref<Store>(store)); - Value v{}; + Value v; PathSet ps; mkString(v, "test\""); @@ -112,7 +112,7 @@ TEST_F(JSONValueTest, Path) { std::stringstream ss; auto store = std::make_shared<DummyStore>(); EvalState s({"."}, ref<Store>(store)); - Value v{}; + Value v; PathSet ps; mkPathNoCopy(v, "/exists-for-tests"); @@ -124,7 +124,7 @@ TEST_F(JSONValueTest, PathNoCopy) { std::stringstream ss; auto store = std::make_shared<DummyStore>(); EvalState s({"."}, ref<Store>(store)); - Value v{}; + Value v; PathSet ps; mkPathNoCopy(v, "/exists-for-tests"); @@ -141,7 +141,7 @@ TEST_F(JSONValueTest, PathNoCopy) { TEST_F(XMLValueTest, null) { std::stringstream ss; - Value v{}; + Value v; PathSet ps; auto store = std::make_shared<DummyStore>(); EvalState s({}, ref<Store>(store)); @@ -155,7 +155,7 @@ TEST_F(XMLValueTest, BoolFalse) { std::stringstream ss; auto store = std::make_shared<DummyStore>(); EvalState s({"."}, ref<Store>(store)); - Value v{}; + Value v; PathSet ps; mkBool(v, false); @@ -167,7 +167,7 @@ TEST_F(XMLValueTest, BoolTrue) { std::stringstream ss; auto store = std::make_shared<DummyStore>(); EvalState s({"."}, ref<Store>(store)); - Value v{}; + Value v; PathSet ps; mkBool(v, true); @@ -179,7 +179,7 @@ TEST_F(XMLValueTest, IntPositive) { std::stringstream ss; auto store = std::make_shared<DummyStore>(); EvalState s({"."}, ref<Store>(store)); - Value v{}; + Value v; PathSet ps; mkInt(v, 100); @@ -191,7 +191,7 @@ TEST_F(XMLValueTest, IntNegative) { std::stringstream ss; auto store = std::make_shared<DummyStore>(); EvalState s({"."}, ref<Store>(store)); - Value v{}; + Value v; PathSet ps; mkInt(v, -100); @@ -203,7 +203,7 @@ TEST_F(XMLValueTest, String) { std::stringstream ss; auto store = std::make_shared<DummyStore>(); EvalState s({"."}, ref<Store>(store)); - Value v{}; + Value v; PathSet ps; mkString(v, "test-value"); @@ -215,7 +215,7 @@ TEST_F(XMLValueTest, StringQuotes) { std::stringstream ss; auto store = std::make_shared<DummyStore>(); EvalState s({"."}, ref<Store>(store)); - Value v{}; + Value v; PathSet ps; mkString(v, "test-value\""); @@ -231,7 +231,7 @@ TEST_F(XMLValueTest, Path) { std::stringstream ss; auto store = std::make_shared<DummyStore>(); EvalState s({"."}, ref<Store>(store)); - Value v{}; + Value v; PathSet ps; mkPath(v, "some-path"); @@ -247,7 +247,7 @@ TEST_F(XMLValueTest, PathNoCopy) { std::stringstream ss; auto store = std::make_shared<DummyStore>(); EvalState s({"."}, ref<Store>(store)); - Value v{}; + Value v; PathSet ps; mkPathNoCopy(v, "some-other-path"); |