Skip to content

Commit 3fdf879

Browse files
rm-astro-wfrm-astro-wf
authored
Merge pull request #719 from Workiva/batch/cplat/remove_dart2_constant
Remove dart2_constant
2 parents 8499d19 + 1cd5365 commit 3fdf879

File tree

5 files changed

+29
-34
lines changed

5 files changed

+29
-34
lines changed

‎pubspec.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ dev_dependencies:
3636
build_test: ">=0.10.9 <2.0.0"
3737
build_web_compilers: ^2.5.1
3838
built_value_generator: '>=7.0.0 <9.0.0'
39-
dart2_constant: ^1.0.0
4039
dart_dev: ^3.6.4
4140
dependency_validator: ^2.0.0
4241
glob: ^1.2.0

‎test/over_react/component/_deprecated/abstract_transition_test.dart‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ library deprecated_abstract_transition_test;
1919
import 'dart:async';
2020
import 'dart:html';
2121

22-
import 'package:dart2_constant/core.dart' as d2c;
2322
import 'package:meta/meta.dart';
2423
import 'package:over_react/over_react.dart';
2524
import 'package:over_react_test/over_react_test.dart';
@@ -64,7 +63,7 @@ main() {
6463

6564
expect(transitioner.state.transitionPhase, equals(TransitionPhase.HIDING));
6665

67-
await Future.delayed(d2c.Duration.zero);
66+
await Future.delayed(Duration.zero);
6867
expect(transitioner.state.transitionPhase, equals(TransitionPhase.HIDING),
6968
reason: 'should still be waiting for a transition event');
7069

@@ -96,7 +95,7 @@ main() {
9695

9796
expect(transitioner.state.transitionPhase, equals(TransitionPhase.SHOWING));
9897

99-
await Future.delayed(d2c.Duration.zero);
98+
await Future.delayed(Duration.zero);
10099
expect(transitioner.state.transitionPhase, equals(TransitionPhase.SHOWING),
101100
reason: 'should still be waiting for a transition event');
102101

@@ -131,7 +130,7 @@ main() {
131130

132131
expect(transitioner.state.transitionPhase, equals(TransitionPhase.HIDING));
133132

134-
await Future.delayed(d2c.Duration.zero);
133+
await Future.delayed(Duration.zero);
135134
expect(transitioner.state.transitionPhase, equals(TransitionPhase.HIDING),
136135
reason: 'should still be waiting for a transition event');
137136

@@ -143,7 +142,7 @@ main() {
143142

144143
expect(transitioner.state.transitionPhase, equals(TransitionPhase.SHOWING));
145144

146-
await Future.delayed(d2c.Duration.zero);
145+
await Future.delayed(Duration.zero);
147146
expect(transitioner.state.transitionPhase, equals(TransitionPhase.SHOWING),
148147
reason: 'should still be waiting for a transition event');
149148

@@ -183,7 +182,7 @@ main() {
183182

184183
expect(transitioner.state.transitionPhase, equals(TransitionPhase.SHOWING));
185184

186-
await Future.delayed(d2c.Duration.zero);
185+
await Future.delayed(Duration.zero);
187186
expect(transitioner.state.transitionPhase, equals(TransitionPhase.SHOWING),
188187
reason: 'should still be waiting for a transition event');
189188

@@ -228,7 +227,7 @@ main() {
228227
expect(transitioner.state.transitionPhase, equals(TransitionPhase.SHOWING));
229228

230229
for (var i = 0; i < expectedTransitionInCount; i++) {
231-
await Future.delayed(d2c.Duration.zero);
230+
await Future.delayed(Duration.zero);
232231
expect(transitioner.state.transitionPhase, equals(TransitionPhase.SHOWING),
233232
reason: 'should still be waiting for a transition event');
234233

@@ -244,7 +243,7 @@ main() {
244243
expect(transitioner.state.transitionPhase, equals(TransitionPhase.HIDING));
245244

246245
for (var i = 0; i < expectedTransitionOutCount; i++) {
247-
await Future.delayed(d2c.Duration.zero);
246+
await Future.delayed(Duration.zero);
248247
expect(transitioner.state.transitionPhase, equals(TransitionPhase.HIDING),
249248
reason: 'should still be waiting for a transition event');
250249

@@ -510,7 +509,7 @@ main() {
510509

511510
expect(transitioner.state.transitionPhase, TransitionPhase.HIDING);
512511

513-
await Future.delayed(d2c.Duration.zero);
512+
await Future.delayed(Duration.zero);
514513

515514
expect(transitioner.state.transitionPhase, TransitionPhase.HIDDEN);
516515

‎test/over_react/component/abstract_transition_test.dart‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ library abstract_transition_test;
1717
import 'dart:async';
1818
import 'dart:html';
1919

20-
import 'package:dart2_constant/core.dart' as d2c;
2120
import 'package:meta/meta.dart';
2221
import 'package:over_react/over_react.dart' hide TransitionPropsMixin, $TransitionPropsMixin, AbstractTransitionProps, AbstractTransitionState, AbstractTransitionComponent;
2322
import 'package:over_react/components.dart';
@@ -63,7 +62,7 @@ main() {
6362

6463
expect(transitioner.state.transitionPhase, equals(TransitionPhase.HIDING));
6564

66-
await Future.delayed(d2c.Duration.zero);
65+
await Future.delayed(Duration.zero);
6766
expect(transitioner.state.transitionPhase, equals(TransitionPhase.HIDING),
6867
reason: 'should still be waiting for a transition event');
6968

@@ -95,7 +94,7 @@ main() {
9594

9695
expect(transitioner.state.transitionPhase, equals(TransitionPhase.SHOWING));
9796

98-
await Future.delayed(d2c.Duration.zero);
97+
await Future.delayed(Duration.zero);
9998
expect(transitioner.state.transitionPhase, equals(TransitionPhase.SHOWING),
10099
reason: 'should still be waiting for a transition event');
101100

@@ -130,7 +129,7 @@ main() {
130129

131130
expect(transitioner.state.transitionPhase, equals(TransitionPhase.HIDING));
132131

133-
await Future.delayed(d2c.Duration.zero);
132+
await Future.delayed(Duration.zero);
134133
expect(transitioner.state.transitionPhase, equals(TransitionPhase.HIDING),
135134
reason: 'should still be waiting for a transition event');
136135

@@ -142,7 +141,7 @@ main() {
142141

143142
expect(transitioner.state.transitionPhase, equals(TransitionPhase.SHOWING));
144143

145-
await Future.delayed(d2c.Duration.zero);
144+
await Future.delayed(Duration.zero);
146145
expect(transitioner.state.transitionPhase, equals(TransitionPhase.SHOWING),
147146
reason: 'should still be waiting for a transition event');
148147

@@ -182,7 +181,7 @@ main() {
182181

183182
expect(transitioner.state.transitionPhase, equals(TransitionPhase.SHOWING));
184183

185-
await Future.delayed(d2c.Duration.zero);
184+
await Future.delayed(Duration.zero);
186185
expect(transitioner.state.transitionPhase, equals(TransitionPhase.SHOWING),
187186
reason: 'should still be waiting for a transition event');
188187

@@ -227,7 +226,7 @@ main() {
227226
expect(transitioner.state.transitionPhase, equals(TransitionPhase.SHOWING));
228227

229228
for (var i = 0; i < expectedTransitionInCount; i++) {
230-
await Future.delayed(d2c.Duration.zero);
229+
await Future.delayed(Duration.zero);
231230
expect(transitioner.state.transitionPhase, equals(TransitionPhase.SHOWING),
232231
reason: 'should still be waiting for a transition event');
233232

@@ -243,7 +242,7 @@ main() {
243242
expect(transitioner.state.transitionPhase, equals(TransitionPhase.HIDING));
244243

245244
for (var i = 0; i < expectedTransitionOutCount; i++) {
246-
await Future.delayed(d2c.Duration.zero);
245+
await Future.delayed(Duration.zero);
247246
expect(transitioner.state.transitionPhase, equals(TransitionPhase.HIDING),
248247
reason: 'should still be waiting for a transition event');
249248

@@ -509,7 +508,7 @@ main() {
509508

510509
expect(transitioner.state.transitionPhase, TransitionPhase.HIDING);
511510

512-
await Future.delayed(d2c.Duration.zero);
511+
await Future.delayed(Duration.zero);
513512

514513
expect(transitioner.state.transitionPhase, TransitionPhase.HIDDEN);
515514

‎test/over_react/component_declaration/redux_component_test.dart‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ library over_react.component_declaration.redux_component_test;
1616

1717
import 'dart:async';
1818

19-
import 'package:dart2_constant/core.dart' as d2c;
2019
import 'package:test/test.dart';
2120
import 'package:built_redux/built_redux.dart';
2221
import 'package:over_react/over_react.dart';
@@ -80,14 +79,14 @@ void main() {
8079
TestDefaultComponent component = getDartComponent(renderedInstance);
8180

8281
store.actions.trigger1();
83-
await Future.delayed(d2c.Duration.zero);
82+
await Future.delayed(Duration.zero);
8483

8584
expect(component.numberOfRedraws, 1);
8685

8786
unmount(renderedInstance);
8887

8988
store.actions.trigger1();
90-
await Future.delayed(d2c.Duration.zero);
89+
await Future.delayed(Duration.zero);
9190

9291
expect(component.numberOfRedraws, 1,
9392
reason: 'component should no longer be listening after unmount');
@@ -103,11 +102,11 @@ void main() {
103102
TestConnectComponent component = getDartComponent(renderedInstance);
104103

105104
stores.actions.trigger1();
106-
await Future.delayed(d2c.Duration.zero);
105+
await Future.delayed(Duration.zero);
107106
expect(component.numberOfRedraws, 1);
108107

109108
stores.actions.trigger2();
110-
await Future.delayed(d2c.Duration.zero);
109+
await Future.delayed(Duration.zero);
111110
expect(component.numberOfRedraws, 1);
112111
});
113112

@@ -122,7 +121,7 @@ void main() {
122121
TestPureComponent component = jacket.getDartInstance();
123122

124123
store.actions.trigger1();
125-
await Future.delayed(d2c.Duration.zero);
124+
await Future.delayed(Duration.zero);
126125
expect(component.numberOfRedraws, 1);
127126
});
128127

@@ -198,15 +197,15 @@ void main() {
198197
TestDefaultComponent component = jacket.getDartInstance();
199198

200199
store.actions.trigger1();
201-
await Future.delayed(d2c.Duration.zero);
200+
await Future.delayed(Duration.zero);
202201
expect(component.numberOfRedraws, 1);
203202

204203
jacket.rerender((TestDefault()..store = updatedStore)());
205204

206205
expect(component.numberOfRedraws, 2);
207206

208207
updatedStore.actions.trigger1();
209-
await Future.delayed(d2c.Duration.zero);
208+
await Future.delayed(Duration.zero);
210209
expect(component.numberOfRedraws, 3);
211210
});
212211
});

‎test/over_react/util/css_value_util_test.dart‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
@TestOn('browser')
1616
library css_value_util_test;
1717

18-
import 'package:dart2_constant/core.dart' as d2c;
1918
import 'package:over_react/over_react.dart';
2019
import 'package:test/test.dart';
2120

@@ -73,18 +72,18 @@ main() {
7372
}
7473

7574
test('infinity', () {
76-
testValue(d2c.double.infinity);
77-
testValue(d2c.double.infinity.toString());
75+
testValue(double.infinity);
76+
testValue(double.infinity.toString());
7877
});
7978

8079
test('negative infinity', () {
81-
testValue(d2c.double.negativeInfinity);
82-
testValue(d2c.double.negativeInfinity.toString());
80+
testValue(double.negativeInfinity);
81+
testValue(double.negativeInfinity.toString());
8382
});
8483

8584
test('NaN', () {
86-
testValue(d2c.double.nan);
87-
testValue(d2c.double.nan.toString());
85+
testValue(double.nan);
86+
testValue(double.nan.toString());
8887
});
8988
});
9089

0 commit comments

Comments
 (0)