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

Unified Diff: LayoutTests/imported/web-platform-tests/user-timing/test_user_timing_measure.html

Issue 1191043004: Import hr-time and user-timing tests, remove redundant webperf copies (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add idlharness result Created 5 years, 6 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
Index: LayoutTests/imported/web-platform-tests/user-timing/test_user_timing_measure.html
diff --git a/LayoutTests/http/tests/w3c/webperf/approved/UserTiming/test_user_timing_measure.htm b/LayoutTests/imported/web-platform-tests/user-timing/test_user_timing_measure.html
similarity index 96%
rename from LayoutTests/http/tests/w3c/webperf/approved/UserTiming/test_user_timing_measure.htm
rename to LayoutTests/imported/web-platform-tests/user-timing/test_user_timing_measure.html
index 9f519f8caf5b55bf8977ec14b86c0416efcf638c..13051f404ce3ffffec248b3e7712cb7ed10fd39c 100644
--- a/LayoutTests/http/tests/w3c/webperf/approved/UserTiming/test_user_timing_measure.htm
+++ b/LayoutTests/imported/web-platform-tests/user-timing/test_user_timing_measure.html
@@ -4,10 +4,10 @@
<meta charset="UTF-8" />
<title>window.performance User Timing measure() method is working properly</title>
<link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
- <link rel="help" href="http://127.0.0.1:8000/webperf/specs/UserTiming/#dom-performance-measure"/>
- <script src="/w3c/resources/testharness.js"></script>
- <script src="/w3c/resources/testharnessreport.js"></script>
- <script src="/w3c/webperf/resources/webperftestharness.js"></script>
+ <link rel="help" href="http://www.w3.org/TR/user-timing/#dom-performance-measure"/>
+ <script src="../../../resources/testharness.js"></script>
+ <script src="../../../resources/testharnessreport.js"></script>
+ <script src="resources/webperftestharness.js"></script>
<script type="text/javascript">
// test data
@@ -68,7 +68,7 @@
}
];
- setup({timeout:1000, explicit_done: true});
+ setup({explicit_done: true});
test_namespace();
@@ -233,7 +233,7 @@
// test startTime; since for a mark, the startTime is always equal to a mark's value or the value of a
// navigation timing attribute, the actual startTime should match the expected value exactly
test_true(Math.abs(measureEntry.startTime - expectedStartTime) == 0,
- measureEntryCommand + ".startTime == " );
+ measureEntryCommand + ".startTime == " + expectedStartTime);
// test entryType
test_true(measureEntry.entryType == "measure", measureEntryCommand + ".entryType == \"measure\"");
@@ -241,7 +241,7 @@
// test duration, allow for an acceptable threshold in the difference between the actual duration and the
// expected value for the duration
test_true(Math.abs(measureEntry.duration - expectedDuration) <= testThreshold, measureEntryCommand +
- ".duration ~== " + " (up to " + testThreshold + "ms difference allowed)");
+ ".duration ~== " + expectedDuration + " (up to " + testThreshold + "ms difference allowed)");
}
function test_measure_list(measureEntryList, measureEntryListCommand, measureScenarios)

Powered by Google App Engine
This is Rietveld 408576698