Revert "Updated rununittests to contain the new unit tests"

This reverts commit 556d11099aee79545b734427761c0880d01ce24e.

2 files changed, 12 insertions, 122 deletions

diff --git a/bin/rununittests.bat b/bin/rununittests.bat
index 13fad8f821..0324cc14e8 100644
--- a/bin/rununittests.bat
+++ b/bin/rununittests.bat
@@ -46,21 +46,19 @@ set PATH=%BATCH_PATH%..\lib;%PATH%
 
 cd %BATCH_PATH%..\build\tests\bin
 
-::service framework
-tst_qserviceinterfacedescriptor.exe
+::ServiceFramework
+tst_servicemetadata.exe
 tst_servicedatabase.exe
 tst_databasemanager.exe
-tst_servicemetadata.exe
-tst_qservicefilter.exe
 tst_qservicemanager.exe
+tst_qservicefilter.exe
+tst_qserviceinterfacedescriptor.exe
 tst_qabstractsecuritysession.exe
 tst_qservicecontext.exe
-tst_headers.exe
-tst_icheck.exe
 tst_qmetaobjectbuilder.exe
-tst_qremoteserviceclassregister.exe
+tst_icheck.exe
 tst_qservicemanager_ipc.exe
-tst_qlatin1constant.exe
+tst_qremoteserviceclassregister.exe
 
 ::BearerManagement
 tst_qnetworkconfiguration.exe
@@ -68,37 +66,26 @@ tst_qnetworkconfigurationmanager.exe
 tst_qnetworksession.exe
 
 ::Location
-tst_qgeoareamonitor.exe
 tst_qgeocoordinate.exe
 tst_qgeopositioninfo.exe
-tst_qgeopositioninfosource.exe
 tst_qgeosatelliteinfo.exe
 tst_qgeosatelliteinfosource.exe
+tst_qgeopositioninfosource.exe
+tst_qgeoareamonitor.exe
 tst_qlocationutils.exe
 tst_dummynmeapositioninfosource.exe
 tst_qnmeapositioninfosource_realtime.exe
 tst_qnmeapositioninfosource_realtime_generic.exe
 tst_qnmeapositioninfosource_simulation.exe
 tst_qnmeapositioninfosource_simulation_generic.exe
-tst_qdeclarativeposition.exe
-tst_qgeoboundingbox.exe
-tst_qlandmarkfilehandler_gpx.exe
-tst_qlandmarkfilehandler_lmx.exe
-tst_qlandmarkmanagerengine.exe
-tst_qlandmarkmanagerengine_sqlite.exe
-tst_qlandmarkmanagerplugins.exe
 
 ::Landmarks
 tst_qlandmark.exe
 tst_qlandmarkcategory.exe
-tst_qdeclarativelandmark.exe
 
 ::Publish and Subscribe
-tst_qmallocpool.exe
-tst_qpacket.exe
-tst_qpacketprotocol.exe
 tst_qvaluespace.exe
-tst_qvaluespacepublisher.exe
+tst_qvaluespaceprovider.exe
 tst_qvaluespacesubscriber.exe
 tst_qvaluespacesubscriber_oop.exe
 tst_qsystemreadwritelock.exe
@@ -109,17 +96,12 @@ tst_qcrmlparser.exe
 tst_qsystemdeviceinfo.exe
 tst_qsystemdisplayinfo.exe
 tst_qsysteminfo.exe
-tst_qsystemstorageinfo.exe
 tst_qsystemnetworkinfo.exe
 tst_qsystemscreensaver.exe
+tst_qsystemstorageinfo.exe
 
 ::QMedia
 tst_qaudiocapturesource.exe
-tst_qaudiodeviceinfo.exe
-tst_qaudioformat.exe
-tst_qaudioinput.exe
-tst_qaudiooutput.exe
-tst_qcamera.exe
 tst_qgraphicsvideoitem.exe
 tst_qmediacontent.exe
 tst_qmediaimageviewer.exe
@@ -135,9 +117,6 @@ tst_qmediaserviceprovider.exe
 tst_qpaintervideosurface.exe
 tst_qradiotuner.exe
 tst_qvideowidget.exe
-tst_qmediatimerange.exe
-tst_qvideoframe.exe
-tst_qvideosurfaceformat.exe
 
 ::QContacts
 tst_qcontact.exe
@@ -150,59 +129,21 @@ tst_qcontactfilter.exe
 tst_qcontactmanager.exe
 tst_qcontactmanagerfiltering.exe
 tst_qcontactmanagerplugins.exe
-tst_qcontactmemusage.exe
 tst_qcontactrelationship.exe
 tst_qvcard21writer.exe
 tst_qvcard30writer.exe
-tst_qversit.exe
 tst_qversitcontactexporter.exe
 tst_qversitcontactimporter.exe
 tst_qversitdocument.exe
-tst_qversitorganizerexporter.exe
-tst_qversitorganizerimporter.exe
 tst_qversitproperty.exe
 tst_qversitreader.exe
 tst_qversitwriter.exe
+tst_versitutils.exe
 
 ::QMessaging
 tst_qmessage.exe
 tst_qmessagestore.exe
 tst_qmessagestorekeys.exe
