1739

Committed 04 Jun 2020 08:29PM UTC coverage: 88.124% (-0.2%) from 88.361%

Build # 1739

Build Type

cron

travis-ci

Committed by

web-flow

Commit Message

<a href="https://github.com/dart-lang/coverage/commit/<a class=hub.com/dart-lang/coverage/commit/7e18328a0fcb9353d2ad68748b66f5f5cb7c253c">7e18328a0<a href="https://github.com/dart-lang/coverage/commit/7e18328a0fcb9353d2ad68748b66f5f5cb7c253c">&quot;&gt;Revert the 0.13.11 revert and properly model it as a breaking change (#305)

* Revert &amp;quot;Revert breaking change in 13.10 (#304)&quot;

This reverts commit </a><a class="double-link" href="https://github.com/dart-lang/coverage/commit/<a class="double-link" href="https://github.com/dart-lang/coverage/commit/49219fc713fa1ad6f64278151d5c6a673b8c4525">49219fc71</a>">49219fc71</a><a href="https://github.com/dart-lang/coverage/commit/7e18328a0fcb9353d2ad68748b66f5f5cb7c253c">.

* update version and changelog

* pin test

* remove overrides

Run Details

44 of 44 new or added lines in 2 files covered. (100.0%)

371 of 421 relevant lines covered (88.12%)

1.61 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

77.05

/lib/src/hitmap.dart

// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.

import 'dart:async';
import 'dart:convert' show json;
import 'dart:io';

import 'package:coverage/src/resolver.dart';
import 'package:coverage/src/util.dart';

/// Creates a single hitmap from a raw json object. Throws away all entries that
/// are not resolvable.
///
/// `jsonResult` is expected to be a List<Map<String, dynamic>>.
Future<Map<String, Map<int, int>>> createHitmap(
  List<Map<String, dynamic>> jsonResult, {
  bool checkIgnoredLines = false,
  String packagesPath,
}) async {
  final resolver = Resolver(packagesPath: packagesPath);
  final loader = Loader();

  // Map of source file to map of line to hit count for that line.
  final globalHitMap = <String, Map<int, int>>{};

  void addToMap(Map<int, int> map, int line, int count) {
    final oldCount = map.putIfAbsent(line, () => 0);
    map[line] = count + oldCount;
  }

  for (var e in jsonResult) {
    final source = e['source'] as String;
    if (source == null) {
      // Couldn't resolve import, so skip this entry.
      continue;
    }

    var ignoredLinesList = <List<int>>[];

    if (checkIgnoredLines) {
      final lines = await loader.load(resolver.resolve(source));
      ignoredLinesList = getIgnoredLines(lines);

      // Ignore the whole file.
      if (ignoredLinesList.length == 1 &&
          ignoredLinesList[0][0] == 0 &&
          ignoredLinesList[0][1] == lines.length) {
        continue;
      }
    }

    // Move to the first ignore range.
    final ignoredLines = ignoredLinesList.iterator;
    ignoredLines.moveNext();

    final sourceHitMap = globalHitMap.putIfAbsent(source, () => <int, int>{});
    final hits = e['hits'] as List;
    // hits is a flat array of the following format:
    // [ <line|linerange>, <hitcount>,...]
    // line: number.
    // linerange: '<line>-<line>'.
    for (var i = 0; i < hits.length; i += 2) {
      final k = hits[i];
      if (k is int) {
        // Single line.
        if (_shouldIgnoreLine(ignoredLines, k)) continue;

        addToMap(sourceHitMap, k, hits[i + 1] as int);
      } else if (k is String) {
        // Linerange. We expand line ranges to actual lines at this point.
        final splitPos = k.indexOf('-');
        final start = int.parse(k.substring(0, splitPos));
        final end = int.parse(k.substring(splitPos + 1));
        for (var j = start; j <= end; j++) {
          if (_shouldIgnoreLine(ignoredLines, j)) continue;

          addToMap(sourceHitMap, j, hits[i + 1] as int);
        }
      } else {
        throw StateError('Expected value of type int or String');
      }
    }
  }
  return globalHitMap;
}

bool _shouldIgnoreLine(Iterator<List<int>> ignoredRanges, int line) {
  if (ignoredRanges.current == null || ignoredRanges.current.isEmpty) {
    return false;
  }

  if (line < ignoredRanges.current[0]) return false;

  while (ignoredRanges.current != null &&
      ignoredRanges.current.isNotEmpty &&
      ignoredRanges.current[1] < line) {
    ignoredRanges.moveNext();
  }

  if (ignoredRanges.current != null &&
      ignoredRanges.current.isNotEmpty &&
      ignoredRanges.current[0] <= line &&
      line <= ignoredRanges.current[1]) {
    return true;
  }

  return false;
}

/// Merges [newMap] into [result].
void mergeHitmaps(
    Map<String, Map<int, int>> newMap, Map<String, Map<int, int>> result) {
  newMap.forEach((String file, Map<int, int> v) {
    if (result.containsKey(file)) {
      v.forEach((int line, int cnt) {
        if (result[file][line] == null) {
          result[file][line] = cnt;
        } else {
          result[file][line] += cnt;
        }
      });
    } else {
      result[file] = v;
    }
  });
}

/// Generates a merged hitmap from a set of coverage JSON files.
Future<Map<String, Map<int, int>>> parseCoverage(
  Iterable<File> files,
  int _, {
  bool checkIgnoredLines = false,
}) async {
  final globalHitmap = <String, Map<int, int>>{};
  for (var file in files) {
    final contents = file.readAsStringSync();
    final jsonMap = json.decode(contents) as Map<String, dynamic>;
    if (jsonMap.containsKey('coverage')) {
      final jsonResult = jsonMap['coverage'] as List;
      mergeHitmaps(
        await createHitmap(
          jsonResult.cast<Map<String, dynamic>>(),
          checkIgnoredLines: checkIgnoredLines,
        ),
        globalHitmap,
      );
    }
  }
  return globalHitmap;
}

1	// Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file
2	// for details. All rights reserved. Use of this source code is governed by a
3	// BSD-style license that can be found in the LICENSE file.
4
5	import 'dart:async';
6	import 'dart:convert' show json;
7	import 'dart:io';
8
9	import 'package:coverage/src/resolver.dart';
10	import 'package:coverage/src/util.dart';
11
12	/// Creates a single hitmap from a raw json object. Throws away all entries that
13	/// are not resolvable.
14	///
15	/// `jsonResult` is expected to be a List<Map<String, dynamic>>.
16	Future<Map<String, Map<int, int>>> createHitmap(	1✔
17	List<Map<String, dynamic>> jsonResult, {
18	bool checkIgnoredLines = false,
19	String packagesPath,
20	}) async {
21	final resolver = Resolver(packagesPath: packagesPath);	1✔
22	final loader = Loader();	1✔
23
24	// Map of source file to map of line to hit count for that line.
25	final globalHitMap = <String, Map<int, int>>{};	1✔
26
27	void addToMap(Map<int, int> map, int line, int count) {	1✔
28	final oldCount = map.putIfAbsent(line, () => 0);	2✔
29	map[line] = count + oldCount;	2✔
30	}
31
32	for (var e in jsonResult) {	2✔
33	final source = e['source'] as String;	1✔
34	if (source == null) {
35	// Couldn't resolve import, so skip this entry.
36	continue;
37	}
38
39	var ignoredLinesList = <List<int>>[];	1✔
40
41	if (checkIgnoredLines) {
42	final lines = await loader.load(resolver.resolve(source));	3✔
43	ignoredLinesList = getIgnoredLines(lines);	1✔
44
45	// Ignore the whole file.
46	if (ignoredLinesList.length == 1 &&	2✔
47	ignoredLinesList[0][0] == 0 &&	×
48	ignoredLinesList[0][1] == lines.length) {	×
49	continue;
50	}
51	}
52
53	// Move to the first ignore range.
54	final ignoredLines = ignoredLinesList.iterator;	1✔
55	ignoredLines.moveNext();	1✔
56
57	final sourceHitMap = globalHitMap.putIfAbsent(source, () => <int, int>{});	3✔
58	final hits = e['hits'] as List;	1✔
59	// hits is a flat array of the following format:
60	// [ <line\|linerange>, <hitcount>,...]
61	// line: number.
62	// linerange: '<line>-<line>'.
63	for (var i = 0; i < hits.length; i += 2) {	3✔
64	final k = hits[i];	1✔
65	if (k is int) {	1✔
66	// Single line.
67	if (_shouldIgnoreLine(ignoredLines, k)) continue;	1✔
68
69	addToMap(sourceHitMap, k, hits[i + 1] as int);	3✔
70	} else if (k is String) {	×
71	// Linerange. We expand line ranges to actual lines at this point.
72	final splitPos = k.indexOf('-');	×
73	final start = int.parse(k.substring(0, splitPos));	×
74	final end = int.parse(k.substring(splitPos + 1));	×
75	for (var j = start; j <= end; j++) {	×
76	if (_shouldIgnoreLine(ignoredLines, j)) continue;	×
77
78	addToMap(sourceHitMap, j, hits[i + 1] as int);	×
79	}
80	} else {
81	throw StateError('Expected value of type int or String');	×
82	}
83	}
84	}
85	return globalHitMap;
86	}
87
88	bool _shouldIgnoreLine(Iterator<List<int>> ignoredRanges, int line) {	1✔
89	if (ignoredRanges.current == null \|\| ignoredRanges.current.isEmpty) {	3✔
90	return false;
91	}
92
93	if (line < ignoredRanges.current[0]) return false;	3✔
94
95	while (ignoredRanges.current != null &&	1✔
96	ignoredRanges.current.isNotEmpty &&	2✔
97	ignoredRanges.current[1] < line) {	3✔
98	ignoredRanges.moveNext();	1✔
99	}
100
101	if (ignoredRanges.current != null &&	1✔
102	ignoredRanges.current.isNotEmpty &&	2✔
103	ignoredRanges.current[0] <= line &&	3✔
104	line <= ignoredRanges.current[1]) {	3✔
105	return true;
106	}
107
108	return false;
109	}
110
111	/// Merges [newMap] into [result].
112	void mergeHitmaps(	1✔
113	Map<String, Map<int, int>> newMap, Map<String, Map<int, int>> result) {
114	newMap.forEach((String file, Map<int, int> v) {	2✔
115	if (result.containsKey(file)) {	1✔
116	v.forEach((int line, int cnt) {	×
117	if (result[file][line] == null) {	×
118	result[file][line] = cnt;	×
119	} else {
120	result[file][line] += cnt;	×
121	}
122	});
123	} else {
124	result[file] = v;	1✔
125	}
126	});
127	}
128
129	/// Generates a merged hitmap from a set of coverage JSON files.
130	Future<Map<String, Map<int, int>>> parseCoverage(	1✔
131	Iterable<File> files,
132	int _, {
133	bool checkIgnoredLines = false,
134	}) async {
135	final globalHitmap = <String, Map<int, int>>{};	1✔
136	for (var file in files) {	2✔
137	final contents = file.readAsStringSync();	1✔
138	final jsonMap = json.decode(contents) as Map<String, dynamic>;	1✔
139	if (jsonMap.containsKey('coverage')) {	1✔
140	final jsonResult = jsonMap['coverage'] as List;	1✔
141	mergeHitmaps(	1✔
142	await createHitmap(	2✔
143	jsonResult.cast<Map<String, dynamic>>(),	1✔
144	checkIgnoredLines: checkIgnoredLines,
145	),
146	globalHitmap,
147	);
148	}
149	}
150	return globalHitmap;
151	}

dart-lang / coverage / 1739

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous