@@ -42,6 +42,7 @@ Item {
4242 QtObject { id: rated; property int value: 120 }
4343 QtObject { id: reviews; property int value: 8 }
4444 QtObject { id: progress; property string value: "source" }
45+ QtObject { id: publisher; property string value: "Ubuntu Developer" }
4546 QtObject { id: comments; property var value: [
4647 ["Unity User", 4, "08/20/2013", root.commentary],
4748 ["Unity User", 8, "01/15/2013", root.commentary],
@@ -62,7 +63,8 @@ Item {
6263 property var infoMap: {
6364 "more-screenshots": screenshots,
6465 "rated": rated,
65− "comments": comments
66+ "comments": comments,
67+ "publisher": publisher
6668 }
6769 property var actions: [
6870 { "id": 123, "displayName": "action1" },
@@ -84,6 +86,7 @@ Item {
8486 "more-screenshots": screenshots,
8587 "rated": rated,
8688 "comments": comments,
89+ "publisher": publisher,
8790 "progressbar_source": progressSource
8891 }
8992 property var actions: [
@@ -109,26 +112,31 @@ Item {
109112 name: "AppPreview"
110113 when: windowShown
111114
115+ function init() {
116+ waitForRendering(appPreview)
117+ }
118+
112119 function cleanup() {
113120 root.calls = new Array();
114121 sendPreviewSpy.clear();
115− var reviewField = findChild(appPreview, "reviewField");
116− reviewField.focus = false;
117− reviewField.text = "";
118− data.rating = rating.value;
122+ // TODO: This doesn't work right now as Reviews are disabled
123+ //var reviewField = findChild(appPreview, "reviewField");
124+ //reviewField.focus = false;
125+ //reviewField.text = "";
126+ //data.rating = rating.value;
119127 dataProgress.infoMap["progressbar_source"].value = "service";
120− var appReviews = findChild(appPreview, "appReviews");
121− appReviews.visible = false;
122− appPreview.keyboardSize = 0;
128+ //var appReviews = findChild(appPreview, "appReviews");
129+ //appReviews.visible = false;
130+ //appPreview.keyboardSize = 0;
123131 }
124132
125133 function test_actions() {
126− var buttons = findChild(appPreview, "gridButtons");
134+ var buttons = findChild(appPreview, "buttonList");
127135 compare(buttons.count, 3, "Not the proper amount of actions detected.");
128136
129137 for(var i = 0; i < buttons.count; i++) {
130− buttons.currentIndex = i;
131− buttons.currentItem.clicked();
138+ var button = findChild(appPreview, "button" + i);
139+ mouseClick(button, 1, 1);
132140 }
133141
134142 var actions = data.actions;
@@ -137,6 +145,14 @@ Item {
137145 }
138146 }
139147
148+ function test_check_app_info() {
149+ var appInfo = findChild(appPreview, "previewHeader");
150+ var titleLabel = findChild(appInfo, "titleLabel");
151+ var subtitleLabel = findChild(appInfo, "subtitleLabel");
152+ compare(titleLabel.text, data.title, "App Title doesn't match.");
153+ compare(subtitleLabel.text, publisher.value, "Publisher name doesn't match.");
154+ }
155+
140156 function test_rated() {
141157 var rated = findChild(appPreview, "ratedLabel");
142158 compare(rated.text, "(120)", "Rates not equal");
@@ -147,13 +163,16 @@ Item {
147163 compare(rated.text, "8 reviews", "Reviews don't match");
148164 }
149165
150− function test_send_review() {
166+ // TODO: Disabled as reviewing and commenting is currently disabled
167+/* function test_send_review() {
151168 var appReviews = findChild(appPreview, "appReviews");
152169 appReviews.sendReview("review");
153170 sendPreviewSpy.wait();
154171 }
155172
156173 function test_review_focus() {
174+ var columnReviewRating = findChild(appPreview, "columnReviewRating");
175+ columnReviewRating.visible = true;
157176 var appReviews = findChild(appPreview, "appReviews");
158177 appReviews.visible = true;
159178 var sendButton = findChild(appReviews, "sendButton");
@@ -194,6 +213,22 @@ Item {
194213 verify(buttons.visible == true);
195214 }
196215
216+ function test_automatic_scroll_on_keyboard_shown() {
217+ waitForRendering(appPreview);
218+ var appReviews = findChild(appPreview, "appReviews");
219+ appReviews.visible = true;
220+
221+ var leftFlickable = findChild(appPreview, "leftFlickable");
222+ leftFlickable.contentY = leftFlickable.contentHeight;
223+ var reviewField = findChild(appReviews, "reviewField");
224+ appPreview.keyboardSize = 400;
225+ appReviews.editing(reviewField);
226+ var newFlickPos = leftFlickable.contentY;
227+ var keyboardY = shell.height - appPreview.keyboardSize;
228+ verify(newFlickPos < keyboardY);
229+ }
230+
231+*/
197232 function test_progress_show() {
198233 appPreview.previewData = dataProgress;
199234 var progress = findChild(appPreview, "progressBar");
@@ -220,20 +255,17 @@ Item {
220255 compare(root.calls[0][1], {"error": "DOWNLOAD ERROR"}, "Data of action not found.");
221256 }
222257
223− function test_automatic_scroll_on_keyboard_shown() {
224− waitForRendering(appPreview);
225− var appReviews = findChild(appPreview, "appReviews");
226− appReviews.visible = true;
258+ function test_placeholderScreenshot() {
259+ var placeholderScreenshot = findChild(appPreview, "placeholderScreenshot");
260+ compare(placeholderScreenshot.visible, false);
227261
228− var leftFlickable = findChild(appPreview, "leftFlickable");
229− leftFlickable.contentY = leftFlickable.contentHeight;
230− var reviewField = findChild(appReviews, "reviewField");
231− appPreview.keyboardSize = 400;
232− appReviews.editing(reviewField);
233− var newFlickPos = leftFlickable.contentY;
234− var keyboardY = shell.height - appPreview.keyboardSize;
235− verify(newFlickPos < keyboardY);
236− }
262+ data.infoMap["more-screenshots"] = [];
263+ appPreview.previewData = data;
264+ tryCompare(placeholderScreenshot, "visible", true);
237265
266+ data.infoMap["more-screenshots"] = screenshots;
267+ appPreview.previewData = data;
268+ tryCompare(placeholderScreenshot, "visible", false);
269+ }
238270 }
239271}