-tst_qmessageservice.exe
-
-::QOrganizer
-tst_qorganizeritemmanager.exe
-tst_qorganizercollection.exe
-tst_qorganizeritem.exe
-tst_qorganizeritemasync.exe
-tst_qorganizeritemdetail.exe
-tst_qorganizeritemdetaildefinition.exe
-tst_qorganizeritemfilter.exe
-
-::QDocumentGallery
-tst_qdocumentgallery.exe
-tst_qdeclarativedocumentgalleryitem.exe
-tst_qdeclarativedocumentgallerymodel.exe
-tst_qdeclarativedocumentgallerytype.exe
-tst_qgalleryabstractrequest.exe
-tst_qgalleryabstractresponse.exe
-tst_qgalleryfilter.exe
-tst_qgalleryitemrequest.exe
-tst_qgalleryquerymodel.exe
-tst_qgalleryqueryrequest.exe
-tst_qgalleryremoverequest.exe
-tst_qgalleryresource.exe
-tst_qgallerytrackerresultset.exe
-tst_qgallerytrackerschema.exe
-tst_qgallerytyperequest.exe
-
-::Feedback
-tst_qfeedbackactuator.exe
-tst_qfeedbackhapticseffect.exe
-tst_qfeedbackplugin.exe
-
-::QSensor
-tst_qsensor.exe
 
 cd %SAVED_PWD%
 
diff --git a/bin/rununittests.sh b/bin/rununittests.sh
index e5d2351df2..becb31c281 100755
--- a/bin/rununittests.sh
+++ b/bin/rununittests.sh
@@ -64,12 +64,10 @@ cd $shell_path/../build/tests/bin
 ./tst_qservicemanager
 ./tst_qabstractsecuritysession
 ./tst_qservicecontext
-./tst_headers
 ./tst_icheck
 ./tst_qmetaobjectbuilder
 ./tst_qremoteserviceclassregister
 ./tst_qservicemanager_ipc
-./tst_qlatin1constant
 
 #BearerManagement
 ./tst_qnetworkconfiguration
@@ -90,17 +88,10 @@ cd $shell_path/../build/tests/bin
 ./tst_qnmeapositioninfosource_simulation
 ./tst_qnmeapositioninfosource_simulation_generic
 ./tst_qdeclarativeposition
-./tst_qgeoboundingbox
-./tst_qlandmarkfilehandler_gpx
-./tst_qlandmarkfilehandler_lmx
-./tst_qlandmarkmanagerengine
-./tst_qlandmarkmanagerengine_sqlite
-./tst_qlandmarkmanagerplugins
 
 #Landmarks
 ./tst_qlandmark
 ./tst_qlandmarkcategory
-./tst_qdeclarativelandmark
 
 #Publish and Subscribe
 ./tst_qmallocpool
@@ -124,11 +115,6 @@ cd $shell_path/../build/tests/bin
 
 #QMedia
 ./tst_qaudiocapturesource
-./tst_qaudiodeviceinfo
-./tst_qaudioformat
-./tst_qaudioinput
-./tst_qaudiooutput
-./tst_qcamera
 ./tst_qgraphicsvideoitem
 ./tst_qmediacontent
 ./tst_qmediaimageviewer
@@ -144,11 +130,7 @@ cd $shell_path/../build/tests/bin
 ./tst_qpaintervideosurface
 ./tst_qradiotuner
 ./tst_qvideowidget
-./tst_qmediatimerange
-./tst_qvideoframe
-./tst_qvideosurfaceformat
-
-
+a
 #QContacts
 ./tst_qcontact
 ./tst_qcontactactions
@@ -160,7 +142,6 @@ cd $shell_path/../build/tests/bin
 ./tst_qcontactmanager
 ./tst_qcontactmanagerfiltering
 ./tst_qcontactmanagerplugins
-./tst_qcontactmemusage
 ./tst_qcontactrelationship
 ./tst_qvcard21writer
 ./tst_qvcard30writer
@@ -178,41 +159,9 @@ cd $shell_path/../build/tests/bin
 ./tst_qmessage
 ./tst_qmessagestore
 ./tst_qmessagestorekeys
-./tst_qmessageservice
 
 #QOrganizer
 ./tst_qorganizeritemmanager
-./tst_qorganizercollection
-./tst_qorganizeritem
-./tst_qorganizeritemasync
-./tst_qorganizeritemdetail
-./tst_qorganizeritemdetaildefinition
-./tst_qorganizeritemfilter
-
-#QDocumentGallery
-./tst_qdocumentgallery
-./tst_qdeclarativedocumentgalleryitem
-./tst_qdeclarativedocumentgallerymodel
-./tst_qdeclarativedocumentgallerytype
-./tst_qgalleryabstractrequest
-./tst_qgalleryabstractresponse
-./tst_qgalleryfilter
-./tst_qgalleryitemrequest
-./tst_qgalleryquerymodel
-./tst_qgalleryqueryrequest
-./tst_qgalleryremoverequest
-./tst_qgalleryresource
-./tst_qgallerytrackerresultset
-./tst_qgallerytrackerschema
-./tst_qgallerytyperequest
-
-#Feedback
-./tst_qfeedbackactuator
-./tst_qfeedbackhapticseffect
-./tst_qfeedbackplugin
-
-#QSensor
-./tst_qsensor
 
 cd $SAVED_PWD