Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Side by Side Diff: base/android/javatests/src/org/chromium/base/EarlyTraceEventTest.java

Issue 2247143004: Remove app context init from LibraryLoader. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix per review. Created 4 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 package org.chromium.base; 5 package org.chromium.base;
6 6
7 import android.os.Process; 7 import android.os.Process;
8 import android.os.SystemClock; 8 import android.os.SystemClock;
9 import android.test.InstrumentationTestCase; 9 import android.test.InstrumentationTestCase;
10 import android.test.suitebuilder.annotation.SmallTest; 10 import android.test.suitebuilder.annotation.SmallTest;
11 11
12 import org.chromium.base.library_loader.LibraryLoader; 12 import org.chromium.base.library_loader.LibraryLoader;
13 import org.chromium.base.library_loader.LibraryProcessType; 13 import org.chromium.base.library_loader.LibraryProcessType;
14 import org.chromium.base.test.util.Feature; 14 import org.chromium.base.test.util.Feature;
15 15
16 /** 16 /**
17 * Tests for {@link EarlyTraceEvent}. 17 * Tests for {@link EarlyTraceEvent}.
18 */ 18 */
19 public class EarlyTraceEventTest extends InstrumentationTestCase { 19 public class EarlyTraceEventTest extends InstrumentationTestCase {
20 private static final String EVENT_NAME = "MyEvent"; 20 private static final String EVENT_NAME = "MyEvent";
21 private static final String EVENT_NAME2 = "MyOtherEvent"; 21 private static final String EVENT_NAME2 = "MyOtherEvent";
22 22
23 @Override 23 @Override
24 protected void setUp() throws Exception { 24 protected void setUp() throws Exception {
25 super.setUp(); 25 super.setUp();
26 LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER) 26 LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER).ensureInitialized( );
27 .ensureInitialized(getInstrumentation().getTargetContext());
28
29 EarlyTraceEvent.sState = EarlyTraceEvent.STATE_DISABLED; 27 EarlyTraceEvent.sState = EarlyTraceEvent.STATE_DISABLED;
30 EarlyTraceEvent.sCompletedEvents = null; 28 EarlyTraceEvent.sCompletedEvents = null;
31 EarlyTraceEvent.sPendingEvents = null; 29 EarlyTraceEvent.sPendingEvents = null;
32 } 30 }
33 31
34 @SmallTest 32 @SmallTest
35 @Feature({"Android-AppBase"}) 33 @Feature({"Android-AppBase"})
36 public void testCanRecordEvent() { 34 public void testCanRecordEvent() {
37 EarlyTraceEvent.enable(); 35 EarlyTraceEvent.enable();
38 long myThreadId = Process.myTid(); 36 long myThreadId = Process.myTid();
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 } 141 }
144 }; 142 };
145 thread.start(); 143 thread.start();
146 thread.join(); 144 thread.join();
147 145
148 assertEquals(1, EarlyTraceEvent.sCompletedEvents.size()); 146 assertEquals(1, EarlyTraceEvent.sCompletedEvents.size());
149 EarlyTraceEvent.Event event = EarlyTraceEvent.sCompletedEvents.get(0); 147 EarlyTraceEvent.Event event = EarlyTraceEvent.sCompletedEvents.get(0);
150 assertEquals(threadId[0], event.mThreadId); 148 assertEquals(threadId[0], event.mThreadId);
151 } 149 }
152 } 150 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698