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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 882813007: Make source be a target (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Remove AbstractSource Created 5 years, 11 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/manager_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/inputs_test.dart
diff --git a/pkg/analyzer/test/src/task/inputs_test.dart b/pkg/analyzer/test/src/task/inputs_test.dart
index 4f9ba16c6e86652eaf76eea03d2c77cf99ceb272..685a20613f2a94aae7442a89d8d14272a7af8390 100644
--- a/pkg/analyzer/test/src/task/inputs_test.dart
+++ b/pkg/analyzer/test/src/task/inputs_test.dart
@@ -6,12 +6,11 @@ library test.src.task.inputs_test;
import 'package:analyzer/src/task/inputs.dart';
import 'package:analyzer/src/task/model.dart';
-import 'package:analyzer/src/task/targets.dart';
+import 'package:analyzer/task/model.dart';
import 'package:unittest/unittest.dart';
import '../../generated/test_support.dart';
import '../../reflective_tests.dart';
-import 'package:analyzer/task/model.dart';
main() {
groupSep = ' | ';
@@ -24,7 +23,7 @@ main() {
@reflectiveTest
class ListBasedTaskInputBuilderTest extends EngineTestCase {
- static final SourceTarget target1 = new SourceTarget(null);
+ static final AnalysisTarget target1 = new TestSource();
static final ResultDescriptorImpl result1 =
new ResultDescriptorImpl('result1', null);
static final ResultDescriptorImpl result2 =
@@ -39,12 +38,6 @@ class ListBasedTaskInputBuilderTest extends EngineTestCase {
expect(builder.input, input);
}
- test_currentResult_afterOneMoveNext() {
- ListBasedTaskInputBuilder builder = new ListBasedTaskInputBuilder(input);
- builder.moveNext();
- expect(builder.currentResult, result1);
- }
-
test_currentResult_afterComplete() {
ListBasedTaskInputBuilder builder = new ListBasedTaskInputBuilder(input);
builder.moveNext();
@@ -53,15 +46,15 @@ class ListBasedTaskInputBuilderTest extends EngineTestCase {
expect(builder.currentResult, null);
}
- test_currentResult_beforeMoveNext() {
+ test_currentResult_afterOneMoveNext() {
ListBasedTaskInputBuilder builder = new ListBasedTaskInputBuilder(input);
- expect(builder.currentResult, null);
+ builder.moveNext();
+ expect(builder.currentResult, result1);
}
- test_currentTarget_afterOneMoveNext() {
+ test_currentResult_beforeMoveNext() {
ListBasedTaskInputBuilder builder = new ListBasedTaskInputBuilder(input);
- builder.moveNext();
- expect(builder.currentTarget, target1);
+ expect(builder.currentResult, null);
}
test_currentTarget_afterComplete() {
@@ -72,6 +65,12 @@ class ListBasedTaskInputBuilderTest extends EngineTestCase {
expect(builder.currentTarget, null);
}
+ test_currentTarget_afterOneMoveNext() {
+ ListBasedTaskInputBuilder builder = new ListBasedTaskInputBuilder(input);
+ builder.moveNext();
+ expect(builder.currentTarget, target1);
+ }
+
test_currentTarget_beforeMoveNext() {
ListBasedTaskInputBuilder builder = new ListBasedTaskInputBuilder(input);
expect(builder.currentTarget, null);
@@ -90,15 +89,9 @@ class ListBasedTaskInputBuilderTest extends EngineTestCase {
}, throwsStateError);
}
- test_inputValue_afterOneMoveNext() {
- ListBasedTaskInputBuilder builder = new ListBasedTaskInputBuilder(input);
- builder.moveNext();
- expect(() => builder.inputValue, throwsStateError);
- }
-
test_inputValue_afterComplete() {
- SourceTarget target2 = new SourceTarget(null);
- SourceTarget target3 = new SourceTarget(null);
+ AnalysisTarget target2 = new TestSource();
+ AnalysisTarget target3 = new TestSource();
String value2 = 'value2';
String value3 = 'value3';
ListBasedTaskInputBuilder builder = new ListBasedTaskInputBuilder(input);
@@ -117,6 +110,12 @@ class ListBasedTaskInputBuilderTest extends EngineTestCase {
expect(list[1], value3);
}
+ test_inputValue_afterOneMoveNext() {
+ ListBasedTaskInputBuilder builder = new ListBasedTaskInputBuilder(input);
+ builder.moveNext();
+ expect(() => builder.inputValue, throwsStateError);
+ }
+
test_inputValue_beforeMoveNext() {
ListBasedTaskInputBuilder builder = new ListBasedTaskInputBuilder(input);
expect(() => builder.inputValue, throwsStateError);
@@ -139,7 +138,7 @@ class ListBasedTaskInputBuilderTest extends EngineTestCase {
@reflectiveTest
class ListBasedTaskInputTest extends EngineTestCase {
- static final SourceTarget target = new SourceTarget(null);
+ static final AnalysisTarget target = new TestSource();
static final ResultDescriptorImpl result =
new ResultDescriptorImpl('result', null);
@@ -162,7 +161,7 @@ class ListBasedTaskInputTest extends EngineTestCase {
@reflectiveTest
class SimpleTaskInputBuilderTest extends EngineTestCase {
- static final SourceTarget target = new SourceTarget(null);
+ static final AnalysisTarget target = new TestSource();
static final ResultDescriptorImpl result =
new ResultDescriptorImpl('result', null);
static final SimpleTaskInput input = new SimpleTaskInput(target, result);
@@ -173,12 +172,6 @@ class SimpleTaskInputBuilderTest extends EngineTestCase {
expect(builder.input, input);
}
- test_currentResult_afterOneMoveNext() {
- SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
- builder.moveNext();
- expect(builder.currentResult, result);
- }
-
test_currentResult_afterComplete() {
SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
builder.moveNext();
@@ -187,15 +180,15 @@ class SimpleTaskInputBuilderTest extends EngineTestCase {
expect(builder.currentResult, null);
}
- test_currentResult_beforeMoveNext() {
+ test_currentResult_afterOneMoveNext() {
SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
- expect(builder.currentResult, null);
+ builder.moveNext();
+ expect(builder.currentResult, result);
}
- test_currentTarget_afterOneMoveNext() {
+ test_currentResult_beforeMoveNext() {
SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
- builder.moveNext();
- expect(builder.currentTarget, target);
+ expect(builder.currentResult, null);
}
test_currentTarget_afterComplete() {
@@ -206,6 +199,12 @@ class SimpleTaskInputBuilderTest extends EngineTestCase {
expect(builder.currentTarget, null);
}
+ test_currentTarget_afterOneMoveNext() {
+ SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
+ builder.moveNext();
+ expect(builder.currentTarget, target);
+ }
+
test_currentTarget_beforeMoveNext() {
SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
expect(builder.currentTarget, null);
@@ -224,12 +223,6 @@ class SimpleTaskInputBuilderTest extends EngineTestCase {
}, throwsStateError);
}
- test_inputValue_afterOneMoveNext() {
- SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
- builder.moveNext();
- expect(() => builder.inputValue, throwsStateError);
- }
-
test_inputValue_afterComplete() {
SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
builder.moveNext();
@@ -239,6 +232,12 @@ class SimpleTaskInputBuilderTest extends EngineTestCase {
expect(builder.inputValue, value);
}
+ test_inputValue_afterOneMoveNext() {
+ SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
+ builder.moveNext();
+ expect(() => builder.inputValue, throwsStateError);
+ }
+
test_inputValue_beforeMoveNext() {
SimpleTaskInputBuilder builder = new SimpleTaskInputBuilder(input);
expect(() => builder.inputValue, throwsStateError);
@@ -261,7 +260,7 @@ class SimpleTaskInputBuilderTest extends EngineTestCase {
@reflectiveTest
class SimpleTaskInputTest extends EngineTestCase {
- static final SourceTarget target = new SourceTarget(null);
+ static final AnalysisTarget target = new TestSource();
static final ResultDescriptorImpl result =
new ResultDescriptorImpl('result', null);
@@ -280,7 +279,7 @@ class SimpleTaskInputTest extends EngineTestCase {
@reflectiveTest
class TopLevelTaskInputBuilderTest extends EngineTestCase {
- static final SourceTarget target = new SourceTarget(null);
+ static final AnalysisTarget target = new TestSource();
static final ResultDescriptorImpl result1 =
new ResultDescriptorImpl('result1', null);
static final ResultDescriptorImpl result2 =
@@ -296,27 +295,27 @@ class TopLevelTaskInputBuilderTest extends EngineTestCase {
expect(builder.inputDescriptors, inputDescriptors);
}
- test_currentResult_afterOneMoveNext() {
+ test_currentResult_afterComplete() {
Map<String, TaskInput> inputDescriptors = {
- 'one': input1,
- 'two': input2
+ 'one': input1
};
TopLevelTaskInputBuilder builder =
new TopLevelTaskInputBuilder(inputDescriptors);
builder.moveNext();
- expect(builder.currentResult, result1);
+ builder.currentValue = 'value1';
+ builder.moveNext();
+ expect(builder.currentResult, null);
}
- test_currentResult_afterComplete() {
+ test_currentResult_afterOneMoveNext() {
Map<String, TaskInput> inputDescriptors = {
- 'one': input1
+ 'one': input1,
+ 'two': input2
};
TopLevelTaskInputBuilder builder =
new TopLevelTaskInputBuilder(inputDescriptors);
builder.moveNext();
- builder.currentValue = 'value1';
- builder.moveNext();
- expect(builder.currentResult, null);
+ expect(builder.currentResult, result1);
}
test_currentResult_beforeMoveNext() {
@@ -326,26 +325,26 @@ class TopLevelTaskInputBuilderTest extends EngineTestCase {
expect(builder.currentResult, null);
}
- test_currentTarget_afterOneMoveNext() {
+ test_currentTarget_afterComplete() {
Map<String, TaskInput> inputDescriptors = {
'one': input1
};
TopLevelTaskInputBuilder builder =
new TopLevelTaskInputBuilder(inputDescriptors);
builder.moveNext();
- expect(builder.currentTarget, target);
+ builder.currentValue = 'value1';
+ builder.moveNext();
+ expect(builder.currentTarget, null);
}
- test_currentTarget_afterComplete() {
+ test_currentTarget_afterOneMoveNext() {
Map<String, TaskInput> inputDescriptors = {
'one': input1
};
TopLevelTaskInputBuilder builder =
new TopLevelTaskInputBuilder(inputDescriptors);
builder.moveNext();
- builder.currentValue = 'value1';
- builder.moveNext();
- expect(builder.currentTarget, null);
+ expect(builder.currentTarget, target);
}
test_currentTarget_beforeMoveNext() {
@@ -376,16 +375,6 @@ class TopLevelTaskInputBuilderTest extends EngineTestCase {
}, throwsStateError);
}
- test_inputValue_afterOneMoveNext() {
- Map<String, TaskInput> inputDescriptors = {
- 'one': input1
- };
- TopLevelTaskInputBuilder builder =
- new TopLevelTaskInputBuilder(inputDescriptors);
- builder.moveNext();
- expect(() => builder.inputValue, throwsStateError);
- }
-
test_inputValue_afterComplete() {
String key1 = 'one';
String key2 = 'two';
@@ -410,6 +399,16 @@ class TopLevelTaskInputBuilderTest extends EngineTestCase {
expect(inputs, containsPair(key2, value2));
}
+ test_inputValue_afterOneMoveNext() {
+ Map<String, TaskInput> inputDescriptors = {
+ 'one': input1
+ };
+ TopLevelTaskInputBuilder builder =
+ new TopLevelTaskInputBuilder(inputDescriptors);
+ builder.moveNext();
+ expect(() => builder.inputValue, throwsStateError);
+ }
+
test_inputValue_beforeMoveNext() {
Map<String, TaskInput> inputDescriptors = {};
TopLevelTaskInputBuilder builder =
« no previous file with comments | « pkg/analyzer/test/src/task/dart_test.dart ('k') | pkg/analyzer/test/src/task/manager_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698