diff --git a/test/capi/capiPaint.cpp b/test/capi/capiPaint.cpp index bb040dae..383e045c 100644 --- a/test/capi/capiPaint.cpp +++ b/test/capi/capiPaint.cpp @@ -218,8 +218,16 @@ TEST_CASE("Paint Clip Path Composite Method", "[capiPaint]") REQUIRE(tvg_paint_set_composite_method(paint, NULL, TVG_COMPOSITE_METHOD_NONE) == TVG_RESULT_SUCCESS); REQUIRE(tvg_paint_set_composite_method(paint, target, TVG_COMPOSITE_METHOD_NONE) == TVG_RESULT_INVALID_ARGUMENT); - REQUIRE(tvg_paint_set_composite_method(paint, target, TVG_COMPOSITE_METHOD_CLIP_PATH) == TVG_RESULT_SUCCESS); REQUIRE(tvg_paint_set_composite_method(paint, NULL, TVG_COMPOSITE_METHOD_CLIP_PATH) == TVG_RESULT_INVALID_ARGUMENT); + REQUIRE(tvg_paint_set_composite_method(paint, target, TVG_COMPOSITE_METHOD_CLIP_PATH) == TVG_RESULT_SUCCESS); + + const Tvg_Paint* target2 = nullptr; + Tvg_Composite_Method method = TVG_COMPOSITE_METHOD_NONE; + REQUIRE(tvg_paint_get_composite_method(paint, NULL, &method) == TVG_RESULT_INVALID_ARGUMENT); + REQUIRE(tvg_paint_get_composite_method(paint, &target2, NULL) == TVG_RESULT_INVALID_ARGUMENT); + REQUIRE(tvg_paint_get_composite_method(paint, &target2, &method) == TVG_RESULT_SUCCESS); + REQUIRE(method == TVG_COMPOSITE_METHOD_CLIP_PATH); + REQUIRE(target == target2); REQUIRE(tvg_paint_del(paint) == TVG_RESULT_SUCCESS); } diff --git a/test/capi/capiPicture.cpp b/test/capi/capiPicture.cpp index f09c8cc3..f08a23a1 100644 --- a/test/capi/capiPicture.cpp +++ b/test/capi/capiPicture.cpp @@ -39,8 +39,12 @@ TEST_CASE("Load Svg file in Picture", "[capiPicture]") //Load Svg file REQUIRE(tvg_picture_load(picture, TEST_DIR"/logo.svg") == TVG_RESULT_SUCCESS); - float w, h; + float wNew = 500.0f, hNew = 500.0f; + float w = 0.0f, h = 0.0f; + REQUIRE(tvg_picture_set_size(picture, wNew, hNew) == TVG_RESULT_SUCCESS); REQUIRE(tvg_picture_get_size(picture, &w, &h) == TVG_RESULT_SUCCESS); + REQUIRE(w == Approx(wNew).epsilon(0.0000001)); + REQUIRE(h == Approx(hNew).epsilon(0.0000001)); REQUIRE(tvg_paint_del(picture) == TVG_RESULT_SUCCESS); } @@ -65,6 +69,12 @@ TEST_CASE("Load Svg Data in Picture", "[capiPicture]") REQUIRE(tvg_picture_get_size(picture, &w, &h) == TVG_RESULT_SUCCESS); REQUIRE(w == Approx(1000).epsilon(0.0000001)); REQUIRE(h == Approx(1000).epsilon(0.0000001)); + float wNew = 500.0f, hNew = 500.0f; + REQUIRE(tvg_picture_set_size(picture, wNew, hNew) == TVG_RESULT_SUCCESS); + REQUIRE(tvg_picture_get_size(picture, &w, &h) == TVG_RESULT_SUCCESS); + REQUIRE(w == Approx(wNew).epsilon(0.0000001)); + REQUIRE(h == Approx(hNew).epsilon(0.0000001)); + //Verify Position float x, y; @@ -103,6 +113,11 @@ TEST_CASE("Load Raw file in Picture", "[capiPicture]") REQUIRE(tvg_picture_get_size(picture, &w, &h) == TVG_RESULT_SUCCESS); REQUIRE(w == Approx(200).epsilon(0.0000001)); REQUIRE(h == Approx(300).epsilon(0.0000001)); + float wNew = 500.0f, hNew = 500.0f; + REQUIRE(tvg_picture_set_size(picture, wNew, hNew) == TVG_RESULT_SUCCESS); + REQUIRE(tvg_picture_get_size(picture, &w, &h) == TVG_RESULT_SUCCESS); + REQUIRE(w == Approx(wNew).epsilon(0.0000001)); + REQUIRE(h == Approx(hNew).epsilon(0.0000001)); } REQUIRE(tvg_paint_del(picture) == TVG_RESULT_SUCCESS); @@ -123,8 +138,12 @@ TEST_CASE("Load Png file in Picture", "[capiPicture]") REQUIRE(tvg_picture_load(picture, TEST_DIR"/test.png") == TVG_RESULT_SUCCESS); //Verify Size - float w, h; + float wNew = 500.0f, hNew = 500.0f; + float w = 0.0f, h = 0.0f; + REQUIRE(tvg_picture_set_size(picture, wNew, hNew) == TVG_RESULT_SUCCESS); REQUIRE(tvg_picture_get_size(picture, &w, &h) == TVG_RESULT_SUCCESS); + REQUIRE(w == Approx(wNew).epsilon(0.0000001)); + REQUIRE(h == Approx(hNew).epsilon(0.0000001)); REQUIRE(tvg_paint_del(picture) == TVG_RESULT_SUCCESS); }