Remove dependency on package:charcode entirely. (#53)
Removes the dev-dependency on package:charcode, and uses in a one test file.
diff --git a/pubspec.yaml b/pubspec.yaml
index f0aff73..b908be4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -12,6 +12,5 @@
typed_data: ^1.3.0
dev_dependencies:
- charcode: ^1.2.0
pedantic: ^1.10.0
test: ^1.16.0-nullsafety.9
diff --git a/test/percent_test.dart b/test/percent_test.dart
index 7a7bf81..87d903c 100644
--- a/test/percent_test.dart
+++ b/test/percent_test.dart
@@ -4,102 +4,20 @@
import 'dart:async';
-import 'package:charcode/ascii.dart';
import 'package:convert/convert.dart';
import 'package:test/test.dart';
void main() {
group("encoder", () {
test("doesn't percent-encode unreserved characters", () {
- expect(
- percent.encode([
- $a,
- $b,
- $c,
- $d,
- $e,
- $f,
- $g,
- $h,
- $i,
- $j,
- $k,
- $l,
- $m,
- $n,
- $o,
- $p,
- $q,
- $r,
- $s,
- $t,
- $u,
- $v,
- $w,
- $x,
- $y,
- $z,
- $A,
- $B,
- $C,
- $D,
- $E,
- $F,
- $G,
- $H,
- $I,
- $J,
- $K,
- $L,
- $M,
- $N,
- $O,
- $P,
- $Q,
- $R,
- $S,
- $T,
- $U,
- $V,
- $W,
- $X,
- $Y,
- $Z,
- $0,
- $1,
- $2,
- $3,
- $4,
- $5,
- $6,
- $7,
- $8,
- $9,
- $dash,
- $dot,
- $underscore,
- $tilde
- ]),
- equals(
- "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._~"));
+ var safeChars = "abcdefghijklmnopqrstuvwxyz"
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+ "0123456789-._~";
+ expect(percent.encode([...safeChars.codeUnits]), equals(safeChars));
});
test("percent-encodes reserved ASCII characters", () {
- expect(
- percent.encode([
- $space,
- $backquote,
- $open_brace,
- $at,
- $open_bracket,
- $comma,
- $division,
- $caret,
- $close_brace,
- $del,
- $nul,
- $percent
- ]),
+ expect(percent.encode([..." `{@[,/^}\x7f\x00%".codeUnits]),
equals("%20%60%7B%40%5B%2C%2F%5E%7D%7F%00%25"));
});
@@ -108,8 +26,7 @@
});
test("mixes encoded and unencoded characters", () {
- expect(
- percent.encode([$a, $plus, $b, $equal, 0x80]), equals("a%2Bb%3D%80"));
+ expect(percent.encode([..."a+b=\x80".codeUnits]), equals("a%2Bb%3D%80"));
});
group("with chunked conversion", () {
@@ -119,7 +36,7 @@
controller.stream.listen(results.add);
var sink = percent.encoder.startChunkedConversion(controller.sink);
- sink.add([$a, $plus, $b, $equal, 0x80]);
+ sink.add([..."a+b=\x80".codeUnits]);
expect(results, equals(["a%2Bb%3D%80"]));
sink.add([0x00, 0x01, 0xfe, 0xff]);
@@ -154,35 +71,21 @@
group("decoder", () {
test("converts percent-encoded strings to byte arrays", () {
- expect(percent.decode("a%2Bb%3D%801"),
- equals([$a, $plus, $b, $equal, 0x80, $1]));
+ expect(
+ percent.decode("a%2Bb%3D%801"), equals([..."a+b=\x801".codeUnits]));
});
test("supports lowercase letters", () {
- expect(
- percent.decode("a%2bb%3d%80"), equals([$a, $plus, $b, $equal, 0x80]));
+ expect(percent.decode("a%2bb%3d%80"), equals([..."a+b=\x80".codeUnits]));
});
test("supports more aggressive encoding", () {
- expect(percent.decode("%61%2E%5A"), equals([$a, $dot, $Z]));
+ expect(percent.decode("%61%2E%5A"), equals([..."a.Z".codeUnits]));
});
test("supports less aggressive encoding", () {
- expect(
- percent.decode(" `{@[,/^}\x7F\x00"),
- equals([
- $space,
- $backquote,
- $open_brace,
- $at,
- $open_bracket,
- $comma,
- $division,
- $caret,
- $close_brace,
- $del,
- $nul
- ]));
+ var chars = " `{@[,/^}\x7F\x00";
+ expect(percent.decode(chars), equals([...chars.codeUnits]));
});
group("with chunked conversion", () {
@@ -200,14 +103,14 @@
expect(
results,
equals([
- [$a, $plus, $b, $equal, 0x80, $1]
+ [..."a+b=\x801".codeUnits]
]));
sink.add("%00%01%FE%FF");
expect(
results,
equals([
- [$a, $plus, $b, $equal, 0x80, $1],
+ [..."a+b=\x801".codeUnits],
[0x00, 0x01, 0xfe, 0xff]
]));
});
@@ -217,31 +120,31 @@
expect(
results,
equals([
- [$a, $b]
+ [..."ab".codeUnits]
]));
sink.add("2");
expect(
results,
equals([
- [$a, $b]
+ [..."ab".codeUnits]
]));
sink.add("0cd%2");
expect(
results,
equals([
- [$a, $b],
- [$space, $c, $d]
+ [..."ab".codeUnits],
+ [..." cd".codeUnits]
]));
sink.add("0");
expect(
results,
equals(([
- [$a, $b],
- [$space, $c, $d],
- [$space]
+ [..."ab".codeUnits],
+ [..." cd".codeUnits],
+ [..." ".codeUnits]
])));
});
@@ -275,7 +178,7 @@
expect(
results,
equals([
- [$a, $b]
+ [..."ab".codeUnits]
]));
expect(() => sink.close(), throwsFormatException);
});
@@ -285,7 +188,7 @@
expect(
results,
equals([
- [$a, $b]
+ [..."ab".codeUnits]
]));
expect(() => sink.close(), throwsFormatException);
});
@@ -295,7 +198,7 @@
expect(
results,
equals([
- [$a, $b]
+ [..."ab".codeUnits]
]));
expect(() => sink.addSlice("ab%", 0, 3, true), throwsFormatException);
@@ -306,7 +209,7 @@
expect(
results,
equals([
- [$a, $b]
+ [..."ab".codeUnits]
]));
expect(() => sink.addSlice("ab%2", 0, 3, true), throwsFormatException);
