Skip to content

Commit

Permalink
Merge pull request #719 from Workiva/batch/cplat/remove_dart2_constant
Browse files Browse the repository at this point in the history 
Remove dart2_constant
  • Loading branch information
@rm-astro-wf
rm-astro-wf authored Nov 22, 2021
2 parents 8499d19 + 1cd5365 commit 3fdf879
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 34 deletions.
1 change: 0 additions & 1 deletion pubspec.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ dev_dependencies:
build_test: ">=0.10.9 <2.0.0"
build_web_compilers: ^2.5.1
built_value_generator: '>=7.0.0 <9.0.0'
dart2_constant: ^1.0.0
dart_dev: ^3.6.4
dependency_validator: ^2.0.0
glob: ^1.2.0
Expand Down
17 changes: 8 additions & 9 deletions test/over_react/component/_deprecated/abstract_transition_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ library deprecated_abstract_transition_test;
import 'dart:async';
import 'dart:html';

import 'package:dart2_constant/core.dart' as d2c;
import 'package:meta/meta.dart';
import 'package:over_react/over_react.dart';
import 'package:over_react_test/over_react_test.dart';
Expand Down Expand Up @@ -64,7 +63,7 @@ main() {

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

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

Expand Down Expand Up @@ -96,7 +95,7 @@ main() {

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

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

Expand Down Expand Up @@ -131,7 +130,7 @@ main() {

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

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

Expand All @@ -143,7 +142,7 @@ main() {

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

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

Expand Down Expand Up @@ -183,7 +182,7 @@ main() {

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

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

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

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

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

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

Expand Down Expand Up @@ -510,7 +509,7 @@ main() {

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

await Future.delayed(d2c.Duration.zero);
await Future.delayed(Duration.zero);

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

Expand Down
17 changes: 8 additions & 9 deletions test/over_react/component/abstract_transition_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ library abstract_transition_test;
import 'dart:async';
import 'dart:html';

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

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

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

Expand Down Expand Up @@ -95,7 +94,7 @@ main() {

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

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

Expand Down Expand Up @@ -130,7 +129,7 @@ main() {

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

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

Expand All @@ -142,7 +141,7 @@ main() {

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

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

Expand Down Expand Up @@ -182,7 +181,7 @@ main() {

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

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

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

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

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

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

Expand Down Expand Up @@ -509,7 +508,7 @@ main() {

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

await Future.delayed(d2c.Duration.zero);
await Future.delayed(Duration.zero);

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

Expand Down
15 changes: 7 additions & 8 deletions test/over_react/component_declaration/redux_component_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ library over_react.component_declaration.redux_component_test;

import 'dart:async';

import 'package:dart2_constant/core.dart' as d2c;
import 'package:test/test.dart';
import 'package:built_redux/built_redux.dart';
import 'package:over_react/over_react.dart';
Expand Down Expand Up @@ -80,14 +79,14 @@ void main() {
TestDefaultComponent component = getDartComponent(renderedInstance);

store.actions.trigger1();
await Future.delayed(d2c.Duration.zero);
await Future.delayed(Duration.zero);

expect(component.numberOfRedraws, 1);

unmount(renderedInstance);

store.actions.trigger1();
await Future.delayed(d2c.Duration.zero);
await Future.delayed(Duration.zero);

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

stores.actions.trigger1();
await Future.delayed(d2c.Duration.zero);
await Future.delayed(Duration.zero);
expect(component.numberOfRedraws, 1);

stores.actions.trigger2();
await Future.delayed(d2c.Duration.zero);
await Future.delayed(Duration.zero);
expect(component.numberOfRedraws, 1);
});

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

store.actions.trigger1();
await Future.delayed(d2c.Duration.zero);
await Future.delayed(Duration.zero);
expect(component.numberOfRedraws, 1);
});

Expand Down Expand Up @@ -198,15 +197,15 @@ void main() {
TestDefaultComponent component = jacket.getDartInstance();

store.actions.trigger1();
await Future.delayed(d2c.Duration.zero);
await Future.delayed(Duration.zero);
expect(component.numberOfRedraws, 1);

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

expect(component.numberOfRedraws, 2);

updatedStore.actions.trigger1();
await Future.delayed(d2c.Duration.zero);
await Future.delayed(Duration.zero);
expect(component.numberOfRedraws, 3);
});
});
Expand Down
13 changes: 6 additions & 7 deletions test/over_react/util/css_value_util_test.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
@TestOn('browser')
library css_value_util_test;

import 'package:dart2_constant/core.dart' as d2c;
import 'package:over_react/over_react.dart';
import 'package:test/test.dart';

Expand Down Expand Up @@ -73,18 +72,18 @@ main() {
}

test('infinity', () {
testValue(d2c.double.infinity);
testValue(d2c.double.infinity.toString());
testValue(double.infinity);
testValue(double.infinity.toString());
});

test('negative infinity', () {
testValue(d2c.double.negativeInfinity);
testValue(d2c.double.negativeInfinity.toString());
testValue(double.negativeInfinity);
testValue(double.negativeInfinity.toString());
});

test('NaN', () {
testValue(d2c.double.nan);
testValue(d2c.double.nan.toString());
testValue(double.nan);
testValue(double.nan.toString());
});
});

Expand Down

0 comments on commit 3fdf879

Please sign in to comment.