Use skips instead of ifs in tests

Author: liamappelbe

test/collect_coverage_api_test.dart

@@ -114,17 +114,12 @@ void main() {
       return map;
     });
 
-    if (platformVersionCheck(2, 17)) {
-      // Dart VM versions before 2.17 don't support branch coverage.
-      for (var sampleCoverageData in sources[_sampleAppFileUri]!) {
-        expect(sampleCoverageData['branchHits'], isNotEmpty);
-      }
-
-      for (var sampleCoverageData in sources[_isolateLibFileUri]!) {
-        expect(sampleCoverageData['branchHits'], isNotEmpty);
-      }
-    }
-  });
+    // Dart VM versions before 2.17 don't support branch coverage.
+    expect(sources[_sampleAppFileUri],
+        everyElement(containsPair('branchHits', isNotEmpty)));
+    expect(sources[_isolateLibFileUri],
+        everyElement(containsPair('branchHits', isNotEmpty)));
+  }, skip: !platformVersionCheck(2, 17));
 }
 
 Future<Map<String, dynamic>> _collectCoverage(

test/collect_coverage_test.dart

@@ -179,12 +179,78 @@ void main() {
       28: 'fooAsync',
       38: 'isolateTask'
     });
-    if (platformVersionCheck(2, 17)) {
-      // Dart VM versions before 2.17 don't support branch coverage.
-      expect(isolateFile?.branchHits,
-          {11: 1, 12: 1, 15: 0, 19: 1, 23: 1, 28: 1, 32: 0, 38: 1, 42: 1});
+    expect(isolateFile?.branchHits,
+        {11: 1, 12: 1, 15: 0, 19: 1, 23: 1, 28: 1, 32: 0, 38: 1, 42: 1});
+  }, skip: !platformVersionCheck(2, 17));
+
+  test('HitMap.parseJson, old VM without branch coverage', () async {
+    final resultString = await _collectCoverage(true, true);
+    final jsonResult = json.decode(resultString) as Map<String, dynamic>;
+    final coverage = jsonResult['coverage'] as List;
+    final hitMap = await HitMap.parseJson(
+      coverage.cast<Map<String, dynamic>>(),
+    );
+    expect(hitMap, contains(_sampleAppFileUri));
+
+    final isolateFile = hitMap[_isolateLibFileUri];
+    final expectedHits = {
+      11: 1,
+      12: 1,
+      13: 1,
+      15: 0,
+      19: 1,
+      23: 1,
+      24: 2,
+      28: 1,
+      29: 1,
+      30: 1,
+      32: 0,
+      38: 1,
+      39: 1,
+      41: 1,
+      42: 3,
+      43: 1,
+      44: 3,
+      45: 1,
+      48: 1,
+      49: 1,
+      51: 1,
+      54: 1,
+      55: 1,
+      56: 1,
+      59: 1,
+      60: 1,
+      62: 1,
+      63: 1,
+      64: 1,
+      66: 1,
+      67: 1,
+      68: 1
+    };
+    if (Platform.version.startsWith('1.')) {
+      // Dart VMs prior to 2.0.0-dev.5.0 contain a bug that emits coverage on the
+      // closing brace of async function blocks.
+      // See: https://github.com/dart-lang/coverage/issues/196
+      expectedHits[23] = 0;
+    } else {
+      // Dart VMs version 2.0.0-dev.6.0 mark the opening brace of a function as
+      // coverable.
+      expectedHits[11] = 1;
+      expectedHits[28] = 1;
+      expectedHits[38] = 1;
+      expectedHits[42] = 3;
     }
-  });
+    expect(isolateFile?.lineHits, expectedHits);
+    expect(isolateFile?.funcHits, {11: 1, 19: 1, 21: 0, 23: 1, 28: 1, 38: 1});
+    expect(isolateFile?.funcNames, {
+      11: 'fooSync',
+      19: 'BarClass.BarClass',
+      21: 'BarClass.x=',
+      23: 'BarClass.baz',
+      28: 'fooAsync',
+      38: 'isolateTask'
+    });
+  }, skip: platformVersionCheck(2, 17));
 
   test('parseCoverage', () async {
     final tempDir = await Directory.systemTemp.createTemp('coverage.test.');

test/lcov_test.dart

@@ -45,12 +45,35 @@ void main() {
         reason: 'be careful if you modify the test file');
     expect(sampleAppFuncNames, containsPair(45, 'usedMethod'),
         reason: 'be careful if you modify the test file');
-    if (platformVersionCheck(2, 17)) {
-      // Dart VM versions before 2.17 don't support branch coverage.
-      expect(sampleAppBranchHits, containsPair(41, 1),
-          reason: 'be careful if you modify the test file');
-    }
-  });
+    expect(sampleAppBranchHits, containsPair(41, 1),
+        reason: 'be careful if you modify the test file');
+  }, skip: !platformVersionCheck(2, 17));
+
+  test('validate hitMap, old VM without branch coverage', () async {
+    final hitmap = await _getHitMap();
+
+    expect(hitmap, contains(_sampleAppFileUri));
+    expect(hitmap, contains(_isolateLibFileUri));
+    expect(hitmap, contains('package:coverage/src/util.dart'));
+
+    final sampleAppHitMap = hitmap[_sampleAppFileUri];
+    final sampleAppHitLines = sampleAppHitMap?.lineHits;
+    final sampleAppHitFuncs = sampleAppHitMap?.funcHits;
+    final sampleAppFuncNames = sampleAppHitMap?.funcNames;
+
+    expect(sampleAppHitLines, containsPair(46, greaterThanOrEqualTo(1)),
+        reason: 'be careful if you modify the test file');
+    expect(sampleAppHitLines, containsPair(50, 0),
+        reason: 'be careful if you modify the test file');
+    expect(sampleAppHitLines, isNot(contains(32)),
+        reason: 'be careful if you modify the test file');
+    expect(sampleAppHitFuncs, containsPair(45, 1),
+        reason: 'be careful if you modify the test file');
+    expect(sampleAppHitFuncs, containsPair(49, 0),
+        reason: 'be careful if you modify the test file');
+    expect(sampleAppFuncNames, containsPair(45, 'usedMethod'),
+        reason: 'be careful if you modify the test file');
+  }, skip: platformVersionCheck(2, 17));
 
   group('LcovFormatter', () {
     test('format()', () async {
@@ -206,25 +229,22 @@ void main() {
       expect(res, contains('       |  return a + b;'));
     });
 
-    if (platformVersionCheck(2, 17)) {
-      // Dart VM versions before 2.17 don't support branch coverage.
-      test('prettyPrint() branches', () async {
-        final hitmap = await _getHitMap();
+    test('prettyPrint() branches', () async {
+      final hitmap = await _getHitMap();
 
-        final resolver = Resolver(packagesPath: '.packages');
-        final res =
-            await hitmap.prettyPrint(resolver, Loader(), reportBranches: true);
+      final resolver = Resolver(packagesPath: '.packages');
+      final res =
+          await hitmap.prettyPrint(resolver, Loader(), reportBranches: true);
 
-        expect(res, contains(p.absolute(_sampleAppPath)));
-        expect(res, contains(p.absolute(_isolateLibPath)));
-        expect(res, contains(p.absolute(p.join('lib', 'src', 'util.dart'))));
+      expect(res, contains(p.absolute(_sampleAppPath)));
+      expect(res, contains(p.absolute(_isolateLibPath)));
+      expect(res, contains(p.absolute(p.join('lib', 'src', 'util.dart'))));
 
-        // be very careful if you change the test file
-        expect(res, contains('      1|  if (x == answer) {'));
-        expect(res, contains('      0|  while (i < lines.length) {'));
-        expect(res, contains('       |  bar.baz();'));
-      });
-    }
+      // be very careful if you change the test file
+      expect(res, contains('      1|  if (x == answer) {'));
+      expect(res, contains('      0|  while (i < lines.length) {'));
+      expect(res, contains('       |  bar.baz();'));
+    }, skip: !platformVersionCheck(2, 17));
   });
 }