[libcommhistory] Combine tests into one package and clean up test fil…

…es. JB#52802 Combine unit-tests and performance-tests subpackages into a single libcommhistory-qt5-tests package. Instead of generating the tests.xml from individual xml files, generate it from a test.xml.in file that already contains all individual test entries. Also, combine the unit and performance tests into the same tests.xml file.
sailfishos · Mar 3, 2021 · 1aaadeb · 1aaadeb
1 parent 26b4280
commit 1aaadeb
Show file tree

Hide file tree

Showing 38 changed files with 120 additions and 277 deletions.
diff --git a/rpm/libcommhistory-qt5.spec b/rpm/libcommhistory-qt5.spec
@@ -21,18 +21,12 @@ BuildRequires:  libphonenumber-devel
 %description
 Library for accessing the communications (IM, SMS and call) history database.
 
-%package unit-tests
-Summary: Unit Test files for libcommhistory
+%package tests
+Summary: Test files for libcommhistory
 Requires: blts-tools
 
-%description unit-tests
-Unit Test files for libcommhistory
-
-%package performance-tests
-Summary: Performance Test files for libcommhistory
-
-%description performance-tests
-Performance Test files for libcommhistory
+%description tests
+Test files for libcommhistory
 
 %package tools
 Summary: Command line tools for libcommhistory
@@ -84,12 +78,6 @@ install -m 644 -p %{SOURCE1} %{buildroot}%{_datadir}/mapplauncherd/privileges.d
 %postun
 /sbin/ldconfig
 
-%post unit-tests
-for n in ut_recentcontactsmodel ut_callmodel; do
-    pathname=/opt/tests/libcommhistory-qt5-unit-tests/$n
-    chgrp privileged $pathname && chmod g+s $pathname
-done
-
 %files
 %defattr(-,root,root,-)
 %{_libdir}/libcommhistory-qt5.so*
@@ -104,13 +92,9 @@ done
 %defattr(-,root,root,-)
 %{_libdir}/qt5/qml/org/nemomobile/commhistory
 
-%files unit-tests
-%defattr(-,root,root,-)
-/opt/tests/libcommhistory-qt5-unit-tests
-
-%files performance-tests
+%files tests
 %defattr(-,root,root,-)
-/opt/tests/libcommhistory-qt5-performance-tests
+/opt/tests/libcommhistory-qt5
 
 %files devel
 %defattr(-,root,root,-)

