From feae5e22ee4910a1508f2120c8131b2f8531bae8 Mon Sep 17 00:00:00 2001 From: Ivo van Dongen Date: Thu, 4 May 2017 17:26:42 +0300 Subject: [core] generated accessor methods on light --- test/style/conversion/light.test.cpp | 38 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'test') diff --git a/test/style/conversion/light.test.cpp b/test/style/conversion/light.test.cpp index da0fd3054a..a2185906d6 100644 --- a/test/style/conversion/light.test.cpp +++ b/test/style/conversion/light.test.cpp @@ -33,35 +33,35 @@ TEST(StyleConversion, Light) { auto light = parseLight("{\"color\":{\"stops\":[[14,\"blue\"],[16,\"red\"]]},\"intensity\":0.3,\"position\":[3,90,90]}"); ASSERT_TRUE((bool) light); - ASSERT_TRUE(light->get().value.isUndefined()); - ASSERT_FALSE(light->get().value.isConstant()); - ASSERT_FALSE(light->get().value.isCameraFunction()); + ASSERT_TRUE(light->getAnchor().isUndefined()); + ASSERT_FALSE(light->getAnchor().isConstant()); + ASSERT_FALSE(light->getAnchor().isCameraFunction()); - ASSERT_FALSE(light->get().value.isUndefined()); - ASSERT_TRUE(light->get().value.isConstant()); - ASSERT_EQ(light->get().value.asConstant(), 0.3f); - ASSERT_FALSE(light->get().value.isCameraFunction()); + ASSERT_FALSE(light->getIntensity().isUndefined()); + ASSERT_TRUE(light->getIntensity().isConstant()); + ASSERT_EQ(light->getIntensity().asConstant(), 0.3f); + ASSERT_FALSE(light->getAnchor().isCameraFunction()); - ASSERT_FALSE(light->get().value.isUndefined()); - ASSERT_FALSE(light->get().value.isConstant()); - ASSERT_TRUE(light->get().value.isCameraFunction()); + ASSERT_FALSE(light->getColor().isUndefined()); + ASSERT_FALSE(light->getColor().isConstant()); + ASSERT_TRUE(light->getColor().isCameraFunction()); - ASSERT_FALSE(light->get().value.isUndefined()); - ASSERT_TRUE(light->get().value.isConstant()); + ASSERT_FALSE(light->getPosition().isUndefined()); + ASSERT_TRUE(light->getPosition().isConstant()); std::array expected{{ 3, 90, 90 }}; - ASSERT_EQ(light->get().value.asConstant(), mbgl::style::Position({ expected })); - ASSERT_FALSE(light->get().value.isCameraFunction()); + ASSERT_EQ(light->getPosition().asConstant(), mbgl::style::Position({ expected })); + ASSERT_FALSE(light->getPosition().isCameraFunction()); } { auto light = parseLight("{\"color\":\"blue\",\"intensity\":0.3,\"color-transition\":{\"duration\":1000}}"); ASSERT_TRUE((bool) light); - ASSERT_FALSE(light->get().value.isUndefined()); - ASSERT_TRUE(light->get().value.isConstant()); - ASSERT_FALSE(light->get().value.isCameraFunction()); - ASSERT_EQ(light->get().transition.duration, mbgl::Duration(mbgl::Milliseconds(1000))); - ASSERT_FALSE((bool) light->get().transition.delay); + ASSERT_FALSE(light->getColor().isUndefined()); + ASSERT_TRUE(light->getColor().isConstant()); + ASSERT_FALSE(light->getColor().isCameraFunction()); + ASSERT_EQ(light->getColorTransition().duration, mbgl::Duration(mbgl::Milliseconds(1000))); + ASSERT_FALSE((bool) light->getColorTransition().delay); } { -- cgit v1.2.1