Move tabbox/autotests to autotests/tabbox

Let's have all autotests in autotests subdirectory instead of spread
out over the source tree.
This commit is contained in:
Martin Gräßlin 2016-06-29 10:38:17 +02:00
parent d6dd4af8cf
commit 50569a2580
12 changed files with 19 additions and 20 deletions

View file

@ -5,6 +5,7 @@ add_subdirectory(integration)
if (HAVE_INPUT)
add_subdirectory(libinput)
endif()
add_subdirectory(tabbox)
########################################################
# Test ScreenPaintData

View file

@ -4,11 +4,11 @@ add_definitions(-DKWIN_UNIT_TEST)
# Test TabBox::ClientModel
########################################################
set( testTabBoxClientModel_SRCS
../clientmodel.cpp
../desktopmodel.cpp
../tabboxconfig.cpp
../tabboxhandler.cpp
../tabbox_logging.cpp
../../tabbox/clientmodel.cpp
../../tabbox/desktopmodel.cpp
../../tabbox/tabboxconfig.cpp
../../tabbox/tabboxhandler.cpp
../../tabbox/tabbox_logging.cpp
test_tabbox_clientmodel.cpp
mock_tabboxhandler.cpp
mock_tabboxclient.cpp
@ -34,11 +34,11 @@ ecm_mark_as_test(testTabBoxClientModel)
# Test TabBox::TabBoxHandler
########################################################
set( testTabBoxHandler_SRCS
../clientmodel.cpp
../desktopmodel.cpp
../tabboxconfig.cpp
../tabboxhandler.cpp
../tabbox_logging.cpp
../../tabbox/clientmodel.cpp
../../tabbox/desktopmodel.cpp
../../tabbox/tabboxconfig.cpp
../../tabbox/tabboxhandler.cpp
../../tabbox/tabbox_logging.cpp
test_tabbox_handler.cpp
mock_tabboxhandler.cpp
mock_tabboxclient.cpp
@ -64,8 +64,8 @@ ecm_mark_as_test(testTabBoxHandler)
# Test TabBox::TabBoxConfig
########################################################
set( testTabBoxConfig_SRCS
../tabboxconfig.cpp
../tabbox_logging.cpp
../../tabbox/tabboxconfig.cpp
../../tabbox/tabbox_logging.cpp
test_tabbox_config.cpp
)
@ -79,8 +79,8 @@ ecm_mark_as_test(testTabBoxConfig)
# Test TabBox::DesktopChainManager
########################################################
set( testDesktopChain_SRCS
../desktopchain.cpp
../tabbox_logging.cpp
../../tabbox/desktopchain.cpp
../../tabbox/tabbox_logging.cpp
test_desktopchain.cpp
)

View file

@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef KWIN_MOCK_TABBOX_CLIENT_H
#define KWIN_MOCK_TABBOX_CLIENT_H
#include "../tabboxhandler.h"
#include "../../tabbox/tabboxhandler.h"
#include <QIcon>

View file

@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef KWIN_MOCK_TABBOX_HANDLER_H
#define KWIN_MOCK_TABBOX_HANDLER_H
#include "../tabboxhandler.h"
#include "../../tabbox/tabboxhandler.h"
namespace KWin
{
class MockTabBoxHandler : public TabBox::TabBoxHandler

View file

@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
// KWin
#include "../desktopchain.h"
#include "../../tabbox/desktopchain.h"
#include <QTest>

View file

@ -17,7 +17,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#include "../tabboxconfig.h"
#include "../../tabbox/tabboxconfig.h"
#include <QtTest/QtTest>
using namespace KWin;
using namespace KWin::TabBox;

View file

@ -1,5 +1,3 @@
add_subdirectory( autotests )
# Install the KWin/WindowSwitcher service type
install( FILES kwinwindowswitcher.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES kwindesktopswitcher.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )