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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1132103002: Remove memento. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 7 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/src/task/dart_test.dart ('k') | pkg/analyzer/test/src/task/model_test.dart » ('j') | 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 d69dbe445992aaca2b3ff5aa428fc4f82011b19a..34d58254c2bcb50a6fb7321003c782c1411d9d9b 100644
--- a/pkg/analyzer/test/src/task/driver_test.dart
+++ b/pkg/analyzer/test/src/task/driver_test.dart
@@ -64,10 +64,10 @@ class AnalysisDriverTest extends AbstractContextTest {
taskManager.addTaskDescriptor(descriptor);
context.priorityTargets.add(priorityTarget);
context.getCacheEntry(priorityTarget).setValue(
- result, '', TargetedResult.EMPTY_LIST, null);
+ result, '', TargetedResult.EMPTY_LIST);
context.explicitTargets.add(normalTarget);
context.getCacheEntry(priorityTarget).setValue(
- result, '', TargetedResult.EMPTY_LIST, null);
+ result, '', TargetedResult.EMPTY_LIST);
expect(analysisDriver.createNextWorkOrder(), isNull);
}
@@ -83,7 +83,7 @@ class AnalysisDriverTest extends AbstractContextTest {
taskManager.addTaskDescriptor(descriptor);
context.priorityTargets.add(priorityTarget);
context.getCacheEntry(priorityTarget).setValue(
- result, '', TargetedResult.EMPTY_LIST, null);
+ result, '', TargetedResult.EMPTY_LIST);
context.explicitTargets.add(normalTarget);
context.getCacheEntry(normalTarget).setState(result, CacheState.INVALID);
@@ -160,7 +160,7 @@ class AnalysisDriverTest extends AbstractContextTest {
AnalysisTarget target = new TestSource();
ResultDescriptor result = new ResultDescriptor('result', null);
context.getCacheEntry(target).setValue(
- result, '', TargetedResult.EMPTY_LIST, null);
+ result, '', TargetedResult.EMPTY_LIST);
expect(analysisDriver.createWorkOrderForResult(target, result), isNull);
}
@@ -279,32 +279,6 @@ class AnalysisDriverTest extends AbstractContextTest {
expect(analysisDriver.performAnalysisTask(), false);
}
- test_performAnalysisTask_recordMemento() {
- AnalysisTarget target = new TestSource();
- ResultDescriptor result = new ResultDescriptor('result', -1);
- // configure tasks
- TestAnalysisTask task;
- TaskDescriptor descriptor = new TaskDescriptor(
- 'task', (context, target) => task, (target) => {}, [result]);
- task = new TestAnalysisTask(context, target,
- descriptor: descriptor,
- memento: 'my mem',
- results: [result],
- value: 10);
- taskManager.addTaskDescriptor(descriptor);
- context.explicitTargets.add(target);
- taskManager.addGeneralResult(result);
- // prepare work order
- expect(analysisDriver.performAnalysisTask(), true);
- expect(context.getCacheEntry(target).getValue(result), -1);
- // compute result
- expect(analysisDriver.performAnalysisTask(), true);
- expect(context.getCacheEntry(target).getValue(result), 10);
- expect(context.getCacheEntry(target).getMemento(result), 'my mem');
- // done
- expect(analysisDriver.performAnalysisTask(), false);
- }
-
test_performWorkItem_exceptionInTask() {
AnalysisTarget target = new TestSource();
ResultDescriptor result = new ResultDescriptor('result', null);
@@ -315,7 +289,7 @@ class AnalysisDriverTest extends AbstractContextTest {
'task', (context, target) => task, (target) => {}, [result]);
task = new TestAnalysisTask(context, target,
descriptor: descriptor, exception: exception);
- WorkItem item = new WorkItem(context, target, descriptor, null);
+ WorkItem item = new WorkItem(context, target, descriptor);
analysisDriver.performWorkItem(item);
CacheEntry targetEntry = context.getCacheEntry(item.target);
@@ -330,7 +304,7 @@ class AnalysisDriverTest extends AbstractContextTest {
TaskDescriptor descriptor = new TaskDescriptor(
'task', (context, target) => task, (target) => {}, [result]);
task = new TestAnalysisTask(context, target, descriptor: descriptor);
- WorkItem item = new WorkItem(context, target, descriptor, null);
+ WorkItem item = new WorkItem(context, target, descriptor);
analysisDriver.performWorkItem(item);
CacheEntry targetEntry = context.getCacheEntry(item.target);
@@ -346,7 +320,7 @@ class AnalysisDriverTest extends AbstractContextTest {
(target) => {}, [result]);
CaughtException exception =
new CaughtException(new AnalysisException(), null);
- WorkItem item = new WorkItem(context, target, descriptor, null);
+ WorkItem item = new WorkItem(context, target, descriptor);
item.exception = exception;
analysisDriver.performWorkItem(item);
@@ -362,7 +336,7 @@ class AnalysisDriverTest extends AbstractContextTest {
(target) => {'one': inputResult.of(target)},
[new ResultDescriptor('output', null)]);
analysisDriver.currentWorkOrder =
- new WorkOrder(taskManager, new WorkItem(null, null, descriptor, null));
+ new WorkOrder(taskManager, new WorkItem(null, null, descriptor));
analysisDriver.reset();
expect(analysisDriver.currentWorkOrder, isNull);
@@ -395,7 +369,7 @@ class AnalysisDriverTest extends AbstractContextTest {
}
if (complete) {
context.getCacheEntry(target).setValue(
- result, '', TargetedResult.EMPTY_LIST, null);
+ result, '', TargetedResult.EMPTY_LIST);
} else {
context.getCacheEntry(target).setState(result, CacheState.INVALID);
}
@@ -420,11 +394,9 @@ class WorkItemTest extends EngineTestCase {
TaskDescriptor descriptor = new TaskDescriptor('task',
(context, target) => new TestAnalysisTask(context, target),
(target) => {}, [new ResultDescriptor('output', null)]);
- Object memento = new Object();
- WorkItem item = new WorkItem(context, target, descriptor, memento);
+ WorkItem item = new WorkItem(context, target, descriptor);
AnalysisTask task = item.buildTask();
expect(task, isNotNull);
- expect(task.inputMemento, memento);
}
test_buildTask_incomplete() {
@@ -436,21 +408,19 @@ class WorkItemTest extends EngineTestCase {
TaskDescriptor descriptor = new TaskDescriptor('task', (context, target) =>
new TestAnalysisTask(context, target, results: outputResults),
(target) => {'one': inputResult.of(target)}, outputResults);
- WorkItem item = new WorkItem(context, target, descriptor, null);
+ WorkItem item = new WorkItem(context, target, descriptor);
expect(() => item.buildTask(), throwsStateError);
}
test_create() {
AnalysisContext context = new AnalysisContextImpl();
AnalysisTarget target = new TestSource();
- Object memento = new Object();
TaskDescriptor descriptor = new TaskDescriptor(
'task', null, (target) => {}, [new ResultDescriptor('result', null)]);
- WorkItem item = new WorkItem(context, target, descriptor, memento);
+ WorkItem item = new WorkItem(context, target, descriptor);
expect(item, isNotNull);
expect(item.context, context);
expect(item.descriptor, descriptor);
- expect(item.inputMemento, memento);
expect(item.target, target);
}
@@ -461,7 +431,7 @@ class WorkItemTest extends EngineTestCase {
TaskDescriptor descriptor = new TaskDescriptor('task',
(context, target) => new TestAnalysisTask(context, target),
(target) => {}, [new ResultDescriptor('output', null)]);
- WorkItem item = new WorkItem(context, target, descriptor, null);
+ WorkItem item = new WorkItem(context, target, descriptor);
WorkItem result = item.gatherInputs(manager);
expect(result, isNull);
expect(item.exception, isNull);
@@ -482,18 +452,10 @@ class WorkItemTest extends EngineTestCase {
(target) => {'one': resultA.of(target)}, [resultB]);
manager.addTaskDescriptor(task1);
manager.addTaskDescriptor(task2);
- // configure memento for "resultA"
- dynamic memento = 'main() {}';
- {
- CacheEntry cacheEntry = context.getCacheEntry(target);
- cacheEntry.setValue(resultA, null, TargetedResult.EMPTY_LIST, memento);
- cacheEntry.setState(resultA, CacheState.INVALID);
- }
// gather inputs
- WorkItem item = new WorkItem(context, target, task2, null);
+ WorkItem item = new WorkItem(context, target, task2);
WorkItem inputItem = item.gatherInputs(manager);
expect(inputItem, isNotNull);
- expect(inputItem.inputMemento, memento);
}
test_gatherInputs_invalid() {
@@ -505,7 +467,7 @@ class WorkItemTest extends EngineTestCase {
(context, target) => new TestAnalysisTask(context, target),
(target) => {'one': inputResult.of(target)},
[new ResultDescriptor('output', null)]);
- WorkItem item = new WorkItem(context, target, descriptor, null);
+ WorkItem item = new WorkItem(context, target, descriptor);
WorkItem result = item.gatherInputs(manager);
expect(result, isNull);
expect(item.exception, isNotNull);
@@ -519,7 +481,7 @@ class WorkOrderTest extends EngineTestCase {
TaskDescriptor descriptor = new TaskDescriptor(
'task', null, (_) => {}, [new ResultDescriptor('result', null)]);
WorkOrder order =
- new WorkOrder(manager, new WorkItem(null, null, descriptor, null));
+ new WorkOrder(manager, new WorkItem(null, null, descriptor));
expect(order, isNotNull);
expect(order.currentItem, isNull);
expect(order.pendingItems, hasLength(1));
@@ -530,7 +492,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, descriptor, null);
+ WorkItem workItem = new WorkItem(null, null, descriptor);
WorkOrder order = new WorkOrder(manager, workItem);
// "item" has no child items
expect(order.moveNext(), isTrue);
« no previous file with comments | « pkg/analyzer/test/src/task/dart_test.dart ('k') | pkg/analyzer/test/src/task/model_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698