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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.java

Issue 2726003002: Auto convert base javatests in content shell apk to JUnit4 (Closed)
Patch Set: Rebase Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/android/javatests/src/org/chromium/base/ObserverListTest.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.java
diff --git a/base/android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.java b/base/android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.java
index c6b4617d9a961f1d3dccef2e4cc250d1598d3e4e..daf639bc93efca79fddf683f464a0f2145a9edfe 100644
--- a/base/android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.java
+++ b/base/android/javatests/src/org/chromium/base/metrics/RecordHistogramTest.java
@@ -1,14 +1,19 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2017 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.base.metrics;
import android.support.test.filters.SmallTest;
-import android.test.InstrumentationTestCase;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
import org.chromium.base.library_loader.LibraryLoader;
import org.chromium.base.library_loader.LibraryProcessType;
+import org.chromium.base.test.BaseJUnit4ClassRunner;
import org.chromium.base.test.util.MetricsUtils.HistogramDelta;
import java.util.concurrent.TimeUnit;
@@ -16,10 +21,10 @@ import java.util.concurrent.TimeUnit;
/**
* Tests for the Java API for recording UMA histograms.
*/
-public class RecordHistogramTest extends InstrumentationTestCase {
- @Override
- protected void setUp() throws Exception {
- super.setUp();
+@RunWith(BaseJUnit4ClassRunner.class)
+public class RecordHistogramTest {
+ @Before
+ public void setUp() throws Exception {
LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER).ensureInitialized();
RecordHistogram.initialize();
}
@@ -27,30 +32,32 @@ public class RecordHistogramTest extends InstrumentationTestCase {
/**
* Tests recording of boolean histograms.
*/
+ @Test
@SmallTest
public void testRecordBooleanHistogram() {
String histogram = "HelloWorld.BooleanMetric";
HistogramDelta falseCount = new HistogramDelta(histogram, 0);
HistogramDelta trueCount = new HistogramDelta(histogram, 1);
- assertEquals(0, trueCount.getDelta());
- assertEquals(0, falseCount.getDelta());
+ Assert.assertEquals(0, trueCount.getDelta());
+ Assert.assertEquals(0, falseCount.getDelta());
RecordHistogram.recordBooleanHistogram(histogram, true);
- assertEquals(1, trueCount.getDelta());
- assertEquals(0, falseCount.getDelta());
+ Assert.assertEquals(1, trueCount.getDelta());
+ Assert.assertEquals(0, falseCount.getDelta());
RecordHistogram.recordBooleanHistogram(histogram, true);
- assertEquals(2, trueCount.getDelta());
- assertEquals(0, falseCount.getDelta());
+ Assert.assertEquals(2, trueCount.getDelta());
+ Assert.assertEquals(0, falseCount.getDelta());
RecordHistogram.recordBooleanHistogram(histogram, false);
- assertEquals(2, trueCount.getDelta());
- assertEquals(1, falseCount.getDelta());
+ Assert.assertEquals(2, trueCount.getDelta());
+ Assert.assertEquals(1, falseCount.getDelta());
}
/**
* Tests recording of enumerated histograms.
*/
+ @Test
@SmallTest
public void testRecordEnumeratedHistogram() {
String histogram = "HelloWorld.EnumeratedMetric";
@@ -59,29 +66,30 @@ public class RecordHistogramTest extends InstrumentationTestCase {
HistogramDelta twoCount = new HistogramDelta(histogram, 2);
final int boundary = 3;
- assertEquals(0, zeroCount.getDelta());
- assertEquals(0, oneCount.getDelta());
- assertEquals(0, twoCount.getDelta());
+ Assert.assertEquals(0, zeroCount.getDelta());
+ Assert.assertEquals(0, oneCount.getDelta());
+ Assert.assertEquals(0, twoCount.getDelta());
RecordHistogram.recordEnumeratedHistogram(histogram, 0, boundary);
- assertEquals(1, zeroCount.getDelta());
- assertEquals(0, oneCount.getDelta());
- assertEquals(0, twoCount.getDelta());
+ Assert.assertEquals(1, zeroCount.getDelta());
+ Assert.assertEquals(0, oneCount.getDelta());
+ Assert.assertEquals(0, twoCount.getDelta());
RecordHistogram.recordEnumeratedHistogram(histogram, 0, boundary);
- assertEquals(2, zeroCount.getDelta());
- assertEquals(0, oneCount.getDelta());
- assertEquals(0, twoCount.getDelta());
+ Assert.assertEquals(2, zeroCount.getDelta());
+ Assert.assertEquals(0, oneCount.getDelta());
+ Assert.assertEquals(0, twoCount.getDelta());
RecordHistogram.recordEnumeratedHistogram(histogram, 2, boundary);
- assertEquals(2, zeroCount.getDelta());
- assertEquals(0, oneCount.getDelta());
- assertEquals(1, twoCount.getDelta());
+ Assert.assertEquals(2, zeroCount.getDelta());
+ Assert.assertEquals(0, oneCount.getDelta());
+ Assert.assertEquals(1, twoCount.getDelta());
}
/**
* Tests recording of count histograms.
*/
+ @Test
@SmallTest
public void testRecordCountHistogram() {
String histogram = "HelloWorld.CountMetric";
@@ -90,39 +98,40 @@ public class RecordHistogramTest extends InstrumentationTestCase {
HistogramDelta twoCount = new HistogramDelta(histogram, 2);
HistogramDelta eightThousandCount = new HistogramDelta(histogram, 8000);
- assertEquals(0, zeroCount.getDelta());
- assertEquals(0, oneCount.getDelta());
- assertEquals(0, twoCount.getDelta());
- assertEquals(0, eightThousandCount.getDelta());
+ Assert.assertEquals(0, zeroCount.getDelta());
+ Assert.assertEquals(0, oneCount.getDelta());
+ Assert.assertEquals(0, twoCount.getDelta());
+ Assert.assertEquals(0, eightThousandCount.getDelta());
RecordHistogram.recordCountHistogram(histogram, 0);
- assertEquals(1, zeroCount.getDelta());
- assertEquals(0, oneCount.getDelta());
- assertEquals(0, twoCount.getDelta());
- assertEquals(0, eightThousandCount.getDelta());
+ Assert.assertEquals(1, zeroCount.getDelta());
+ Assert.assertEquals(0, oneCount.getDelta());
+ Assert.assertEquals(0, twoCount.getDelta());
+ Assert.assertEquals(0, eightThousandCount.getDelta());
RecordHistogram.recordCountHistogram(histogram, 0);
- assertEquals(2, zeroCount.getDelta());
- assertEquals(0, oneCount.getDelta());
- assertEquals(0, twoCount.getDelta());
- assertEquals(0, eightThousandCount.getDelta());
+ Assert.assertEquals(2, zeroCount.getDelta());
+ Assert.assertEquals(0, oneCount.getDelta());
+ Assert.assertEquals(0, twoCount.getDelta());
+ Assert.assertEquals(0, eightThousandCount.getDelta());
RecordHistogram.recordCountHistogram(histogram, 2);
- assertEquals(2, zeroCount.getDelta());
- assertEquals(0, oneCount.getDelta());
- assertEquals(1, twoCount.getDelta());
- assertEquals(0, eightThousandCount.getDelta());
+ Assert.assertEquals(2, zeroCount.getDelta());
+ Assert.assertEquals(0, oneCount.getDelta());
+ Assert.assertEquals(1, twoCount.getDelta());
+ Assert.assertEquals(0, eightThousandCount.getDelta());
RecordHistogram.recordCountHistogram(histogram, 8000);
- assertEquals(2, zeroCount.getDelta());
- assertEquals(0, oneCount.getDelta());
- assertEquals(1, twoCount.getDelta());
- assertEquals(1, eightThousandCount.getDelta());
+ Assert.assertEquals(2, zeroCount.getDelta());
+ Assert.assertEquals(0, oneCount.getDelta());
+ Assert.assertEquals(1, twoCount.getDelta());
+ Assert.assertEquals(1, eightThousandCount.getDelta());
}
/**
* Tests recording of custom times histograms.
*/
+ @Test
@SmallTest
public void testRecordCustomTimesHistogram() {
String histogram = "HelloWorld.CustomTimesMetric";
@@ -130,36 +139,37 @@ public class RecordHistogramTest extends InstrumentationTestCase {
HistogramDelta oneCount = new HistogramDelta(histogram, 1);
HistogramDelta twoCount = new HistogramDelta(histogram, 100);
- assertEquals(0, zeroCount.getDelta());
- assertEquals(0, oneCount.getDelta());
- assertEquals(0, twoCount.getDelta());
+ Assert.assertEquals(0, zeroCount.getDelta());
+ Assert.assertEquals(0, oneCount.getDelta());
+ Assert.assertEquals(0, twoCount.getDelta());
TimeUnit milli = TimeUnit.MILLISECONDS;
RecordHistogram.recordCustomTimesHistogram(histogram, 0, 1, 100, milli, 3);
- assertEquals(1, zeroCount.getDelta());
- assertEquals(0, oneCount.getDelta());
- assertEquals(0, twoCount.getDelta());
+ Assert.assertEquals(1, zeroCount.getDelta());
+ Assert.assertEquals(0, oneCount.getDelta());
+ Assert.assertEquals(0, twoCount.getDelta());
RecordHistogram.recordCustomTimesHistogram(histogram, 0, 1, 100, milli, 3);
- assertEquals(2, zeroCount.getDelta());
- assertEquals(0, oneCount.getDelta());
- assertEquals(0, twoCount.getDelta());
+ Assert.assertEquals(2, zeroCount.getDelta());
+ Assert.assertEquals(0, oneCount.getDelta());
+ Assert.assertEquals(0, twoCount.getDelta());
RecordHistogram.recordCustomTimesHistogram(histogram, 95, 1, 100, milli, 3);
- assertEquals(2, zeroCount.getDelta());
- assertEquals(1, oneCount.getDelta());
- assertEquals(0, twoCount.getDelta());
+ Assert.assertEquals(2, zeroCount.getDelta());
+ Assert.assertEquals(1, oneCount.getDelta());
+ Assert.assertEquals(0, twoCount.getDelta());
RecordHistogram.recordCustomTimesHistogram(histogram, 200, 1, 100, milli, 3);
- assertEquals(2, zeroCount.getDelta());
- assertEquals(1, oneCount.getDelta());
- assertEquals(1, twoCount.getDelta());
+ Assert.assertEquals(2, zeroCount.getDelta());
+ Assert.assertEquals(1, oneCount.getDelta());
+ Assert.assertEquals(1, twoCount.getDelta());
}
/**
* Tests recording of linear count histograms.
*/
+ @Test
@SmallTest
public void testRecordLinearCountHistogram() {
String histogram = "HelloWorld.LinearCountMetric";
@@ -170,23 +180,23 @@ public class RecordHistogramTest extends InstrumentationTestCase {
final int max = 3;
final int numBuckets = 4;
- assertEquals(0, zeroCount.getDelta());
- assertEquals(0, oneCount.getDelta());
- assertEquals(0, twoCount.getDelta());
+ Assert.assertEquals(0, zeroCount.getDelta());
+ Assert.assertEquals(0, oneCount.getDelta());
+ Assert.assertEquals(0, twoCount.getDelta());
RecordHistogram.recordLinearCountHistogram(histogram, 0, min, max, numBuckets);
- assertEquals(1, zeroCount.getDelta());
- assertEquals(0, oneCount.getDelta());
- assertEquals(0, twoCount.getDelta());
+ Assert.assertEquals(1, zeroCount.getDelta());
+ Assert.assertEquals(0, oneCount.getDelta());
+ Assert.assertEquals(0, twoCount.getDelta());
RecordHistogram.recordLinearCountHistogram(histogram, 0, min, max, numBuckets);
- assertEquals(2, zeroCount.getDelta());
- assertEquals(0, oneCount.getDelta());
- assertEquals(0, twoCount.getDelta());
+ Assert.assertEquals(2, zeroCount.getDelta());
+ Assert.assertEquals(0, oneCount.getDelta());
+ Assert.assertEquals(0, twoCount.getDelta());
RecordHistogram.recordLinearCountHistogram(histogram, 2, min, max, numBuckets);
- assertEquals(2, zeroCount.getDelta());
- assertEquals(0, oneCount.getDelta());
- assertEquals(1, twoCount.getDelta());
+ Assert.assertEquals(2, zeroCount.getDelta());
+ Assert.assertEquals(0, oneCount.getDelta());
+ Assert.assertEquals(1, twoCount.getDelta());
}
}
« no previous file with comments | « base/android/javatests/src/org/chromium/base/ObserverListTest.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698