ac7fe15 · unity8 · git.iko.soy

269

270 property list<Notification> nlist: [

271 Notification {

272− nid: index++

272+ nid: 1

273 type: Notification.SnapDecision

274 hints: {"x-canonical-private-affirmative-tint": "true"}

275 summary: "Theatre at Ferria Stadium"

280 rawActions: ["ok_id", "Ok",

281 "snooze_id", "Snooze",

282 "view_id", "View"]

283− }/*,

283+ },

284 Notification {

285− nid: index++

285+ nid: 2

286 type: Notification.Ephemeral

287 summary: "Photo upload completed"

288 body: ""

292 rawActions: []

293 },

294 Notification {

295− nid: index++

295+ nid: 3

296 type: Notification.Ephemeral

297 hints: {"x-canonical-private-affirmative-tint": "false",

298 "sound-file": "dummy.ogg",

305 rawActions: []

306 },

307 Notification {

308− nid: index++

308+ nid: 4

309 type: Notification.Interactive

310 hints: {"x-canonical-private-affirmative-tint": "false",

311 "sound-file": "dummy.ogg"}

317 rawActions: ["reply_id", "Dummy"]

318 },

319 Notification {

320− nid: index++

320+ nid: 5

321 type: Notification.SnapDecision

322 hints: {"x-canonical-private-affirmative-tint": "false",

323 "sound-file": "dummy.ogg"}

330 "reject_id", "Reject"]

331 },

332 Notification {

333− nid: index++

333+ nid: 6

334 type: Notification.Ephemeral

335 hints: {"x-canonical-private-affirmative-tint": "false",

336 "sound-file": "dummy.ogg"}

342 rawActions: []

343 },

344 Notification {

345− nid: index++

345+ nid: 7

346 type: Notification.Ephemeral

347 hints: {"x-canonical-private-affirmative-tint": "false",

348 "x-canonical-non-shaped-icon": "true"}

354 rawActions: []

355 },

356 Notification {

357− nid: index++

357+ nid: 8

358 type: Notification.Confirmation

359 hints: {"x-canonical-non-shaped-icon": "true"}

360 summary: ""

365 rawActions: []

366 },

367 Notification {

368− nid: index++

368+ nid: 9

369 type: Notification.Confirmation

370 hints: {"x-canonical-non-shaped-icon": "true",

371 "x-canonical-value-bar-tint" : "true"}

375 secondaryIcon: ""

376 value: 85

377 rawActions: []

378− }*/

378+ }

379 ]

380

381 function test_NotificationRenderer_data() {

395 valueVisible: false,

396 valueLabelVisible: false,

397 valueTinted: false

398− }/*,

398+ },

399 {

400 tag: "Ephemeral notification - icon-summary layout",

401 n: nlist[1],

524 valueVisible: true,

525 valueLabelVisible: true,

526 valueTinted: true

527− }*/

527+ }

528 ]

529 }

530

548 }

549

