Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
review comments
  • Loading branch information
kenzieschmoll committed Dec 8, 2023
commit c50a1cc17c70906daf90459ee59e9ffb2fd27770
16 changes: 8 additions & 8 deletions packages/web_benchmarks/lib/src/benchmark_result.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class BenchmarkScore {
});

/// Deserializes a JSON object to create a [BenchmarkScore] object.
factory BenchmarkScore.parse(Map<String, dynamic> json) {
factory BenchmarkScore.parse(Map<String, Object?> json) {
final String metric = json[_metricKey]! as String;
final double value = (json[_valueKey]! as num).toDouble();
return BenchmarkScore(metric: metric, value: value);
Expand All @@ -32,8 +32,8 @@ class BenchmarkScore {
final num value;

/// Serializes the benchmark metric to a JSON object.
Map<String, dynamic> toJson() {
return <String, dynamic>{
Map<String, Object?> toJson() {
return <String, Object?>{
_metricKey: metric,
_valueKey: value,
};
Expand All @@ -46,13 +46,13 @@ class BenchmarkResults {
BenchmarkResults(this.scores);

/// Deserializes a JSON object to create a [BenchmarkResults] object.
factory BenchmarkResults.parse(Map<String, dynamic> json) {
factory BenchmarkResults.parse(Map<String, Object?> json) {
final Map<String, List<BenchmarkScore>> results =
<String, List<BenchmarkScore>>{};
for (final String key in json.keys) {
final List<BenchmarkScore> scores = (json[key]! as List<Object?>)
.cast<Map<String, Object?>>()
.map((Map<String, Object?> s) => BenchmarkScore.parse(s))
.map(BenchmarkScore.parse)
.toList();
results[key] = scores;
}
Expand All @@ -63,10 +63,10 @@ class BenchmarkResults {
final Map<String, List<BenchmarkScore>> scores;

/// Serializes benchmark metrics to JSON.
Map<String, List<Map<String, dynamic>>> toJson() {
return scores.map<String, List<Map<String, dynamic>>>(
Map<String, List<Map<String, Object?>>> toJson() {
return scores.map<String, List<Map<String, Object?>>>(
(String benchmarkName, List<BenchmarkScore> scores) {
return MapEntry<String, List<Map<String, dynamic>>>(
return MapEntry<String, List<Map<String, Object?>>>(
benchmarkName,
scores.map((BenchmarkScore score) => score.toJson()).toList(),
);
Expand Down
14 changes: 7 additions & 7 deletions packages/web_benchmarks/test/src/benchmark_result_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import 'package:web_benchmarks/server.dart';
void main() {
group('can serialize and deserialize', () {
test('$BenchmarkResults', () {
final Map<String, dynamic> data = <String, dynamic>{
'foo': <Map<String, dynamic>>[
<String, dynamic>{'metric': 'foo.bar', 'value': 12.34},
<String, dynamic>{'metric': 'foo.baz', 'value': 10},
final Map<String, Object?> data = <String, Object?>{
'foo': <Map<String, Object?>>[
<String, Object?>{'metric': 'foo.bar', 'value': 12.34},
<String, Object?>{'metric': 'foo.baz', 'value': 10},
],
'bar': <Map<String, dynamic>>[
<String, dynamic>{'metric': 'bar.foo', 'value': 1.23},
'bar': <Map<String, Object?>>[
<String, Object?>{'metric': 'bar.foo', 'value': 1.23},
]
};

Expand All @@ -37,7 +37,7 @@ void main() {
});

test('$BenchmarkScore', () {
final Map<String, dynamic> data = <String, dynamic>{
final Map<String, Object?> data = <String, Object?>{
'metric': 'foo',
'value': 1.234
};
Expand Down