athena/activity/activity_manager_unittest.cc - Issue 617043002: Moving athena/test to athena/test/base

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: athena/activity/activity_manager_unittest.cc

Issue 617043002: Moving athena/test to athena/test/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « no previous file | athena/athena.gyp » ('j') | no next file with comments »

OLD	NEW
1 /// Copyright 2014 The Chromium Authors. All rights reserved.	1 /// Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "athena/activity/activity_manager_impl.h"	5 #include "athena/activity/activity_manager_impl.h"

6	6

7 #include "athena/activity/public/activity.h"	7 #include "athena/activity/public/activity.h"

8 #include "athena/activity/public/activity_factory.h"	8 #include "athena/activity/public/activity_factory.h"

9 #include "athena/test/athena_test_base.h"	9 #include "athena/test/base/athena_test_base.h"

10 #include "ui/aura/window.h"	10 #include "ui/aura/window.h"

11	11

12 namespace athena {	12 namespace athena {

13	13

14 typedef test::AthenaTestBase ActivityManagerTest;	14 typedef test::AthenaTestBase ActivityManagerTest;

15	15

16 TEST_F(ActivityManagerTest, Basic) {	16 TEST_F(ActivityManagerTest, Basic) {

17 ActivityManagerImpl* activity_manager =	17 ActivityManagerImpl* activity_manager =

18 static_cast<ActivityManagerImpl*>(ActivityManager::Get());	18 static_cast<ActivityManagerImpl*>(ActivityManager::Get());

19 ActivityFactory* factory = ActivityFactory::Get();	19 ActivityFactory* factory = ActivityFactory::Get();

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
51 EXPECT_EQ(activity1, manager->GetActivityForWindow(activity1->GetWindow()));	51 EXPECT_EQ(activity1, manager->GetActivityForWindow(activity1->GetWindow()));

52 EXPECT_EQ(activity2, manager->GetActivityForWindow(activity2->GetWindow()));	52 EXPECT_EQ(activity2, manager->GetActivityForWindow(activity2->GetWindow()));

53	53

54 EXPECT_EQ(NULL, manager->GetActivityForWindow(NULL));	54 EXPECT_EQ(NULL, manager->GetActivityForWindow(NULL));

55	55

56 scoped_ptr<aura::Window> window = CreateTestWindow(NULL, gfx::Rect());	56 scoped_ptr<aura::Window> window = CreateTestWindow(NULL, gfx::Rect());

57 EXPECT_EQ(NULL, manager->GetActivityForWindow(window.get()));	57 EXPECT_EQ(NULL, manager->GetActivityForWindow(window.get()));

58 }	58 }

59	59

60 } // namespace athena	60 } // namespace athena

OLD	NEW