Commit d4f6781b authored by fmeawad's avatar fmeawad Committed by Commit bot

[Telemetry] Rename PageRun to UserStoryRun part of switching from...

[Telemetry] Rename PageRun to UserStoryRun part of switching from PageTestResults to UserStoryTestResults

This is the first step, next will rename PageTestResult to UserStoryTestResult.

BUG=442036

Review URL: https://codereview.chromium.org/964913005

Cr-Commit-Position: refs/heads/master@{#318737}
parent afeb3fcf
......@@ -45,8 +45,8 @@ class CsvPivotTableOutputFormatter(output_formatter.OutputFormatter):
for run in page_test_results.all_page_runs:
run_index = page_test_results.all_page_runs.index(run)
page_dict = {
'page': run.page.display_name,
'page_set': run.page.page_set.Name(),
'page': run.user_story.display_name,
'page_set': run.user_story.page_set.Name(),
'run_index': run_index,
}
for value in run.values:
......
......@@ -81,7 +81,7 @@ class GTestProgressReporter(progress_reporter.ProgressReporter):
(len(page_test_results.failures), unit))
for failed_run in failed_runs:
print >> self._output_stream, '[ FAILED ] %s' % (
failed_run.page.display_name)
failed_run.user_story.display_name)
print >> self._output_stream
count = len(failed_runs)
unit = 'TEST' if count == 1 else 'TESTS'
......
......@@ -36,7 +36,7 @@ def ResultsAsDict(page_test_results, benchmark_metadata):
def _GetAllPages(page_test_results):
pages = set(page_run.page for page_run in
pages = set(page_run.user_story for page_run in
page_test_results.all_page_runs)
return pages
......
......@@ -12,8 +12,8 @@ import sys
import traceback
from telemetry import value as value_module
from telemetry.results import page_run
from telemetry.results import progress_reporter as progress_reporter_module
from telemetry.results import user_story_run
from telemetry.util import cloud_storage
from telemetry.value import failure
from telemetry.value import skip
......@@ -94,7 +94,7 @@ class PageTestResults(object):
@property
def current_page(self):
assert self._current_page_run, 'Not currently running test.'
return self._current_page_run.page
return self._current_page_run.user_story
@property
def current_page_run(self):
......@@ -108,7 +108,7 @@ class PageTestResults(object):
@property
def pages_that_succeeded(self):
"""Returns the set of pages that succeeded."""
pages = set(run.page for run in self.all_page_runs)
pages = set(run.user_story for run in self.all_page_runs)
pages.difference_update(self.pages_that_failed)
return pages
......@@ -118,7 +118,7 @@ class PageTestResults(object):
failed_pages = set()
for run in self.all_page_runs:
if run.failed:
failed_pages.add(run.page)
failed_pages.add(run.user_story)
return failed_pages
@property
......@@ -150,7 +150,7 @@ class PageTestResults(object):
def WillRunPage(self, page):
assert not self._current_page_run, 'Did not call DidRunPage.'
self._current_page_run = page_run.PageRun(page)
self._current_page_run = user_story_run.UserStoryRun(page)
self._progress_reporter.WillRunPage(self)
def DidRunPage(self, page, discard_run=False): # pylint: disable=W0613
......
......@@ -55,7 +55,7 @@ class PageTestResultsTest(base_test_results_unittest.BaseTestResultsUnittest):
results.DidRunPage(self.pages[1])
self.assertTrue(results.all_page_runs[0].skipped)
self.assertEqual(self.pages[0], results.all_page_runs[0].page)
self.assertEqual(self.pages[0], results.all_page_runs[0].user_story)
self.assertEqual(set([self.pages[0], self.pages[1]]),
results.pages_that_succeeded)
......
# Copyright 2014 The Chromium Authors. All rights reserved.
# Copyright 2015 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.
......@@ -6,21 +6,21 @@ from telemetry.value import failure
from telemetry.value import skip
class PageRun(object):
def __init__(self, page):
self._page = page
class UserStoryRun(object):
def __init__(self, user_story):
self._user_story = user_story
self._values = []
def AddValue(self, value):
self._values.append(value)
@property
def page(self):
return self._page
def user_story(self):
return self._user_story
@property
def values(self):
"""The values that correspond to this page run."""
"""The values that correspond to this user_story run."""
return self._values
@property
......
# Copyright 2014 The Chromium Authors. All rights reserved.
# Copyright 2015 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.
import os
import unittest
from telemetry import page as page_module
from telemetry.page import page_set
from telemetry.results import page_run
from telemetry import user_story as user_story_module
from telemetry.results import user_story_run
from telemetry.user_story import shared_user_story_state
from telemetry.user_story import user_story_set
from telemetry.value import failure
from telemetry.value import scalar
from telemetry.value import skip
class PageRunTest(unittest.TestCase):
# pylint: disable=abstract-method
class SharedUserStoryStateBar(shared_user_story_state.SharedUserStoryState):
pass
class UserStoryFoo(user_story_module.UserStory):
def __init__(self, name='', labels=None):
super(UserStoryFoo, self).__init__(
SharedUserStoryStateBar, name, labels)
class UserStoryRunTest(unittest.TestCase):
def setUp(self):
self.page_set = page_set.PageSet(file_path=os.path.dirname(__file__))
self.page_set.AddUserStory(page_module.Page(
'http://www.bar.com/', self.page_set, self.page_set.base_dir))
self.user_story_set = user_story_set.UserStorySet()
self.user_story_set.AddUserStory(UserStoryFoo())
@property
def pages(self):
return self.page_set.pages
def user_stories(self):
return self.user_story_set.user_stories
def testPageRunFailed(self):
run = page_run.PageRun(self.pages[0])
run.AddValue(failure.FailureValue.FromMessage(self.pages[0], 'test'))
def testUserStoryRunFailed(self):
run = user_story_run.UserStoryRun(self.user_stories[0])
run.AddValue(failure.FailureValue.FromMessage(self.user_stories[0], 'test'))
self.assertFalse(run.ok)
self.assertTrue(run.failed)
self.assertFalse(run.skipped)
run = page_run.PageRun(self.pages[0])
run.AddValue(scalar.ScalarValue(self.pages[0], 'a', 's', 1))
run.AddValue(failure.FailureValue.FromMessage(self.pages[0], 'test'))
run = user_story_run.UserStoryRun(self.user_stories[0])
run.AddValue(scalar.ScalarValue(self.user_stories[0], 'a', 's', 1))
run.AddValue(failure.FailureValue.FromMessage(self.user_stories[0], 'test'))
self.assertFalse(run.ok)
self.assertTrue(run.failed)
self.assertFalse(run.skipped)
def testPageRunSkipped(self):
run = page_run.PageRun(self.pages[0])
run.AddValue(failure.FailureValue.FromMessage(self.pages[0], 'test'))
run.AddValue(skip.SkipValue(self.pages[0], 'test'))
def testUserStoryRunSkipped(self):
run = user_story_run.UserStoryRun(self.user_stories[0])
run.AddValue(failure.FailureValue.FromMessage(self.user_stories[0], 'test'))
run.AddValue(skip.SkipValue(self.user_stories[0], 'test'))
self.assertFalse(run.ok)
self.assertFalse(run.failed)
self.assertTrue(run.skipped)
run = page_run.PageRun(self.pages[0])
run.AddValue(scalar.ScalarValue(self.pages[0], 'a', 's', 1))
run.AddValue(skip.SkipValue(self.pages[0], 'test'))
run = user_story_run.UserStoryRun(self.user_stories[0])
run.AddValue(scalar.ScalarValue(self.user_stories[0], 'a', 's', 1))
run.AddValue(skip.SkipValue(self.user_stories[0], 'test'))
self.assertFalse(run.ok)
self.assertFalse(run.failed)
self.assertTrue(run.skipped)
def testPageRunSucceeded(self):
run = page_run.PageRun(self.pages[0])
def testUserStoryRunSucceeded(self):
run = user_story_run.UserStoryRun(self.user_stories[0])
self.assertTrue(run.ok)
self.assertFalse(run.failed)
self.assertFalse(run.skipped)
run = page_run.PageRun(self.pages[0])
run.AddValue(scalar.ScalarValue(self.pages[0], 'a', 's', 1))
run = user_story_run.UserStoryRun(self.user_stories[0])
run.AddValue(scalar.ScalarValue(self.user_stories[0], 'a', 's', 1))
self.assertTrue(run.ok)
self.assertFalse(run.failed)
self.assertFalse(run.skipped)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment