projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
tools
/
perf
/
benchmarks
/
maps.py
diff --git
a/src/tools/perf/benchmarks/maps.py
b/src/tools/perf/benchmarks/maps.py
index
43f30d4
..
efc42dd
100644
(file)
--- a/
src/tools/perf/benchmarks/maps.py
+++ b/
src/tools/perf/benchmarks/maps.py
@@
-8,18
+8,16
@@
Rerforms several common navigation actions on the map (pan, zoom, rotate)"""
import os
import re
import os
import re
-from telemetry import
test
+from telemetry import
benchmark
from telemetry.core import util
from telemetry.core import util
-from telemetry.page import page_measurement
from telemetry.page import page as page_module
from telemetry.page import page_set as page_set_module
from telemetry.page import page as page_module
from telemetry.page import page_set as page_set_module
-# pylint: disable=W0401,W0614
-from telemetry.page.actions.all_page_actions import *
+from telemetry.page import page_test
from telemetry.value import scalar
from telemetry.value import scalar
-class _MapsMeasurement(page_
measurement.PageMeasuremen
t):
- def MeasurePage(self, page, tab, results):
+class _MapsMeasurement(page_
test.PageTes
t):
+ def
ValidateAnd
MeasurePage(self, page, tab, results):
js_get_results = 'document.getElementsByTagName("pre")[0].innerText'
test_results = tab.EvaluateJavaScript(js_get_results)
js_get_results = 'document.getElementsByTagName("pre")[0].innerText'
test_results = tab.EvaluateJavaScript(js_get_results)
@@
-42,8
+40,8
@@
class MapsPage(page_module.Page):
action_runner.WaitForJavaScriptCondition('window.testDone')
action_runner.WaitForJavaScriptCondition('window.testDone')
-@
test
.Disabled
-class MapsBenchmark(
test.Test
):
+@
benchmark
.Disabled
+class MapsBenchmark(
benchmark.Benchmark
):
"""Basic Google Maps benchmarks."""
test = _MapsMeasurement
"""Basic Google Maps benchmarks."""
test = _MapsMeasurement