550 function test_NotificationRenderer(data) {

551+ // hook up notification's completed-signal with model's onCompleted-slot, so that remove happens on close()

552+ data.n.completed.connect(mockModel.onCompleted)

553+

551 // populate model with some mock notifications

554 // populate model with some mock notifications

552 mockModel.append(data.n)

555 mockModel.append(data.n)

553

556

589 mouseClick(notification)

592 mouseClick(notification)

590 if(data.n.type === Notification.Interactive) {

593 if(data.n.type === Notification.Interactive) {

591 actionSpy.wait()

594 actionSpy.wait()

592− compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id for interactive action")

595+ compare(actionSpy.signalArguments[0][0], data.n.rawActions[0], "got wrong id for interactive action")

593 }

596 }

594 compare(clickThroughSpy.count, 0, "click on notification fell through")

597 compare(clickThroughSpy.count, 0, "click on notification fell through")

595

598

599 compare(buttonRow.visible, data.buttonRowVisible, "button visibility is incorrect")

602 compare(buttonRow.visible, data.buttonRowVisible, "button visibility is incorrect")

600

603

601 var audioItem = findInvisibleChild(notification, "sound")

604 var audioItem = findInvisibleChild(notification, "sound")

602− compare(audioItem.playbackState, data.hasSound ? Audio.PlayingState : Audio.StoppedState, "Audio has wrong state")

605+ //compare(audioItem.playbackState, data.hasSound ? Audio.PlayingState : Audio.StoppedState, "Audio has wrong state")

603

606

604 if(data.buttonRowVisible) {

607 if(data.buttonRowVisible) {

605 var buttonCancel = findChild(buttonRow, "notify_button1")

608 var buttonCancel = findChild(buttonRow, "notify_button1")

606 var buttonAccept = findChild(buttonRow, "notify_button0")

609 var buttonAccept = findChild(buttonRow, "notify_button0")

607

610

608 // only test the left/cancel-button if two actions have been passed in

611 // only test the left/cancel-button if two actions have been passed in

609− if (data.actions.length == 2) {

612+ if (data.n.rawActions.length === 4) {

610 tryCompareFunction(function() { mouseClick(buttonCancel); return actionSpy.signalArguments.length > 0; }, true);

613 tryCompareFunction(function() { mouseClick(buttonCancel); return actionSpy.signalArguments.length > 0; }, true);

611− compare(actionSpy.signalArguments[0][0], data.actions[1]["id"], "got wrong id for negative action")

614+ compare(actionSpy.signalArguments[0][0], data.n.rawActions[2], "got wrong id for negative action")

612 actionSpy.clear()

615 actionSpy.clear()

613 }

616 }

614

617

620

618 // click the positive/right button

621 // click the positive/right button

619 tryCompareFunction(function() { mouseClick(buttonAccept); return actionSpy.signalArguments.length > 0; }, true);

622 tryCompareFunction(function() { mouseClick(buttonAccept); return actionSpy.signalArguments.length > 0; }, true);

620− compare(actionSpy.signalArguments[0][0], data.actions[0]["id"], "got wrong id positive action")

623+ compare(actionSpy.signalArguments[0][0], data.n.rawActions[0], "got wrong id positive action")

621 actionSpy.clear()

624 actionSpy.clear()

622 waitForRendering (notification)

625 waitForRendering (notification)

623

626

632 // try clicking on choices in expanded comboList

635 // try clicking on choices in expanded comboList

633 var choiceButton1 = findChild(notification, "notify_button3")

636 var choiceButton1 = findChild(notification, "notify_button3")

634 tryCompareFunction(function() { mouseClick(choiceButton1); return actionSpy.signalArguments.length > 0; }, true);

637 tryCompareFunction(function() { mouseClick(choiceButton1); return actionSpy.signalArguments.length > 0; }, true);

635− compare(actionSpy.signalArguments[0][0], data.actions[3]["id"], "got wrong id choice action 1")

638+ compare(actionSpy.signalArguments[0][0], data.n.rawActions[6], "got wrong id choice action 1")

636 actionSpy.clear()

639 actionSpy.clear()

637

640

638 var choiceButton2 = findChild(notification, "notify_button4")

641 var choiceButton2 = findChild(notification, "notify_button4")

639 tryCompareFunction(function() { mouseClick(choiceButton2); return actionSpy.signalArguments.length > 0; }, true);

642 tryCompareFunction(function() { mouseClick(choiceButton2); return actionSpy.signalArguments.length > 0; }, true);

640− compare(actionSpy.signalArguments[0][0], data.actions[4]["id"], "got wrong id choice action 2")

643+ compare(actionSpy.signalArguments[0][0], data.n.rawActions[8], "got wrong id choice action 2")

641 actionSpy.clear()

644 actionSpy.clear()

642

645

643 // click to collapse

646 // click to collapse

644 //tryCompareFunction(function() { mouseClick(comboButton, comboButton.width - comboButton.__styleInstance.dropDownWidth / 2, comboButton.height / 2); return comboButton.expanded == false; }, true);

647 //tryCompareFunction(function() { mouseClick(comboButton, comboButton.width - comboButton.__styleInstance.dropDownWidth / 2, comboButton.height / 2); return comboButton.expanded == false; }, true);

645 } else {

648 } else {

646 mouseClick(buttonCancel)

649 mouseClick(buttonCancel)

647− compare(actionSpy.signalArguments[0][0], data.actions[1]["id"], "got wrong id for negative action")

650+ compare(actionSpy.signalArguments[0][0], data.n.rawActions[2], "got wrong id for negative action")

648 }

651 }

649 }

652 }

650

653

655 var dragY = notification.height / 2;

658 var dragY = notification.height / 2;

656 touchFlick(notification, dragStart, dragY, dragEnd, dragY)

659 touchFlick(notification, dragStart, dragY, dragEnd, dragY)

657 waitForRendering(notification)

660 waitForRendering(notification)

658− if (data.type !== Notification.SnapDecision && notification.state !== "expanded") {

661+ if (data.n.type !== Notification.SnapDecision && notification.state !== "expanded") {

659− tryCompare(mockModel, "count", before - 1)

660− } else {

661 tryCompare(mockModel, "count", before)

662 tryCompare(mockModel, "count", before)

663+ } else {

664+ tryCompare(mockModel, "count", before - 1)

662 }

665 }

663 }

666 }

664 }

667 }