Merge b3ba160 into 0236546

achilleasa · Nov 6, 2019 · 98eefda · 98eefda
2 parents 0236546 + b3ba160
commit 98eefda
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 52 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,9 +3,10 @@
 .idea
 .pub/
 build/
-test/coverage
+coverage/
+test/.test_coverage.dart
 packages
 pubspec.lock
 tool/amqp0-9-1.xml
 .packages
-.dart_tool
+.dart_tool
diff --git a/.travis.yml b/.travis.yml
@@ -26,9 +26,10 @@ jobs:
         - dartanalyzer --fatal-warnings --fatal-hints --fatal-lints ./
         - cd test
         - AMQP_RUN_TLS_TESTS=true bash run.sh
+        - cd ../
       after_success:
-        - bash test_coverage.sh
-        - dart upload_coverage.dart
+        - AMQP_RUN_TLS_TESTS=true pub run test_coverage --no-badge
+        - dart test/upload_coverage.dart
 cache:
   directories:
     - "${TRAVIS_HOME}/.pub-cache"
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # dart_ampq
 
 [![Build Status](https://travis-ci.org/achilleasa/dart_amqp.svg?branch=master)](https://travis-ci.org/achilleasa/dart_amqp)
-[![Coverage Status](https://coveralls.io/repos/github/achilleasa/dart_amqp/badge.svg)](https://coveralls.io/github/achilleasa/dart_amqp)
+[![Coverage Status](https://coveralls.io/repos/github/achilleasa/dart_amqp/badge.svg?branch=master)](https://coveralls.io/github/achilleasa/dart_amqp?branch=master)
 
 Dart AMQP client implementing protocol version 0.9.1
 

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -11,8 +11,8 @@ dependencies:
 dev_dependencies:
   test: ^1.9.3
   mockito: ^3.0.0
-  http: ^0.11.1+1
+  http: ^0.12.0
   xml: ^3.2.0
-  coverage: ^0.13.3
-  coveralls: ^3.2.0
+  coveralls: ^5.6.0
   pedantic: 1.5.0
+  test_coverage: ^0.4.0
diff --git a/test/lib/client_test.dart b/test/lib/client_test.dart
@@ -70,6 +70,10 @@ main({bool enableLogger = true}) {
   });
 
   var certPath = "${Directory.current.path}/lib/mocks/certs";
+  // When collecting code coverage metrics, current path will be the package root instead.
+  if (!Directory(certPath).existsSync()) {
+    certPath = "${Directory.current.path}/test/lib/mocks/certs";
+  }
   var skipTLSTests = Platform.environment.containsKey("AMQP_RUN_TLS_TESTS")
       ? null
       : """

diff --git a/test/test_coverage.sh b/test/test_coverage.sh
diff --git a/test/upload_coverage.dart b/test/upload_coverage.dart
@@ -4,7 +4,7 @@ import 'package:coveralls/coveralls.dart';
 
 Future<void> main() async {
   try {
-    final coverage = File('coverage/coverage.lcov');
+    final coverage = File('coverage/lcov.info');
     await Client().upload(await coverage.readAsString());
     print('Code coverage report uploaded to coveralls.io');
   } on Exception catch (err) {