atria-soft/esignal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] continue removing stl

Browse Source
This commit is contained in:
Edouard DUPIN
2017-08-28 00:05:07 +02:00
parent 9bab81a1ad
commit 44cba70919
17 changed files with 118 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/declareSignals.cpp
View File

@@ -9,6 +9,6 @@
#include <etk/types.hpp>
ESIGNAL_DECLARE_SIGNAL(int32_t, std::string);
ESIGNAL_DECLARE_SIGNAL(int32_t, etk::String);

2
test/main.cpp
View File

@@ -16,7 +16,7 @@ int main(int _argc, const char *_argv[]) {
::testing::InitGoogleTest(&_argc, const_cast<char **>(_argv));
etk::init(_argc, _argv);
for (int32_t iii=0; iii<_argc ; ++iii) {
std::string data = _argv[iii];
etk::String data = _argv[iii];
if ( data == "-h"
|| data == "--help") {
TEST_PRINT("esignal-test - help : ");

14
test/test_isignal.cpp
View File

@@ -17,7 +17,7 @@
class testISignal : public esignal::Interface {
public:
esignal::Signal<int32_t> m_signalInt;
esignal::Signal<std::string> m_signalString;
esignal::Signal<etk::String> m_signalString;
esignal::Signal<float> m_signalFloat;
public:
size_t m_count;
@@ -37,10 +37,10 @@ TEST(test_isignal_counter, localbasicCounter1) {
testISignal localClass;
EXPECT_EQ(localClass.m_signalString.size(), 0);
EXPECT_EQ(localClass.m_signalString.empty(), true);
esignal::Connection connection1 = localClass.m_signalString.connect([=](std::string){});
esignal::Connection connection1 = localClass.m_signalString.connect([=](etk::String){});
EXPECT_EQ(localClass.m_signalString.size(), 1);
EXPECT_EQ(localClass.m_signalString.empty(), false);
esignal::Connection connection2 = localClass.m_signalString.connect([=](std::string){});
esignal::Connection connection2 = localClass.m_signalString.connect([=](etk::String){});
EXPECT_EQ(localClass.m_signalString.size(), 2);
EXPECT_EQ(localClass.m_signalString.empty(), false);
connection1.disconnect();
@@ -96,10 +96,10 @@ class testCallbackIShared : public ememory::EnableSharedFromThis<testCallbackISh
TEST(test_isignal_counter, localbasicInterfaceGetListSignal) {
testISignal localClass;
std::vector<std::string> list;
list.push_back("int");
list.push_back("string");
list.push_back("float");
etk::Vector<etk::String> list;
list.pushBack("int");
list.pushBack("string");
list.pushBack("float");
EXPECT_EQ(localClass.signals.getAll(), list);
}

26
test/test_signal_class_func.cpp
View File

@@ -16,7 +16,7 @@
class testCallback {
public:
int32_t m_int32;
std::string m_string;
etk::String m_string;
bool m_void;
testCallback() {
m_emptyFunctor = nullptr;
@@ -40,30 +40,30 @@ class testCallback {
TEST_VERBOSE("event a=" << _a);
m_int32 = _a;
}
void callbackString(std::string _b){
void callbackString(etk::String _b){
TEST_VERBOSE("event b=" << _b);
m_string = _b;
}
void callbackConstString(const std::string& _b){
void callbackConstString(const etk::String& _b){
TEST_VERBOSE("event b=" << _b);
m_string = _b;
}
void callbackIntString(int32_t _a, std::string _b){
void callbackIntString(int32_t _a, etk::String _b){
TEST_VERBOSE("event a=" << _a << " b=" << _b);
m_int32 = _a;
m_string = _b;
}
void callbackConstIntString(const int32_t& _a, const std::string& _b){
void callbackConstIntString(const int32_t& _a, const etk::String& _b){
TEST_VERBOSE("event a=" << _a << " b=" << _b);
m_int32 = _a;
m_string = _b;
}
void callbackMixedIntString(int32_t _a, const std::string& _b){
void callbackMixedIntString(int32_t _a, const etk::String& _b){
TEST_VERBOSE("event a=" << _a << " b=" << _b);
m_int32 = _a;
m_string = _b;
}
void callbackPolyargs(const int32_t& _a, const std::string& _b, char _char, int _int) {
void callbackPolyargs(const int32_t& _a, const etk::String& _b, char _char, int _int) {
TEST_VERBOSE("event a=" << _a << " b=" << _b << " _char=" << _char << " _int=" << _int);
m_int32 = _a + _int;
m_string = _b + _char;
@@ -168,7 +168,7 @@ TEST(test_signal_class_func, localFunctionConstInt32) {
TEST(test_signal_class_func, localFunctionString) {
testCallback localClass;
esignal::Signal<std::string> signal;
esignal::Signal<etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&localClass, &testCallback::callbackString);
@@ -180,7 +180,7 @@ TEST(test_signal_class_func, localFunctionString) {
TEST(test_signal_class_func, localFunctionConstString) {
testCallback localClass;
esignal::Signal<std::string> signal;
esignal::Signal<etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&localClass, &testCallback::callbackConstString);
@@ -192,7 +192,7 @@ TEST(test_signal_class_func, localFunctionConstString) {
TEST(test_signal_class_func, localFunctionIntString) {
testCallback localClass;
esignal::Signal<int32_t, std::string> signal;
esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&localClass, &testCallback::callbackIntString);
@@ -205,7 +205,7 @@ TEST(test_signal_class_func, localFunctionIntString) {
TEST(test_signal_class_func, localFunctionConstIntString) {
testCallback localClass;
esignal::Signal<int32_t, std::string> signal;
esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&localClass, &testCallback::callbackConstIntString);
@@ -218,7 +218,7 @@ TEST(test_signal_class_func, localFunctionConstIntString) {
TEST(test_signal_class_func, localFunctionMixedIntString) {
testCallback localClass;
esignal::Signal<int32_t, std::string> signal;
esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&localClass, &testCallback::callbackMixedIntString);
@@ -231,7 +231,7 @@ TEST(test_signal_class_func, localFunctionMixedIntString) {
TEST(test_signal_class_func, localFunctionConstIntStringPolyArg) {
testCallback localClass;
esignal::Signal<int32_t, std::string> signal;
esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&localClass, &testCallback::callbackPolyargs, 'c', 12365);

12
test/test_signal_counter.cpp
View File

@@ -15,7 +15,7 @@
class testCounter {
public:
esignal::Signal<std::string> m_signal;
esignal::Signal<etk::String> m_signal;
public:
size_t m_int32;
testCounter():
@@ -33,11 +33,11 @@ TEST(test_signal_counter, localbasicCounter) {
EXPECT_EQ(localClass.m_signal.size(), 0);
EXPECT_EQ(localClass.m_signal.empty(), true);
EXPECT_EQ(localClass.m_int32, 0);
esignal::Connection connection1 = localClass.m_signal.connect([=](std::string){});
esignal::Connection connection1 = localClass.m_signal.connect([=](etk::String){});
EXPECT_EQ(localClass.m_signal.size(), 1);
EXPECT_EQ(localClass.m_signal.empty(), false);
EXPECT_EQ(localClass.m_int32, 1);
esignal::Connection connection2 = localClass.m_signal.connect([=](std::string){});
esignal::Connection connection2 = localClass.m_signal.connect([=](etk::String){});
EXPECT_EQ(localClass.m_signal.size(), 2);
EXPECT_EQ(localClass.m_signal.empty(), false);
EXPECT_EQ(localClass.m_int32, 2);
@@ -57,11 +57,11 @@ TEST(test_signal_counter, localbasicCopy) {
EXPECT_EQ(localClass.m_signal.size(), 0);
EXPECT_EQ(localClass.m_signal.empty(), true);
EXPECT_EQ(localClass.m_int32, 0);
esignal::Connection connection1 = localClass.m_signal.connect([=](std::string){});
esignal::Connection connection1 = localClass.m_signal.connect([=](etk::String){});
EXPECT_EQ(localClass.m_signal.size(), 1);
EXPECT_EQ(localClass.m_signal.empty(), false);
EXPECT_EQ(localClass.m_int32, 1);
esignal::Connection connection2 = std::move(connection1);
esignal::Connection connection2 = etk::move(connection1);
EXPECT_EQ(localClass.m_signal.size(), 1);
EXPECT_EQ(localClass.m_signal.empty(), false);
EXPECT_EQ(localClass.m_int32, 1);
@@ -81,7 +81,7 @@ TEST(test_signal_counter, localbasicCheckConnection) {
EXPECT_EQ(localClass.m_signal.size(), 0);
EXPECT_EQ(localClass.m_signal.empty(), true);
EXPECT_EQ(localClass.m_int32, 0);
esignal::Connection connection1 = localClass.m_signal.connect([=](std::string){});
esignal::Connection connection1 = localClass.m_signal.connect([=](etk::String){});
EXPECT_EQ(connection1.isConnected(), true);
connection1.disconnect();
EXPECT_EQ(connection1.isConnected(), false);

30
test/test_signal_shared_ptr_func.cpp
View File

@@ -16,7 +16,7 @@
class testCallbackShared : public ememory::EnableSharedFromThis<testCallbackShared> {
public:
int32_t m_int32;
std::string m_string;
etk::String m_string;
bool m_void;
testCallbackShared() {
m_emptyFunctor = nullptr;
@@ -45,30 +45,30 @@ class testCallbackShared : public ememory::EnableSharedFromThis<testCallbackShar
TEST_VERBOSE("event a=" << _a);
m_int32 = _a;
}
void callbackString(std::string _b) {
void callbackString(etk::String _b) {
TEST_VERBOSE("event b=" << _b);
m_string = _b;
}
void callbackConstString(const std::string& _b) {
void callbackConstString(const etk::String& _b) {
TEST_VERBOSE("event b=" << _b);
m_string = _b;
}
void callbackIntString(int32_t _a, std::string _b) {
void callbackIntString(int32_t _a, etk::String _b) {
TEST_VERBOSE("event a=" << _a << " b=" << _b);
m_int32 = _a;
m_string = _b;
}
void callbackConstIntString(const int32_t& _a, const std::string& _b) {
void callbackConstIntString(const int32_t& _a, const etk::String& _b) {
TEST_VERBOSE("event a=" << _a << " b=" << _b);
m_int32 = _a;
m_string = _b;
}
void callbackMixedIntString(int32_t _a, const std::string& _b) {
void callbackMixedIntString(int32_t _a, const etk::String& _b) {
TEST_VERBOSE("event a=" << _a << " b=" << _b);
m_int32 = _a;
m_string = _b;
}
void callbackPolyargs(const int32_t& _a, const std::string& _b, char _char, int _int) {
void callbackPolyargs(const int32_t& _a, const etk::String& _b, char _char, int _int) {
TEST_VERBOSE("event a=" << _a << " b=" << _b << " _char=" << _char << " _int=" << _int);
m_int32 = _a + _int;
m_string = _b + _char;
@@ -149,7 +149,7 @@ TEST(test_signal_shared_ptr_func, localFunctionConstInt32) {
TEST(test_signal_shared_ptr_func, localFunctionString) {
ememory::SharedPtr<testCallbackShared> localClass = ememory::makeShared<testCallbackShared>();
esignal::Signal<std::string> signal;
esignal::Signal<etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
#if 0
@@ -165,7 +165,7 @@ TEST(test_signal_shared_ptr_func, localFunctionString) {
TEST(test_signal_shared_ptr_func, localFunctionConstString) {
ememory::SharedPtr<testCallbackShared> localClass = ememory::makeShared<testCallbackShared>();
esignal::Signal<std::string> signal;
esignal::Signal<etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
signal.connect(localClass, &testCallbackShared::callbackConstString);
@@ -177,7 +177,7 @@ TEST(test_signal_shared_ptr_func, localFunctionConstString) {
TEST(test_signal_shared_ptr_func, localFunctionIntString) {
ememory::SharedPtr<testCallbackShared> localClass = ememory::makeShared<testCallbackShared>();
esignal::Signal<int32_t, std::string> signal;
esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
#if 0
@@ -194,7 +194,7 @@ TEST(test_signal_shared_ptr_func, localFunctionIntString) {
TEST(test_signal_shared_ptr_func, localFunctionConstIntString) {
ememory::SharedPtr<testCallbackShared> localClass = ememory::makeShared<testCallbackShared>();
esignal::Signal<int32_t, std::string> signal;
esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
signal.connect(localClass, &testCallbackShared::callbackConstIntString);
@@ -207,7 +207,7 @@ TEST(test_signal_shared_ptr_func, localFunctionConstIntString) {
TEST(test_signal_shared_ptr_func, localFunctionMixedIntString) {
ememory::SharedPtr<testCallbackShared> localClass = ememory::makeShared<testCallbackShared>();
esignal::Signal<int32_t, std::string> signal;
esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
#if 0
@@ -225,7 +225,7 @@ TEST(test_signal_shared_ptr_func, localFunctionMixedIntString) {
TEST(test_signal_shared_ptr_func, localFunctionConstIntStringPolyArg) {
ememory::SharedPtr<testCallbackShared> localClass = ememory::makeShared<testCallbackShared>();
esignal::Signal<int32_t, std::string> signal;
esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
signal.connect(localClass, &testCallbackShared::callbackPolyargs, 'c', 12365);
@@ -238,7 +238,7 @@ TEST(test_signal_shared_ptr_func, localFunctionConstIntStringPolyArg) {
class testCallbackSharedHerited : public testCallbackShared {
public:
void callbackHerited(const int32_t& _a, const std::string& _b) {
void callbackHerited(const int32_t& _a, const etk::String& _b) {
m_int32 = _a;
m_string = _b;
}
@@ -247,7 +247,7 @@ class testCallbackSharedHerited : public testCallbackShared {
TEST(test_signal_shared_ptr_func, localFunctionHerited) {
ememory::SharedPtr<testCallbackSharedHerited> localClass = ememory::makeShared<testCallbackSharedHerited>();
esignal::Signal<int32_t, std::string> signal;
esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
signal.connect(localClass, &testCallbackSharedHerited::callbackHerited);

32
test/test_signal_static_func.cpp
View File

@@ -14,7 +14,7 @@
#include <test-debug/debug.hpp>
static int32_t tmpRetInt32 = 0;
static std::string tmpRetString = "";
static etk::String tmpRetString = "";
static bool tmpRetVoid = false;
static void clear() {
@@ -38,35 +38,35 @@ static void callbackConstInt(const int32_t& _a){
tmpRetInt32 = _a;
};
static void callbackString(std::string _b){
static void callbackString(etk::String _b){
TEST_VERBOSE("event b=" << _b);
tmpRetString = _b;
};
static void callbackConstString(const std::string& _b){
static void callbackConstString(const etk::String& _b){
TEST_VERBOSE("event b=" << _b);
tmpRetString = _b;
};
static void callbackIntString(int32_t _a, std::string _b){
static void callbackIntString(int32_t _a, etk::String _b){
TEST_VERBOSE("event a=" << _a << " b=" << _b);
tmpRetInt32 = _a;
tmpRetString = _b;
};
static void callbackConstIntString(const int32_t& _a, const std::string& _b){
static void callbackConstIntString(const int32_t& _a, const etk::String& _b){
TEST_VERBOSE("event a=" << _a << " b=" << _b);
tmpRetInt32 = _a;
tmpRetString = _b;
};
static void callbackMixedIntString(int32_t _a, const std::string& _b){
static void callbackMixedIntString(int32_t _a, const etk::String& _b){
TEST_VERBOSE("event a=" << _a << " b=" << _b);
tmpRetInt32 = _a;
tmpRetString = _b;
};
static void callbackPolyargs(const int32_t& _a, const std::string& _b, char _char, int _int) {
static void callbackPolyargs(const int32_t& _a, const etk::String& _b, char _char, int _int) {
TEST_VERBOSE("event a=" << _a << " b=" << _b << " _char=" << _char << " _int=" << _int);
tmpRetInt32 = _a + _int;
tmpRetString = _b + _char;
@@ -110,7 +110,7 @@ TEST(test_signal_static_func, localFunctionConstInt32) {
TEST(test_signal_static_func, localFunctionString) {
clear();
esignal::Signal<std::string> signal;
esignal::Signal<etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&callbackString);
@@ -122,7 +122,7 @@ TEST(test_signal_static_func, localFunctionString) {
TEST(test_signal_static_func, localFunctionConstString) {
clear();
esignal::Signal<std::string> signal;
esignal::Signal<etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&callbackConstString);
@@ -134,7 +134,7 @@ TEST(test_signal_static_func, localFunctionConstString) {
TEST(test_signal_static_func, localFunctionIntString) {
clear();
esignal::Signal<int32_t, std::string> signal;
esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&callbackIntString);
@@ -147,7 +147,7 @@ TEST(test_signal_static_func, localFunctionIntString) {
TEST(test_signal_static_func, localFunctionConstIntString) {
clear();
esignal::Signal<int32_t, std::string> signal;
esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&callbackConstIntString);
@@ -160,7 +160,7 @@ TEST(test_signal_static_func, localFunctionConstIntString) {
TEST(test_signal_static_func, localFunctionMixedIntString) {
clear();
esignal::Signal<int32_t, std::string> signal;
esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&callbackMixedIntString);
@@ -180,7 +180,7 @@ TEST(test_signal_static_func, localFunctionMixedIntString) {
}
TEST(test_signal_static_func, localFunctionConstIntStringPolyArg) {
clear();
esignal::Signal<int32_t, std::string> signal;
esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(complete_args(&callbackPolyargs, 'c', 12365));
@@ -204,7 +204,7 @@ TEST(test_signal_static_func, localFunctionMixedIntString) {
#if 0
TEST(test_signal_static_func, localFunctionConstIntStringPolyArgWithJAJA) {
clear();
esignal::Signal<int32_t, std::string> signal;
esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(&callbackPolyargs, 'c', 12365);
@@ -218,11 +218,11 @@ TEST(test_signal_static_func, localFunctionConstIntStringPolyArgWithJAJA) {
TEST(test_signal_static_func, localFunctionLambda) {
clear();
esignal::Signal<int32_t, std::string> signal;
esignal::Signal<int32_t, etk::String> signal;
EXPECT_EQ(signal.size(), 0);
EXPECT_EQ(signal.empty(), true);
esignal::Connection connection1 = signal.connect(
[](int32_t _a, const std::string& _b) {
[](int32_t _a, const etk::String& _b) {
tmpRetInt32 = _a;
tmpRetString = _b;
}