fix tests

witochandra · Apr 25, 2021 · d4538e6 · d4538e6
1 parent a1c0ba9
commit d4538e6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/lib/domain/itunes/itunes.dart b/lib/domain/itunes/itunes.dart
@@ -3,7 +3,6 @@ import 'package:webfeed/domain/itunes/itunes_episode_type.dart';
 import 'package:webfeed/domain/itunes/itunes_image.dart';
 import 'package:webfeed/domain/itunes/itunes_owner.dart';
 import 'package:webfeed/domain/itunes/itunes_type.dart';
-import 'package:webfeed/util/string.dart';
 import 'package:webfeed/util/iterable.dart';
 import 'package:webfeed/util/xml.dart';
 import 'package:xml/xml.dart';
@@ -48,10 +47,12 @@ class Itunes {
   });
 
   factory Itunes.parse(XmlElement element) {
-    final episodeStr = element.findElements('itunes:episode').firstOrNull?.text;
-    final seasonStr = element.findElements('itunes:season').firstOrNull?.text;
+    final episodeStr =
+        element.findElements('itunes:episode').firstOrNull?.text ?? '';
+    final seasonStr =
+        element.findElements('itunes:season').firstOrNull?.text ?? '';
     final durationStr =
-        element.findElements('itunes:duration').firstOrNull?.text;
+        element.findElements('itunes:duration').firstOrNull?.text ?? '';
     return Itunes(
       author: element.findElements('itunes:author').firstOrNull?.text,
       summary: element.findElements('itunes:summary').firstOrNull?.text,
@@ -85,9 +86,9 @@ class Itunes {
       newFeedUrl: element.findElements('itunes:new-feed-url').firstOrNull?.text,
       block: parseBoolLiteral(element, 'itunes:block'),
       complete: parseBoolLiteral(element, 'itunes:complete'),
-      episode: isNullOrEmpty(episodeStr) ? null : int.tryParse(episodeStr),
-      season: isNullOrEmpty(seasonStr) ? null : int.tryParse(seasonStr),
-      duration: isNullOrEmpty(durationStr) ? null : _parseDuration(durationStr),
+      episode: episodeStr.isNotEmpty ? int.tryParse(episodeStr) : null,
+      season: seasonStr.isNotEmpty ? int.tryParse(seasonStr) : null,
+      duration: durationStr.isNotEmpty ? _parseDuration(durationStr) : null,
       episodeType: element
           .findElements('itunes:episodeType')
           .map((e) => newItunesEpisodeType(e))

diff --git a/lib/util/string.dart b/lib/util/string.dart
diff --git a/test/rss_test.dart b/test/rss_test.dart
@@ -372,15 +372,16 @@ void main() {
   });
 
   test('parse RSS-Itunes_item_empty_field.xml with empty duration field', () {
-    var xmlString = File('test/xml/RSS-Itunes_item_empty_field.xml').readAsStringSync();
+    var xmlString =
+        File('test/xml/RSS-Itunes_item_empty_field.xml').readAsStringSync();
 
     var feed = RssFeed.parse(xmlString);
 
-    expect(feed.itunes.owner.name, 'Changelog Media');
-    var item = feed.items[0];
-    expect(item.itunes.episodeType, ItunesEpisodeType.full);
-    expect(item.itunes.duration, null);
-    expect(item.itunes.title, 'awesome title');
+    expect(feed.itunes?.owner?.name, 'Changelog Media');
+    var item = feed.items![0];
+    expect(item.itunes?.episodeType, ItunesEpisodeType.full);
+    expect(item.itunes?.duration, null);
+    expect(item.itunes?.title, 'awesome title');
   });
 
   test('parse RSS-RDF.xml', () {