Misc dart2 compat changes

.travis.yml

@@ -3,15 +3,6 @@ services:
   - rabbitmq
 jobs:
   include:
-#    - stage: run tests
-#      dart: stable
-#      script:
-#        - export PATH=$PATH:"~/.pub-cache/bin"
-#        - pub get
-#        - pub global activate coverage
-#        - dartanalyzer --fatal-warnings --fatal-hints --fatal-lints ./
-#        - cd test
-#        - bash run.sh
     - stage: run tests
       dart: dev
       script:
@@ -21,6 +12,6 @@ jobs:
         - dartanalyzer --fatal-warnings --fatal-hints --fatal-lints ./
         - cd test
         - bash run.sh
-#      after_success:
-#        - bash test_coverage.sh
-#        - bash <(curl -s https://codecov.io/bash) -X gcov -f '*.lcov'
+      after_success:
+        - bash test_coverage.sh
+        - dart upload_coverage.dart

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)
-[![codecov](https://codecov.io/gh/achilleasa/dart_amqp/branch/master/graph/badge.svg)](https://codecov.io/gh/achilleasa/dart_amqp)
+[![Coverage Status](https://coveralls.io/repos/github/achilleasa/dart_amqp/badge.svg)](https://coveralls.io/github/achilleasa/dart_amqp)
 
 Dart AMQP client implementing protocol version 0.9.1
 

pubspec.yaml

@@ -10,8 +10,8 @@ dependencies:
   logging: ^0.11.3+2
 dev_dependencies:
   test: ^1.3.0
-  mock: ^0.12.0
+  mockito: ^3.0.0
   http: ^0.11.1+1
   xml: ^3.2.0
-#  coverage: ^0.12.2
-#  dart_codecov_generator: "^0.4.0"
+  coverage: ^0.12.2
+  coveralls: ^3.2.0

test/lib/amqp_decoder_test.dart

@@ -4,7 +4,7 @@ import "dart:async";
 import "dart:typed_data";
 
 import "package:test/test.dart";
-import "package:mock/mock.dart";
+import "package:mockito/mockito.dart";
 
 import "package:dart_amqp/src/enums.dart";
 import "package:dart_amqp/src/protocol.dart";

test/lib/auth_test.dart

@@ -1,7 +1,7 @@
 library dart_amqp.test.auth;
 
 import "package:test/test.dart";
-import "package:mock/mock.dart";
+import "package:mockito/mockito.dart";
 
 import "package:dart_amqp/src/authentication.dart";
 import "package:dart_amqp/src/client.dart";
@@ -253,4 +253,4 @@ main({bool enableLogger : true}) {
       }));
     });
   });
-}
+}

test/lib/exception_handling_test.dart

@@ -5,7 +5,7 @@ import "dart:async";
 import "dart:math";
 
 import "package:test/test.dart";
-import "package:mock/mock.dart";
+import "package:mockito/mockito.dart";
 
 import "package:dart_amqp/src/client.dart";
 import "package:dart_amqp/src/enums.dart";

test/run_all.dart

@@ -55,4 +55,4 @@ void main(List<String> args) {
   if (runAll || (new RegExp("client")).hasMatch(allArgs)) {
     client.main(enableLogger : enableLogger);
   }
-}
+}

test/test_coverage.sh

@@ -19,12 +19,12 @@ dart --enable-vm-service --pause-isolates-on-exit run_all.dart > /dev/null &
 
 # Run coverage collection tool
 echo "Waiting for unit tests to run..."
-collect_coverage --port=8181 -o coverage/coverage.json --wait-paused # --resume-isolates
+pub global run coverage:collect_coverage --port=8181 -o coverage/coverage.json --wait-paused # --resume-isolates
 echo "Collected coverage data..."
 
 # Convert data to LCOV format
 echo "Converting to LCOV format..."
-format_coverage --package-root=../  -i coverage/coverage.json -l > coverage/coverage.lcov
+pub global run coverage:format_coverage --package-root=../  -i coverage/coverage.json -l > coverage/coverage.lcov
 
 # Remove LCOV blocks that do not belong to our project lib/ folder
 echo "Filtering unrelated files from the LCOV data..."

test/upload_coverage.dart

@@ -0,0 +1,14 @@
+import 'dart:async';
+import 'dart:io';
+import 'package:coveralls/coveralls.dart';
+
+Future<void> main() async {
+  try {
+    final coverage = File('coverage/coverage.lcov');
+    await Client().upload(await coverage.readAsString());
+    print('Code coverage report uploaded to coveralls.io');
+  } on Exception catch (err) {
+    print('An error occurred: $err');
+    if (err is ClientException) print('From: ${err.uri}');
+  }
+}