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
(Vector) Ensure that all animation data is applied at once
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-ImageAtlas.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
index
848a282
..
90af333
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
@@
-21,9
+21,6
@@
#include <dali-toolkit-test-suite-utils.h>
#include <toolkit-event-thread-callback.h>
#include <dali-toolkit/devel-api/image-loader/image-atlas.h>
#include <dali-toolkit-test-suite-utils.h>
#include <toolkit-event-thread-callback.h>
#include <dali-toolkit/devel-api/image-loader/image-atlas.h>
-#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
-
-#include <dali-toolkit/public-api/controls/image-view/image-view.h>
#include <dali-toolkit/dali-toolkit.h>
using namespace Dali;
#include <dali-toolkit/dali-toolkit.h>
using namespace Dali;
@@
-279,7
+276,7
@@
int UtcDaliImageAtlasUploadP(void)
int UtcDaliImageAtlasUploadWithObserver01(void)
{
int UtcDaliImageAtlasUploadWithObserver01(void)
{
- TestApplication application;
+ T
oolkitT
estApplication application;
ImageAtlas atlas = ImageAtlas::New( 200, 200 );
ImageAtlas atlas = ImageAtlas::New( 200, 200 );
@@
-306,7
+303,7
@@
int UtcDaliImageAtlasUploadWithObserver01(void)
int UtcDaliImageAtlasUploadWithObserver02(void)
{
int UtcDaliImageAtlasUploadWithObserver02(void)
{
- TestApplication application;
+ T
oolkitT
estApplication application;
ImageAtlas atlas = ImageAtlas::New( 200, 200 );
gCountOfTestFuncCall = 0;
ImageAtlas atlas = ImageAtlas::New( 200, 200 );
gCountOfTestFuncCall = 0;
@@
-336,7
+333,7
@@
int UtcDaliImageAtlasUploadWithObserver02(void)
int UtcDaliImageAtlasUploadWithObserver03(void)
{
int UtcDaliImageAtlasUploadWithObserver03(void)
{
- TestApplication application;
+ T
oolkitT
estApplication application;
gCountOfTestFuncCall = 0;
TestUploadObserver* uploadObserver = new TestUploadObserver;
gCountOfTestFuncCall = 0;
TestUploadObserver* uploadObserver = new TestUploadObserver;
@@
-367,7
+364,7
@@
int UtcDaliImageAtlasUploadWithObserver03(void)
int UtcDaliImageAtlasRemove(void)
{
int UtcDaliImageAtlasRemove(void)
{
- TestApplication application;
+ T
oolkitT
estApplication application;
unsigned int size = 100;
ImageAtlas atlas = ImageAtlas::New( size, size );
Vector4 textureRect1;
unsigned int size = 100;
ImageAtlas atlas = ImageAtlas::New( size, size );
Vector4 textureRect1;
@@
-399,14
+396,14
@@
int UtcDaliImageAtlasImageView(void)
imageMap1[ ImageVisual::Property::URL ] = gImage_34_RGBA;
imageMap1[ ImageVisual::Property::DESIRED_HEIGHT ] = 34;
imageMap1[ ImageVisual::Property::DESIRED_WIDTH ] = 34;
imageMap1[ ImageVisual::Property::URL ] = gImage_34_RGBA;
imageMap1[ ImageVisual::Property::DESIRED_HEIGHT ] = 34;
imageMap1[ ImageVisual::Property::DESIRED_WIDTH ] = 34;
- imageMap1[
Devel
ImageVisual::Property::ATLASING] = true;
+ imageMap1[ ImageVisual::Property::ATLASING] = true;
Property::Map imageMap2;
imageMap2[ ImageVisual::Property::URL ] = gImage_50_RGBA;
imageMap2[ ImageVisual::Property::DESIRED_HEIGHT ] = 50;
imageMap2[ ImageVisual::Property::DESIRED_WIDTH ] = 50;
Property::Map imageMap2;
imageMap2[ ImageVisual::Property::URL ] = gImage_50_RGBA;
imageMap2[ ImageVisual::Property::DESIRED_HEIGHT ] = 50;
imageMap2[ ImageVisual::Property::DESIRED_WIDTH ] = 50;
- imageMap2[
Devel
ImageVisual::Property::ATLASING ] = true;
+ imageMap2[ ImageVisual::Property::ATLASING ] = true;
ImageView imageView1 = ImageView::New();
imageView1.SetProperty( ImageView::Property::IMAGE, imageMap1 );
ImageView imageView1 = ImageView::New();
imageView1.SetProperty( ImageView::Property::IMAGE, imageMap1 );
@@
-415,8
+412,8
@@
int UtcDaliImageAtlasImageView(void)
imageView2.SetProperty( ImageView::Property::IMAGE, imageMap2 );
// ImageView doesn't do size negotiation properly: it only listens to OnSizeSet:
imageView2.SetProperty( ImageView::Property::IMAGE, imageMap2 );
// ImageView doesn't do size negotiation properly: it only listens to OnSizeSet:
- imageView1.Set
Size( 100, 100
);
- imageView2.Set
Size( 100, 100
);
+ imageView1.Set
Property( Actor::Property::SIZE, Vector2( 100, 100 )
);
+ imageView2.Set
Property( Actor::Property::SIZE, Vector2( 100, 100 )
);
imageView1.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
imageView2.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
imageView1.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
imageView2.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
@@
-460,7
+457,7
@@
int UtcDaliImageAtlasImageView(void)
imageMap3[ ImageVisual::Property::URL ] = gImage_128_RGB;
imageMap3[ ImageVisual::Property::DESIRED_HEIGHT ] = 100;
imageMap3[ ImageVisual::Property::DESIRED_WIDTH ] = 100;
imageMap3[ ImageVisual::Property::URL ] = gImage_128_RGB;
imageMap3[ ImageVisual::Property::DESIRED_HEIGHT ] = 100;
imageMap3[ ImageVisual::Property::DESIRED_WIDTH ] = 100;
- imageMap3[
Devel
ImageVisual::Property::ATLASING ] = true;
+ imageMap3[ ImageVisual::Property::ATLASING ] = true;
ImageView imageView3 = ImageView::New();
imageView3.SetProperty( ImageView::Property::IMAGE, imageMap3 );
ImageView imageView3 = ImageView::New();
imageView3.SetProperty( ImageView::Property::IMAGE, imageMap3 );