diff --git a/tests/common.cpp b/tests/common.cpp
@@ -230,7 +230,6 @@ int addTestContact(const QString &name, const QString &remoteUid, const QString
 
     foreach (const QContactRelationship &relationship, manager()->relationships(QContactRelationship::Aggregates(), contact.id(), QContactRelationship::Second)) {
         const QContactId &aggId = relationship.first();
-        qDebug() << "********** contact id" << aggId;
         addedContactIds.insert(aggId);
         return internalContactId(aggId);
     }
@@ -265,7 +264,6 @@ QList<int> addTestContacts(const QList<QPair<QString, QPair<QString, QString> >
     foreach (const QContactRelationship &relationship, manager()->relationships(QContactRelationship::Aggregates())) {
         if (constituentIds.contains(relationship.second())) {
             const QContactId &aggId = relationship.first();
-            qDebug() << "********** contact id" << aggId;
             addedContactIds.insert(aggId);
             ids.append(internalContactId(aggId));
         }

diff --git a/tests/do_tests_xml.sh b/tests/do_tests_xml.sh
diff --git a/tests/mem_eventmodel/mem_eventmodel.pro b/tests/mem_eventmodel/mem_eventmodel.pro
@@ -25,7 +25,6 @@ include( ../../common-vars.pri )
 include( ../tests.pri )
 
 TARGET = mem_eventmodel
-DESTDIR = ../bin
 QT -= gui
 
 SOURCES += mem_eventmodel.cpp

diff --git a/tests/perf_callmodel/perf_callmodel.pro b/tests/perf_callmodel/perf_callmodel.pro
@@ -25,7 +25,6 @@ include( ../../common-vars.pri )
 include( ../performance_tests.pri )
 
 TARGET = perf_callmodel
-DESTDIR = ../perf_bin
 QT -= gui
 SOURCES += callmodelperftest.cpp
 HEADERS += callmodelperftest.h

diff --git a/tests/perf_callmodel/test_set.xml b/tests/perf_callmodel/test_set.xml
diff --git a/tests/perf_conversationmodel/perf_conversationmodel.pro b/tests/perf_conversationmodel/perf_conversationmodel.pro
@@ -25,7 +25,6 @@ include( ../../common-vars.pri )
 include( ../performance_tests.pri )
 
 TARGET = perf_conversationmodel
-DESTDIR = ../perf_bin
 QT -= gui
 SOURCES += conversationmodelperftest.cpp
 HEADERS += conversationmodelperftest.h
diff --git a/tests/perf_conversationmodel/test_set.xml b/tests/perf_conversationmodel/test_set.xml
diff --git a/tests/perf_groupmodel/perf_groupmodel.pro b/tests/perf_groupmodel/perf_groupmodel.pro
@@ -25,7 +25,6 @@ include( ../../common-vars.pri )
 include( ../performance_tests.pri )
 
 TARGET = perf_groupmodel
-DESTDIR = ../perf_bin
 QT -= gui
 SOURCES += groupmodelperftest.cpp
 HEADERS += groupmodelperftest.h
diff --git a/tests/perf_groupmodel/test_set.xml b/tests/perf_groupmodel/test_set.xml
diff --git a/tests/perf_recentcontactsmodel/perf_recentcontactsmodel.pro b/tests/perf_recentcontactsmodel/perf_recentcontactsmodel.pro
@@ -25,7 +25,6 @@ include( ../../common-vars.pri )
 include( ../performance_tests.pri )
 
 TARGET = perf_recentcontactsmodel
-DESTDIR = ../perf_bin
 QT -= gui
 SOURCES += recentcontactsmodelperftest.cpp
 HEADERS += recentcontactsmodelperftest.h

diff --git a/tests/performance_tests.pri b/tests/performance_tests.pri
@@ -38,6 +38,6 @@ DEFINES += PERF_BATCH_SIZE=25
 !include( ../common-installs-config.pri ) : \
     error( "Unable to include common-installs-config.pri!" )
 # override default path for tests
-target.path = /opt/tests/$${PROJECT_NAME}-performance-tests
+target.path = /opt/tests/$${PROJECT_NAME}/performance
 # End of File
 
diff --git a/tests/performance_tests.pro b/tests/performance_tests.pro
@@ -23,35 +23,14 @@
 !include( ../common-vars.pri ):error( "Unable to install common-vars.pri" )
 
 TEMPLATE = subdirs
-SUBDIRS = perf_callmodel \
-		  perf_conversationmodel \
-		  perf_groupmodel \
-		  perf_recentcontactsmodel \
-          profile_callmodel \
-		  profile_conversationmodel \
-		  profile_groupmodel \
-		  profile_recentcontactsmodel
 
-# make sure the destination path exists
-!system( mkdir -p $${OUT_PWD}/perf_bin ) : \
-    error( "Unable to create perf_bin dir for tests." )
+SUBDIRS = \
+    perf_callmodel \
+    perf_conversationmodel \
+    perf_groupmodel \
+    perf_recentcontactsmodel \
+    profile_callmodel \
+    profile_conversationmodel \
+    profile_groupmodel \
+    profile_recentcontactsmodel
 
-#-----------------------------------------------------------------------------
-# generate test xml
-#-----------------------------------------------------------------------------
-!system( ./do_tests_xml.sh $${OUT_PWD}/perf_bin \
-                    $${PROJECT_NAME} \
-                    performance \
-                     \"$${SUBDIRS}\" ) : \
-     error("Error running do_tests_xml.sh")
-QMAKE_CLEAN += $${OUT_PWD}/perf_bin/tests.xml
-
-#-----------------------------------------------------------------------------
-# installation setup
-#-----------------------------------------------------------------------------
-!include( ../common-installs-config.pri ) : \
-         error( "Unable to include common-installs-config.pri!" )
-perftests.files = $${OUT_PWD}/perf_bin/* \
-                  run_all_performance_tests.sh
-perftests.path  = /opt/tests/$${PROJECT_NAME}-performance-tests
-INSTALLS += perftests
diff --git a/tests/profile_callmodel/profile_callmodel.pro b/tests/profile_callmodel/profile_callmodel.pro
@@ -3,7 +3,6 @@ include( ../../common-vars.pri )
 include( ../performance_tests.pri )
 
 TARGET = profile_callmodel
-DESTDIR = ../perf_bin
 QT -= gui
 SOURCES += callmodelprofiletest.cpp
 HEADERS += callmodelprofiletest.h

diff --git a/tests/profile_conversationmodel/profile_conversationmodel.pro b/tests/profile_conversationmodel/profile_conversationmodel.pro
@@ -3,7 +3,6 @@ include( ../../common-vars.pri )
 include( ../performance_tests.pri )
 
 TARGET = profile_conversationmodel
-DESTDIR = ../perf_bin
 QT -= gui
 SOURCES += conversationmodelprofiletest.cpp
 HEADERS += conversationmodelprofiletest.h

diff --git a/tests/profile_groupmodel/profile_groupmodel.pro b/tests/profile_groupmodel/profile_groupmodel.pro
@@ -25,7 +25,6 @@ include( ../../common-vars.pri )
 include( ../performance_tests.pri )
 
 TARGET = profile_groupmodel
-DESTDIR = ../perf_bin
 QT -= gui
 SOURCES += groupmodelprofiletest.cpp
 HEADERS += groupmodelprofiletest.h
diff --git a/tests/profile_recentcontactsmodel/profile_recentcontactsmodel.pro b/tests/profile_recentcontactsmodel/profile_recentcontactsmodel.pro
@@ -25,7 +25,6 @@ include( ../../common-vars.pri )
 include( ../performance_tests.pri )
 
 TARGET = profile_recentcontactsmodel
-DESTDIR = ../perf_bin
 QT -= gui
 SOURCES += recentcontactsmodelprofiletest.cpp
 HEADERS += recentcontactsmodelprofiletest.h

diff --git a/tests/run_all_performance_tests.sh b/tests/run_all_performance_tests.sh
diff --git a/tests/run_all_tests.sh b/tests/run_all_tests.sh
diff --git a/tests/run_test.sh b/tests/run_test.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+export TESTDIR=$1
+export TESTCASE=$2
+export DEVICEUSER=$(getent passwd $(grep '^UID_MIN' /etc/login.defs |  tr -s ' ' | cut -d ' ' -f2) | sed 's/:.*//')
+export LIBCONTACTS_TEST_MODE=1
+/usr/sbin/run-blts-root /bin/su -g privileged -c "/opt/tests/libcommhistory-qt5/$TESTDIR/$TESTCASE" "$DEVICEUSER"
diff --git a/tests/tests.pri b/tests/tests.pri
@@ -35,6 +35,6 @@ HEADERS += ../common.h ../modelwatcher.h
 !include( ../common-installs-config.pri ) : \
     error( "Unable to include common-installs-config.pri!" )
 # override default path for tests
-target.path = /opt/tests/$${PROJECT_NAME}-unit-tests
+target.path = /opt/tests/$${PROJECT_NAME}/auto
 # End of File
 
diff --git a/tests/tests.pro b/tests/tests.pro
@@ -21,4 +21,5 @@
 ###############################################################################
 
 TEMPLATE = subdirs
-SUBDIRS = unit_tests.pro performance_tests.pro mem_eventmodel
+SUBDIRS = unit_tests.pro performance_tests.pro tests_xml.pro
+