projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fixing shader generator build when coverage enabled" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-ImageView.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
index
033340f
..
29faa6d
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 202
0
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-446,6
+446,14
@@
int UtcDaliImageViewPixelArea(void)
// Test pixel area property
ToolkitTestApplication application;
// Test pixel area property
ToolkitTestApplication application;
+ static std::vector<UniformData> customUniforms =
+ {
+ UniformData("pixelArea", Property::Type::VECTOR4),
+ };
+
+ TestGraphicsController& graphics = application.GetGraphicsController();
+ graphics.AddCustomUniforms(customUniforms);
+
// Gif image, use AnimatedImageVisual internally
// Atlasing is applied to pack multiple frames, use custom wrap mode
ImageView gifView = ImageView::New();
// Gif image, use AnimatedImageVisual internally
// Atlasing is applied to pack multiple frames, use custom wrap mode
ImageView gifView = ImageView::New();
@@
-575,9
+583,9
@@
int UtcDaliImageViewAsyncLoadingWithAtlasing(void)
callStack.Enable(false);
TraceCallStack::NamedParams params;
callStack.Enable(false);
TraceCallStack::NamedParams params;
- params["width"]
= ToString(34)
;
- params["height"]
= ToString(34)
;
-
DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ), true, TEST_LOCATION );
+ params["width"]
<< 34
;
+ params["height"]
<< 34
;
+DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ), true, TEST_LOCATION );
END_TEST;
}
END_TEST;
}
@@
-616,8
+624,8
@@
int UtcDaliImageViewAsyncLoadingWithAtlasing02(void)
callStack.Enable(false);
TraceCallStack::NamedParams params;
callStack.Enable(false);
TraceCallStack::NamedParams params;
- params["width"]
= ToString(34)
;
- params["height"]
= ToString(34)
;
+ params["width"]
<< 34
;
+ params["height"]
<< 34
;
DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ), true, TEST_LOCATION );
END_TEST;
DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ), true, TEST_LOCATION );
END_TEST;
@@
-661,8
+669,8
@@
int UtcDaliImageViewSyncLoading(void)
application.Render(16);
TraceCallStack::NamedParams params;
application.Render(16);
TraceCallStack::NamedParams params;
- params["width"]
= ToString(34)
;
- params["height"]
= ToString(34)
;
+ params["width"]
<< 34
;
+ params["height"]
<< 34
;
DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ),
true, TEST_LOCATION );
}
DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ),
true, TEST_LOCATION );
}
@@
-697,8
+705,8
@@
int UtcDaliImageViewSyncLoading02(void)
application.Render(16);
TraceCallStack::NamedParams params;
application.Render(16);
TraceCallStack::NamedParams params;
- params["width"]
= ToString(34)
;
- params["height"]
= ToString(34)
;
+ params["width"]
<< 34
;
+ params["height"]
<< 34
;
DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ),
true, TEST_LOCATION );
}
DALI_TEST_EQUALS( callStack.FindMethodAndParams( "TexSubImage2D", params ),
true, TEST_LOCATION );
}