From d7c84907242a6ef7ad6d405d0729d2a6a6e82777 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Sun, 17 Aug 2014 15:54:08 +0400 Subject: [PATCH] add wpasup test --- sources/test/CMakeLists.txt | 10 +++++ sources/test/testnetctl.cpp | 7 +-- sources/test/testnetctlauto.cpp | 1 + sources/test/testnetctlprofile.cpp | 1 + sources/test/testwpasup.cpp | 72 ++++++++++++++++++++++++++++++ sources/test/testwpasup.h | 42 +++++++++++++++++ 6 files changed, 127 insertions(+), 6 deletions(-) create mode 100644 sources/test/testwpasup.cpp create mode 100644 sources/test/testwpasup.h diff --git a/sources/test/CMakeLists.txt b/sources/test/CMakeLists.txt index 52a8783..142f011 100644 --- a/sources/test/CMakeLists.txt +++ b/sources/test/CMakeLists.txt @@ -18,6 +18,9 @@ set (NETCTLAUTO_SOURCES testnetctlauto.cpp) # netctl profile set (PROFILE_HEADERS testnetctlprofile.h) set (PROFILE_SOURCES testnetctlprofile.cpp) +# wpa_supplicant +set (WPASUP_HEADERS testwpasup.h) +set (WPASUP_SOURCES testwpasup.cpp) # include_path include_directories (${CMAKE_CURRENT_SOURCE_DIR}/../${PROJECT_LIBRARY}/include/ @@ -37,6 +40,7 @@ if (USE_QT5) qt5_wrap_cpp (NETCTL_MOC_SOURCES ${NETCTL_HEADERS}) qt5_wrap_cpp (NETCTLAUTO_MOC_SOURCES ${NETCTLAUTO_HEADERS}) qt5_wrap_cpp (PROFILE_MOC_SOURCES ${PROFILE_HEADERS}) + qt5_wrap_cpp (WPASUP_MOC_SOURCES ${WPASUP_HEADERS}) else () find_package (Qt4 COMPONENTS QtCore QtTest REQUIRED) include (${QT_USE_FILE}) @@ -44,6 +48,7 @@ else () qt4_wrap_cpp (NETCTL_MOC_SOURCES ${NETCTL_HEADERS}) qt4_wrap_cpp (NETCTLAUTO_MOC_SOURCES ${NETCTLAUTO_HEADERS}) qt4_wrap_cpp (PROFILE_MOC_SOURCES ${PROFILE_HEADERS}) + qt4_wrap_cpp (WPASUP_MOC_SOURCES ${WPASUP_HEADERS}) endif() # netctl @@ -55,6 +60,9 @@ target_link_libraries (${SUBPROJECT}-netctlauto ${PROJECT_LIBRARY} ${QT_NEEDED_L # netctl profile add_executable (${SUBPROJECT}-profile ${PROFILE_HEADERS} ${PROFILE_SOURCES} ${PROFILE_MOC_SOURCES}) target_link_libraries (${SUBPROJECT}-profile ${PROJECT_LIBRARY} ${QT_NEEDED_LIBS}) +# wpa_supplicant +add_executable (${SUBPROJECT}-wpasup ${WPASUP_HEADERS} ${WPASUP_SOURCES} ${WPASUP_MOC_SOURCES}) +target_link_libraries (${SUBPROJECT}-wpasup ${PROJECT_LIBRARY} ${QT_NEEDED_LIBS}) # install properties add_test (NAME Netctl COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT}-netctl @@ -63,4 +71,6 @@ add_test (NAME NetctlAuto COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT}-netc "-o" "../Testing/output-netctlauto.log") add_test (NAME Profile COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT}-profile "-o" "../Testing/output-profile.log") +add_test (NAME WpaSup COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT}-wpasup + "-o" "../Testing/output-wpasup.log") diff --git a/sources/test/testnetctl.cpp b/sources/test/testnetctl.cpp index edb5e1e..4f65812 100644 --- a/sources/test/testnetctl.cpp +++ b/sources/test/testnetctl.cpp @@ -69,6 +69,7 @@ void TestNetctl::removeTestProfile() void TestNetctl::initTestCase() { qDebug() << "netctlgui library tests"; + qDebug() << "Netctl class tests (netctl functions)"; qDebug() << "TODO: unfortunately, some functions which is required to work"; qDebug() << "with the working profile isn't tested here (including netctl-auto)"; QWARN("Some functions requires root privileges"); @@ -85,21 +86,15 @@ void TestNetctl::cleanupTestCase() void TestNetctl::test_getRecommendedConfiguration() { QStringList original; -// original.append(QString("CTRL_DIR==/run/wpa_supplicant_netctl-gui")); -// original.append(QString("CTRL_GROUP==network")); original.append(QString("FORCE_SUDO==false")); original.append(QString("IFACE_DIR==/sys/class/net")); original.append(QString("NETCTLAUTO_PATH==/usr/bin/netctl-auto")); original.append(QString("NETCTLAUTO_SERVICE==netctl-auto")); original.append(QString("NETCTL_PATH==/usr/bin/netctl")); -// original.append(QString("PID_FILE==/run/wpa_supplicant_netctl-gui.pid")); original.append(QString("PREFERED_IFACE==wifi0")); original.append(QString("PROFILE_DIR==/etc/netctl")); original.append(QString("SUDO_PATH==/usr/bin/sudo")); original.append(QString("SYSTEMCTL_PATH==/usr/bin/systemctl")); -// original.append(QString("WPACLI_PATH==/usr/bin/wpa_cli")); -// original.append(QString("WPASUP_PATH==/usr/bin/wpa_supplicant")); -// original.append(QString("WPA_DRIVERS==nl80211,wext")); QMap resultMap = Netctl::getRecommendedConfiguration(); QStringList result; for (int i=0; i + +#include + + +WpaSup *TestWpaSup::createWpaSupObj() +{ + QMap settings = WpaSup::getRecommendedConfiguration(); + settings[QString("FORCE_SUDO")] = QString("true"); + WpaSup *wpasup = new WpaSup(false, settings); + + return wpasup; +} + + +void TestWpaSup::initTestCase() +{ + qDebug() << "netctlgui library tests"; + qDebug() << "WpaSup class tests"; + qDebug() << "TODO: unfortunately, some functions which is required to work"; + qDebug() << "with the working profile isn't tested here (including netctl-auto)"; + QWARN("Some functions requires root privileges"); +} + + +void TestWpaSup::cleanupTestCase() +{ +} + + +void TestWpaSup::test_getRecommendedConfiguration() +{ + QStringList original; + original.append(QString("CTRL_DIR==/run/wpa_supplicant_netctl-gui")); + original.append(QString("CTRL_GROUP==network")); + original.append(QString("FORCE_SUDO==false")); + original.append(QString("PID_FILE==/run/wpa_supplicant_netctl-gui.pid")); + original.append(QString("SUDO_PATH==/usr/bin/sudo")); + original.append(QString("WPACLI_PATH==/usr/bin/wpa_cli")); + original.append(QString("WPASUP_PATH==/usr/bin/wpa_supplicant")); + original.append(QString("WPA_DRIVERS==nl80211,wext")); + QMap resultMap = WpaSup::getRecommendedConfiguration(); + QStringList result; + for (int i=0; i + + +class WpaSup; + +class TestWpaSup : public QObject +{ + Q_OBJECT + +private slots: + // initialization + void initTestCase(); + void cleanupTestCase(); + // wpa_supplicant + void test_getRecommendedConfiguration(); + +private: + WpaSup *createWpaSupObj(); +}; + + +#endif /* TESTWPASUP_H */