summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Loehning <robert.loehning@nokia.com>2012-06-01 17:58:56 +0200
committerRobert Löhning <robert.loehning@nokia.com>2012-06-04 14:58:33 +0200
commit046f42b2821b3c595c318af1ec088b7df104b01f (patch)
tree7d3f5178b9eea64de12a99ff1d6ab9524729a037
parent0853fa077bbf90acca5efd5dd4f90f2276afb178 (diff)
downloadqt-creator-046f42b2821b3c595c318af1ec088b7df104b01f.tar.gz
Squish: Removed unused code and data
Change-Id: I20df2aa148002ecb9b1526df125daf04bc76010e Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
-rw-r--r--tests/system/objects.map2
-rw-r--r--tests/system/suite_general/shared/testdata/creator_tree.tsv1
-rw-r--r--tests/system/suite_general/shared/testdata/qt_tree.tsv3
-rw-r--r--tests/system/suite_general/shared/testdata/speedcrunch_tree.tsv1
-rw-r--r--tests/system/suite_general/tst_build_speedcrunch/test.py6
-rw-r--r--tests/system/suite_general/tst_cmake_speedcrunch/test.py6
-rw-r--r--tests/system/suite_general/tst_openqt_creator/test.py11
7 files changed, 0 insertions, 30 deletions
diff --git a/tests/system/objects.map b/tests/system/objects.map
index a1c3337535..c57d9f278e 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -57,8 +57,6 @@
:formFileLineEdit_Utils::FileNameValidatingLineEdit {buddy=':Qt Gui Application.Form file:_QLabel' name='formFileLineEdit' type='Utils::FileNameValidatingLineEdit' visible='1'}
:frame.templateDescription_QTextBrowser {container=':New.frame_QFrame' name='templateDescription' type='QTextBrowser' visible='1'}
:headerFileLineEdit_Utils::FileNameValidatingLineEdit {buddy=':Qt Gui Application.Header file:_QLabel' name='headerFileLineEdit' type='Utils::FileNameValidatingLineEdit' visible='1'}
-:projects.projects.pro_QModelIndex {column='0' container=':projects_QModelIndex' text='projects.pro' type='QModelIndex'}
-:projects_QModelIndex {column='0' container=':Qt Creator_Utils::NavigationTreeView' text='projects' type='QModelIndex'}
:qt_tabwidget_stackedwidget.QtSupport__Internal__QtVersionManager_QtSupport::Internal::QtOptionsPageWidget {container=':Options.qt_tabwidget_stackedwidget_QStackedWidget' name='QtSupport__Internal__QtVersionManager' type='QtSupport::Internal::QtOptionsPageWidget' visible='1'}
:scrollArea.Create Build Configurations:_QComboBox_2 {container=':Qt Gui Application.scrollArea_QScrollArea' leftWidget=':scrollArea.Create Build Configurations:_QLabel_2' type='QComboBox' unnamed='1' visible='1'}
:scrollArea.Create Build Configurations:_QLabel_2 {container=':Qt Gui Application.scrollArea_QScrollArea' text='Create build configurations:' type='QLabel' unnamed='1' visible='1'}
diff --git a/tests/system/suite_general/shared/testdata/creator_tree.tsv b/tests/system/suite_general/shared/testdata/creator_tree.tsv
deleted file mode 100644
index 7c31458f15..0000000000
--- a/tests/system/suite_general/shared/testdata/creator_tree.tsv
+++ /dev/null
@@ -1 +0,0 @@
-"node" "value"
diff --git a/tests/system/suite_general/shared/testdata/qt_tree.tsv b/tests/system/suite_general/shared/testdata/qt_tree.tsv
deleted file mode 100644
index e40c8e78f3..0000000000
--- a/tests/system/suite_general/shared/testdata/qt_tree.tsv
+++ /dev/null
@@ -1,3 +0,0 @@
-"node" "value"
-":projects.projects.pro_QModelIndex" "projects.pro"
-":projects_QModelIndex" "projects"
diff --git a/tests/system/suite_general/shared/testdata/speedcrunch_tree.tsv b/tests/system/suite_general/shared/testdata/speedcrunch_tree.tsv
deleted file mode 100644
index 7c31458f15..0000000000
--- a/tests/system/suite_general/shared/testdata/speedcrunch_tree.tsv
+++ /dev/null
@@ -1 +0,0 @@
-"node" "value"
diff --git a/tests/system/suite_general/tst_build_speedcrunch/test.py b/tests/system/suite_general/tst_build_speedcrunch/test.py
index 147cc967fc..bb10b13c71 100644
--- a/tests/system/suite_general/tst_build_speedcrunch/test.py
+++ b/tests/system/suite_general/tst_build_speedcrunch/test.py
@@ -18,12 +18,6 @@ def main():
openQmakeProject(SpeedCrunchPath)
waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)")
- # Test that some of the expected items are in the navigation tree
- for row, record in enumerate(testData.dataset("speedcrunch_tree.tsv")):
- node = testData.field(record, "node")
- value = testData.field(record, "value")
- test.compare(waitForObject(node).text, value)
-
fancyToolButton = waitForObject(":*Qt Creator_Core::Internal::FancyToolButton")
qtVerPattern = re.compile("\d\.\d(\.\d+)?")
diff --git a/tests/system/suite_general/tst_cmake_speedcrunch/test.py b/tests/system/suite_general/tst_cmake_speedcrunch/test.py
index 76244acb2d..da99b28e5d 100644
--- a/tests/system/suite_general/tst_cmake_speedcrunch/test.py
+++ b/tests/system/suite_general/tst_cmake_speedcrunch/test.py
@@ -23,12 +23,6 @@ def main():
return
waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)")
- # Test that some of the expected items are in the navigation tree
- for row, record in enumerate(testData.dataset("speedcrunch_tree.tsv")):
- node = testData.field(record, "node")
- value = testData.field(record, "value")
- test.compare(findObject(node).text, value)
-
# Invoke a rebuild of the application
invokeMenuItem("Build", "Rebuild All")
diff --git a/tests/system/suite_general/tst_openqt_creator/test.py b/tests/system/suite_general/tst_openqt_creator/test.py
index 77966b3eaa..2fd8983796 100644
--- a/tests/system/suite_general/tst_openqt_creator/test.py
+++ b/tests/system/suite_general/tst_openqt_creator/test.py
@@ -15,17 +15,6 @@ def main():
# Wait for parsing to complete
waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)", 300000)
- # Test that some of the expected items are in the navigation tree
- for row, record in enumerate(testData.dataset("creator_tree.tsv")):
- node = testData.field(record, "node")
- value = testData.field(record, "value")
- test.compare(waitForObject(node).text, value)
-
- for row, record in enumerate(testData.dataset("speedcrunch_tree.tsv")):
- node = testData.field(record, "node")
- value = testData.field(record, "value")
- test.compare(waitForObject(node).text, value)
-
# Now check some basic lookups in the search box
selectFromLocator(": Qlist::QList", "QList::QList")
test.compare(wordUnderCursor(waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")), "QList")