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
Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal"
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-singleton-service.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp
index
d8efd70
..
e8c2e8d
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-singleton-service.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
8
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.
@@
-15,9
+15,9
@@
*
*/
*
*/
-#include <
dali/devel-api/adaptor-framework/
singleton-service.h>
+#include <
toolkit-
singleton-service.h>
-#include <dali
/public-api/common/dali
-common.h>
+#include <dali
-toolkit/public-api/dali-toolkit
-common.h>
#include <dali/public-api/object/base-object.h>
#include <dali/devel-api/common/map-wrapper.h>
#include <dali/public-api/signals/dali-signal.h>
#include <dali/public-api/object/base-object.h>
#include <dali/devel-api/common/map-wrapper.h>
#include <dali/public-api/signals/dali-signal.h>
@@
-74,6
+74,13
@@
public:
if( singleton )
{
mSingletonContainer.insert( SingletonPair( info.name(), singleton ) );
if( singleton )
{
mSingletonContainer.insert( SingletonPair( info.name(), singleton ) );
+
+ Integration::Processor* processor = dynamic_cast<Integration::Processor*>( &singleton.GetBaseObject() );
+ if( processor )
+ {
+ Integration::Core& core = mTestApplication->GetCore();
+ core.RegisterProcessor( *processor );
+ }
}
}
}
}
@@
-100,6
+107,11
@@
public:
return object;
}
return object;
}
+ void SetApplication( Dali::TestApplication& testApplication )
+ {
+ mTestApplication = &testApplication;
+ }
+
private:
/**
private:
/**
@@
-132,6
+144,7
@@
private:
typedef SingletonContainer::const_iterator SingletonConstIter;
SingletonContainer mSingletonContainer; ///< The container to look up singleton by its type name
typedef SingletonContainer::const_iterator SingletonConstIter;
SingletonContainer mSingletonContainer; ///< The container to look up singleton by its type name
+ TestApplication* mTestApplication;
};
} // namespace Adaptor
};
} // namespace Adaptor
@@
-192,3
+205,14
@@
SingletonService::SingletonService( Internal::Adaptor::SingletonService* singlet
}
} // namespace Dali
}
} // namespace Dali
+
+
+namespace Test
+{
+
+void SetApplication( Dali::SingletonService singletonService, TestApplication& testApplication )
+{
+ GetImplementation( singletonService ).SetApplication( testApplication );
+}
+
+} // Test