Skip to content

Commit

Permalink
Remove upper case constants (#4)
Browse files Browse the repository at this point in the history
* Remove usage of upper-case constants.

* update SDK version
* remove stable from Travis config
  • Loading branch information
lrhn authored May 22, 2018
1 parent 405395b commit e4b936c
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 17 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ language: dart

dart:
- dev
- stable

# See https://docs.travis-ci.com/user/languages/dart/ for details.
dart_task:
- test: --platform vm
Expand All @@ -19,7 +17,7 @@ dart_task:
# them against each Dart version.
matrix:
include:
- dart: stable
- dart: dev
dart_task: dartfmt
- dart: dev
dart_task: dartanalyzer
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.1.1+1

* Updated SDK version to 2.0.0-dev.17.0

## 0.1.1

* Add a `whenError()` parameter to allow requests to be retried when they
Expand Down
4 changes: 2 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: http_retry
version: 0.1.1
version: 0.1.1+1
description: HTTP client middleware that automatically retries requests.
author: Dart Team <misc@dartlang.org>
homepage: https://github.com/dart-lang/http_retry

environment:
sdk: '>=1.24.0 <2.0.0'
sdk: '>=2.0.0-dev.17.0 <2.0.0'

dependencies:
async: ">=1.2.0 <=3.0.0"
Expand Down
24 changes: 12 additions & 12 deletions test/http_retry_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ void main() {
count++;
return count < 2 ? new Response("", 503) : new Response("", 200);
}, count: 2)),
delay: (_) => Duration.ZERO);
delay: (_) => Duration.zero);

var response = await client.get("http://example.org");
expect(response.statusCode, equals(200));
Expand All @@ -59,7 +59,7 @@ void main() {
headers: {"retry": count < 2 ? "true" : "false"});
}, count: 2)),
when: (response) => response.headers["retry"] == "true",
delay: (_) => Duration.ZERO);
delay: (_) => Duration.zero);

var response = await client.get("http://example.org");
expect(response.headers, containsPair("retry", "false"));
Expand All @@ -75,7 +75,7 @@ void main() {
return new Response("", 200);
}, count: 2)),
whenError: (error, _) => error == "oh no",
delay: (_) => Duration.ZERO);
delay: (_) => Duration.zero);

var response = await client.get("http://example.org");
expect(response.statusCode, equals(200));
Expand All @@ -86,7 +86,7 @@ void main() {
var client = new RetryClient(
new MockClient(expectAsync1((request) async => throw "oh no")),
whenError: (error, _) => error == "oh yeah",
delay: (_) => Duration.ZERO);
delay: (_) => Duration.zero);

expect(client.get("http://example.org"), throwsA("oh no"));
});
Expand All @@ -95,7 +95,7 @@ void main() {
var client = new RetryClient(
new MockClient(
expectAsync1((_) async => new Response("", 503), count: 4)),
delay: (_) => Duration.ZERO);
delay: (_) => Duration.zero);
var response = await client.get("http://example.org");
expect(response.statusCode, equals(503));
});
Expand All @@ -105,7 +105,7 @@ void main() {
new MockClient(
expectAsync1((_) async => new Response("", 503), count: 13)),
retries: 12,
delay: (_) => Duration.ZERO);
delay: (_) => Duration.zero);
var response = await client.get("http://example.org");
expect(response.statusCode, equals(503));
});
Expand All @@ -116,7 +116,7 @@ void main() {
var client = new RetryClient(new MockClient(expectAsync1((_) async {
count++;
if (count == 1) {
expect(fake.elapsed, equals(Duration.ZERO));
expect(fake.elapsed, equals(Duration.zero));
} else if (count == 2) {
expect(fake.elapsed, equals(new Duration(milliseconds: 500)));
} else if (count == 3) {
Expand All @@ -140,9 +140,9 @@ void main() {
new MockClient(expectAsync1((_) async {
count++;
if (count == 1) {
expect(fake.elapsed, equals(Duration.ZERO));
expect(fake.elapsed, equals(Duration.zero));
} else if (count == 2) {
expect(fake.elapsed, equals(Duration.ZERO));
expect(fake.elapsed, equals(Duration.zero));
} else if (count == 3) {
expect(fake.elapsed, equals(new Duration(seconds: 1)));
} else if (count == 4) {
Expand All @@ -165,7 +165,7 @@ void main() {
new MockClient(expectAsync1((_) async {
count++;
if (count == 1) {
expect(fake.elapsed, equals(Duration.ZERO));
expect(fake.elapsed, equals(Duration.zero));
} else if (count == 2) {
expect(fake.elapsed, equals(new Duration(seconds: 1)));
} else if (count == 3) {
Expand Down Expand Up @@ -193,7 +193,7 @@ void main() {
new MockClient(
expectAsync1((_) async => new Response("", 503), count: 3)),
retries: 2,
delay: (_) => Duration.ZERO,
delay: (_) => Duration.zero,
onRetry: expectAsync3((request, response, retryCount) {
expect(request.url, equals(Uri.parse("http://example.org")));
expect(response.statusCode, equals(503));
Expand All @@ -217,7 +217,7 @@ void main() {
expect(request.body, equals("hello"));
return new Response("", 503);
}, count: 2)),
[Duration.ZERO]);
[Duration.zero]);

var request = new Request("POST", Uri.parse("http://example.org"));
request.body = "hello";
Expand Down

0 comments on commit e4b936c

Please sign in to comment.