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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: pkg/analyzer/test/src/task/driver_test.dart

Issue 1555073003: Replace ResultProvider with 'aboutToComputeResult'. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 12 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 | « pkg/analyzer/test/generated/engine_test.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/test/src/task/driver_test.dart
diff --git a/pkg/analyzer/test/src/task/driver_test.dart b/pkg/analyzer/test/src/task/driver_test.dart
index 4dccb63c9f05f90434883390be150005cb4c5f62..221636a2c5e41c8e19b01313ffecc22544bb2c1b 100644
--- a/pkg/analyzer/test/src/task/driver_test.dart
+++ b/pkg/analyzer/test/src/task/driver_test.dart
@@ -36,6 +36,7 @@ class AbstractDriverTest {
void setUp() {
context = new _InternalAnalysisContextMock();
analysisDriver = new AnalysisDriver(taskManager, workManagers, context);
+ when(context.aboutToComputeResult(anyObject, anyObject)).thenReturn(false);
}
}
@@ -344,8 +345,7 @@ class AnalysisDriverTest extends AbstractDriverTest {
'task', (context, target) => task, (target) => {}, [result]);
task = new TestAnalysisTask(context, target,
descriptor: descriptor, value: 42);
- WorkItem item =
- new WorkItem(context, null, target, descriptor, null, 0, null);
+ WorkItem item = new WorkItem(context, target, descriptor, null, 0, null);
bool streamNotified = false;
analysisDriver.onResultComputed(result).listen((event) {
@@ -369,8 +369,7 @@ class AnalysisDriverTest extends AbstractDriverTest {
'task', (context, target) => task, (target) => {}, [result]);
task = new TestAnalysisTask(context, target,
descriptor: descriptor, exception: exception);
- WorkItem item =
- new WorkItem(context, null, target, descriptor, null, 0, null);
+ WorkItem item = new WorkItem(context, target, descriptor, null, 0, null);
analysisDriver.performWorkItem(item);
CacheEntry targetEntry = context.getCacheEntry(item.target);
@@ -385,8 +384,7 @@ class AnalysisDriverTest extends AbstractDriverTest {
TaskDescriptor descriptor = new TaskDescriptor(
'task', (context, target) => task, (target) => {}, [result]);
task = new TestAnalysisTask(context, target, descriptor: descriptor);
- WorkItem item =
- new WorkItem(context, null, target, descriptor, null, 0, null);
+ WorkItem item = new WorkItem(context, target, descriptor, null, 0, null);
analysisDriver.performWorkItem(item);
CacheEntry targetEntry = context.getCacheEntry(item.target);
@@ -404,8 +402,7 @@ class AnalysisDriverTest extends AbstractDriverTest {
[result]);
CaughtException exception =
new CaughtException(new AnalysisException(), null);
- WorkItem item =
- new WorkItem(context, null, target, descriptor, null, 0, null);
+ WorkItem item = new WorkItem(context, target, descriptor, null, 0, null);
item.exception = exception;
analysisDriver.performWorkItem(item);
@@ -422,7 +419,7 @@ class AnalysisDriverTest extends AbstractDriverTest {
(target) => {'one': inputResult.of(target)},
[new ResultDescriptor('output', null)]);
analysisDriver.currentWorkOrder = new WorkOrder(
- taskManager, new WorkItem(null, null, null, descriptor, null, 0, null));
+ taskManager, new WorkItem(null, null, descriptor, null, 0, null));
analysisDriver.reset();
expect(analysisDriver.currentWorkOrder, isNull);
@@ -620,8 +617,7 @@ class WorkItemTest extends AbstractDriverTest {
(context, target) => new TestAnalysisTask(context, target),
(target) => {},
[new ResultDescriptor('output', null)]);
- WorkItem item =
- new WorkItem(context, null, target, descriptor, null, 0, null);
+ WorkItem item = new WorkItem(context, target, descriptor, null, 0, null);
AnalysisTask task = item.buildTask();
expect(task, isNotNull);
}
@@ -638,8 +634,7 @@ class WorkItemTest extends AbstractDriverTest {
new TestAnalysisTask(context, target, results: outputResults),
(target) => {'one': inputResult.of(target)},
outputResults);
- WorkItem item =
- new WorkItem(context, null, target, descriptor, null, 0, null);
+ WorkItem item = new WorkItem(context, target, descriptor, null, 0, null);
expect(() => item.buildTask(), throwsStateError);
}
@@ -647,8 +642,7 @@ class WorkItemTest extends AbstractDriverTest {
AnalysisTarget target = new TestSource();
TaskDescriptor descriptor = new TaskDescriptor(
'task', null, (target) => {}, [new ResultDescriptor('result', null)]);
- WorkItem item =
- new WorkItem(context, null, target, descriptor, null, 0, null);
+ WorkItem item = new WorkItem(context, target, descriptor, null, 0, null);
expect(item, isNotNull);
expect(item.context, context);
expect(item.descriptor, descriptor);
@@ -662,8 +656,7 @@ class WorkItemTest extends AbstractDriverTest {
(context, target) => new TestAnalysisTask(context, target),
(target) => {},
[new ResultDescriptor('output', null)]);
- WorkItem item =
- new WorkItem(context, null, target, descriptor, null, 0, null);
+ WorkItem item = new WorkItem(context, target, descriptor, null, 0, null);
WorkItem result = item.gatherInputs(taskManager, []);
expect(result, isNull);
expect(item.exception, isNull);
@@ -688,7 +681,7 @@ class WorkItemTest extends AbstractDriverTest {
taskManager.addTaskDescriptor(task1);
taskManager.addTaskDescriptor(task2);
// gather inputs
- WorkItem item = new WorkItem(context, null, target, task2, null, 0, null);
+ WorkItem item = new WorkItem(context, target, task2, null, 0, null);
WorkItem inputItem = item.gatherInputs(taskManager, []);
expect(inputItem, isNotNull);
}
@@ -701,14 +694,13 @@ class WorkItemTest extends AbstractDriverTest {
(context, target) => new TestAnalysisTask(context, target),
(target) => {'one': inputResult.of(target)},
[new ResultDescriptor('output', null)]);
- WorkItem item =
- new WorkItem(context, null, target, descriptor, null, 0, null);
+ WorkItem item = new WorkItem(context, target, descriptor, null, 0, null);
WorkItem result = item.gatherInputs(taskManager, []);
expect(result, isNull);
expect(item.exception, isNotNull);
}
- test_gatherInputs_useResultProvider_hasResult() {
+ test_gatherInputs_aboutToComputeResult_hasResult() {
AnalysisTarget target = new TestSource();
ResultDescriptor resultA = new ResultDescriptor('resultA', null);
ResultDescriptor resultB = new ResultDescriptor('resultB', null);
@@ -726,18 +718,15 @@ class WorkItemTest extends AbstractDriverTest {
[resultB]);
taskManager.addTaskDescriptor(task1);
taskManager.addTaskDescriptor(task2);
- // configure ResultProvider
- ResultProvider resultProvider = new _ResultProviderMock();
- when(resultProvider.provideResult(context, anyObject, resultA))
- .thenReturn(true);
+ // configure mocks
+ when(context.aboutToComputeResult(anyObject, resultA)).thenReturn(true);
// gather inputs
- WorkItem item =
- new WorkItem(context, resultProvider, target, task2, null, 0, null);
+ WorkItem item = new WorkItem(context, target, task2, null, 0, null);
WorkItem inputItem = item.gatherInputs(taskManager, []);
expect(inputItem, isNull);
}
- test_gatherInputs_useResultProvider_noResult() {
+ test_gatherInputs_aboutToComputeResult_noResult() {
AnalysisTarget target = new TestSource();
ResultDescriptor resultA = new ResultDescriptor('resultA', null);
ResultDescriptor resultB = new ResultDescriptor('resultB', null);
@@ -756,12 +745,10 @@ class WorkItemTest extends AbstractDriverTest {
taskManager.addTaskDescriptor(task1);
taskManager.addTaskDescriptor(task2);
// configure ResultProvider
- ResultProvider resultProvider = new _ResultProviderMock();
- when(resultProvider.provideResult(anyObject, anyObject, anyObject))
- .thenReturn(false);
+ // configure mocks
+ when(context.aboutToComputeResult(anyObject, resultA)).thenReturn(false);
// gather inputs
- WorkItem item =
- new WorkItem(context, resultProvider, target, task2, null, 0, null);
+ WorkItem item = new WorkItem(context, target, task2, null, 0, null);
WorkItem inputItem = item.gatherInputs(taskManager, []);
expect(inputItem, isNotNull);
expect(inputItem.target, target);
@@ -776,7 +763,7 @@ class WorkOrderTest extends EngineTestCase {
TaskDescriptor descriptor = new TaskDescriptor(
'task', null, (_) => {}, [new ResultDescriptor('result', null)]);
WorkOrder order = new WorkOrder(
- manager, new WorkItem(null, null, null, descriptor, null, 0, null));
+ manager, new WorkItem(null, null, descriptor, null, 0, null));
expect(order, isNotNull);
expect(order.currentItems, isNull);
expect(order.current, isNull);
@@ -786,8 +773,7 @@ class WorkOrderTest extends EngineTestCase {
TaskManager manager = new TaskManager();
TaskDescriptor descriptor = new TaskDescriptor(
'task', null, (_) => {}, [new ResultDescriptor('result', null)]);
- WorkItem workItem =
- new WorkItem(null, null, null, descriptor, null, 0, null);
+ WorkItem workItem = new WorkItem(null, null, descriptor, null, 0, null);
WorkOrder order = new WorkOrder(manager, workItem);
// "item" has no child items
expect(order.moveNext(), isTrue);
@@ -827,8 +813,6 @@ class _InternalAnalysisContextMock extends TypedMock
}
}
-class _ResultProviderMock extends TypedMock implements ResultProvider {}
-
/**
* Concrete class for testing [CycleAwareDependencyWalker] behavior.
*/
« no previous file with comments | « pkg/analyzer/test/generated/engine_test.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698