063f167 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

more test fixes

063f167Nick Dedekind12 years ago

tests/mocks/Unity/Application/ApplicationInfo.h+1

compare with xenial

unifiedsplit

@@ -49,6 +49,7 @@ public:

49 void setIconId(const QString &iconId);

50 void setScreenshotId(const QString &screenshotId);

52+ void setAppId(const QString &value) { m_appId = value; }

52 QString appId() const override { return m_appId; }

53 QString appId() const override { return m_appId; }

54 void setName(const QString &value);

55 void setName(const QString &value);

tests/mocks/Unity/Application/ApplicationManager.cpp+34−17

@@ -336,104 +336,121 @@ void ApplicationManager::buildListOfAvailableApplications()

336{

337 ApplicationInfo *application;

338

339− application = new ApplicationInfo("unity8-dash", this);

339+ application = new ApplicationInfo(this);

340+ application->setAppId("unity8-dash");

340 application->setName("Unity 8 Mock Dash");

341 application->setName("Unity 8 Mock Dash");

341 application->setScreenshotId("unity8-dash");

342 application->setScreenshotId("unity8-dash");

342 application->setStage(ApplicationInfo::MainStage);

343 application->setStage(ApplicationInfo::MainStage);

343 m_availableApplications.append(application);

344 m_availableApplications.append(application);

344

345

345− application = new ApplicationInfo("dialer-app", this);

346+ application = new ApplicationInfo(this);

347+ application->setAppId("dialer-app");

346 application->setName("Dialer");

348 application->setName("Dialer");

347 application->setScreenshotId("dialer");

349 application->setScreenshotId("dialer");

348 application->setIconId("dialer-app");

350 application->setIconId("dialer-app");

349 application->setStage(ApplicationInfo::SideStage);

351 application->setStage(ApplicationInfo::SideStage);

350 m_availableApplications.append(application);

352 m_availableApplications.append(application);

351

353

352− application = new ApplicationInfo("camera-app", this);

354+ application = new ApplicationInfo(this);

355+ application->setAppId("camera-app");

353 application->setName("Camera");

356 application->setName("Camera");

354 application->setScreenshotId("camera");

357 application->setScreenshotId("camera");

355 application->setIconId("camera");

358 application->setIconId("camera");

356 application->setFullscreen(true);

359 application->setFullscreen(true);

357 m_availableApplications.append(application);

360 m_availableApplications.append(application);

358

361

359− application = new ApplicationInfo("gallery-app", this);

362+ application = new ApplicationInfo(this);

363+ application->setAppId("gallery-app");

360 application->setName("Gallery");

364 application->setName("Gallery");

361 application->setScreenshotId("gallery");

365 application->setScreenshotId("gallery");

362 application->setIconId("gallery");

366 application->setIconId("gallery");

363 application->setFullscreen(true);

367 application->setFullscreen(true);

364 m_availableApplications.append(application);

368 m_availableApplications.append(application);

365

369

366− application = new ApplicationInfo("facebook-webapp", this);

370+ application = new ApplicationInfo(this);

371+ application->setAppId("facebook-webapp");

367 application->setName("Facebook");

372 application->setName("Facebook");

368 application->setScreenshotId("facebook");

373 application->setScreenshotId("facebook");

369 application->setIconId("facebook");

374 application->setIconId("facebook");

370 application->setStage(ApplicationInfo::SideStage);

375 application->setStage(ApplicationInfo::SideStage);

371 m_availableApplications.append(application);

376 m_availableApplications.append(application);

372

377

373− application = new ApplicationInfo("webbrowser-app", this);

378+ application = new ApplicationInfo(this);

379+ application->setAppId("webbrowser-app");

374 application->setFullscreen(true);

380 application->setFullscreen(true);

375 application->setName("Browser");

381 application->setName("Browser");

376 application->setScreenshotId("browser");

382 application->setScreenshotId("browser");

377 application->setIconId("browser");

383 application->setIconId("browser");

378 m_availableApplications.append(application);

384 m_availableApplications.append(application);

379

385

380− application = new ApplicationInfo("twitter-webapp", this);

386+ application = new ApplicationInfo(this);

387+ application->setAppId("twitter-webapp");

381 application->setName("Twitter");

388 application->setName("Twitter");

382 application->setScreenshotId("twitter");

389 application->setScreenshotId("twitter");

383 application->setIconId("twitter");

390 application->setIconId("twitter");

384 application->setStage(ApplicationInfo::SideStage);

391 application->setStage(ApplicationInfo::SideStage);

385 m_availableApplications.append(application);

392 m_availableApplications.append(application);

386

393

387− application = new ApplicationInfo("map", this);

394+ application = new ApplicationInfo(this);

395+ application->setAppId("map");

388 application->setName("Map");

396 application->setName("Map");

389 application->setIconId("map");

397 application->setIconId("map");

390 application->setScreenshotId("map");

398 application->setScreenshotId("map");

391 m_availableApplications.append(application);

399 m_availableApplications.append(application);

392

400

393− application = new ApplicationInfo("gmail-webapp", this);

401+ application = new ApplicationInfo(this);

402+ application->setAppId("gmail-webapp");

394 application->setName("GMail");

403 application->setName("GMail");

395 application->setIconId("gmail");

404 application->setIconId("gmail");

396 m_availableApplications.append(application);

405 m_availableApplications.append(application);

397

406

398− application = new ApplicationInfo("ubuntu-weather-app", this);

407+ application = new ApplicationInfo(this);

408+ application->setAppId("ubuntu-weather-app");

399 application->setName("Weather");

409 application->setName("Weather");

400 application->setIconId("weather");

410 application->setIconId("weather");

401 application->setStage(ApplicationInfo::SideStage);

411 application->setStage(ApplicationInfo::SideStage);

402 m_availableApplications.append(application);

412 m_availableApplications.append(application);

403

413

404− application = new ApplicationInfo("notes-app", this);

414+ application = new ApplicationInfo(this);

415+ application->setAppId("notes-app");

405 application->setName("Notepad");

416 application->setName("Notepad");

406 application->setIconId("notepad");

417 application->setIconId("notepad");

407 application->setStage(ApplicationInfo::SideStage);

418 application->setStage(ApplicationInfo::SideStage);

408 m_availableApplications.append(application);

419 m_availableApplications.append(application);

409

420

410− application = new ApplicationInfo("calendar-app", this);

421+ application = new ApplicationInfo(this);

422+ application->setAppId("calendar-app");

411 application->setName("Calendar");

423 application->setName("Calendar");

412 application->setIconId("calendar");

424 application->setIconId("calendar");

413 application->setStage(ApplicationInfo::SideStage);

425 application->setStage(ApplicationInfo::SideStage);

414 m_availableApplications.append(application);

426 m_availableApplications.append(application);

415

427

416− application = new ApplicationInfo("evernote", this);

428+ application = new ApplicationInfo(this);

429+ application->setAppId("evernote");

417 application->setName("Evernote");

430 application->setName("Evernote");

418 application->setIconId("evernote");

431 application->setIconId("evernote");

419 m_availableApplications.append(application);

432 m_availableApplications.append(application);

420

433

421− application = new ApplicationInfo("pinterest", this);

434+ application = new ApplicationInfo(this);

435+ application->setAppId("pinterest");

422 application->setName("Pinterest");

436 application->setName("Pinterest");

423 application->setIconId("pinterest");

437 application->setIconId("pinterest");

424 m_availableApplications.append(application);

438 m_availableApplications.append(application);

425

439

426− application = new ApplicationInfo("soundcloud", this);

440+ application = new ApplicationInfo(this);

441+ application->setAppId("soundcloud");

427 application->setName("SoundCloud");

442 application->setName("SoundCloud");

428 application->setIconId("soundcloud");

443 application->setIconId("soundcloud");

429 m_availableApplications.append(application);

444 m_availableApplications.append(application);

430

445

431− application = new ApplicationInfo("wikipedia", this);

446+ application = new ApplicationInfo(this);

447+ application->setAppId("wikipedia");

432 application->setName("Wikipedia");

448 application->setName("Wikipedia");

433 application->setIconId("wikipedia");

449 application->setIconId("wikipedia");

434 m_availableApplications.append(application);

450 m_availableApplications.append(application);

435

451

436− application = new ApplicationInfo("youtube", this);

452+ application = new ApplicationInfo(this);

453+ application->setAppId("youtube");

437 application->setName("YouTube");

454 application->setName("YouTube");

438 application->setIconId("youtube");

455 application->setIconId("youtube");

439 m_availableApplications.append(application);

456 m_availableApplications.append(application);

tests/qmltests/Stages/tst_ApplicationWindow.qml+5−5

@@ -38,9 +38,9 @@ Rectangle {

38 readonly property var fakeSession: fakeApplication ? fakeApplication.session : null

40 Connections {

41− target: fakeSession

41+ target: fakeApplication

42− onSurfaceChanged: {

42+ onSessionChanged: {

43− surfaceCheckbox.checked = fakeSession.surface !== null;

43+ surfaceCheckbox.checked = fakeApplication.session !== null

44 }

45 }

@@ -262,14 +262,14 @@ Rectangle {

262

263 tryCompare(stateGroup, "state", "screenshot");

264 waitUntilTransitionsEnd();

265− tryCompare(fakeSession, "surface", null);

265+ tryCompare(fakeApplication, "session", null);

266

267 // and restart it

268 setApplicationState(appStarting);

269

270 waitUntilTransitionsEnd();

271 verify(stateGroup.state === "screenshot");

272− verify(fakeSession.surface === null);

272+ verify(fakeSession === null);

273

274 setApplicationState(appRunning);

275