From 277b5e8492aa4a321e764b57c76255bef2a434bf Mon Sep 17 00:00:00 2001 From: Bartosz Firyn Date: Mon, 12 Jan 2015 16:59:24 +0100 Subject: [PATCH] More unit tests for WebcamLock, etc --- pom.xml | 17 ++ webcam-capture/pom.xml | 26 +- .../com/github/sarxos/webcam/WebcamLock.java | 31 ++- .../github/sarxos/webcam/WebcamLockTest.java | 64 +++++ .../sarxos/webcam/WebcamStaticsTest.java | 190 +++++++++++++ .../com/github/sarxos/webcam/WebcamTest.java | 260 +++++------------- 6 files changed, 381 insertions(+), 207 deletions(-) create mode 100644 webcam-capture/src/test/java/com/github/sarxos/webcam/WebcamLockTest.java create mode 100644 webcam-capture/src/test/java/com/github/sarxos/webcam/WebcamStaticsTest.java diff --git a/pom.xml b/pom.xml index f41f3a69..78b54fb4 100644 --- a/pom.xml +++ b/pom.xml @@ -94,21 +94,37 @@ junit junit 4.11 + test org.easymock easymock 3.2 + test org.powermock powermock-module-junit4 1.5.5 + test org.powermock powermock-api-easymock 1.5.5 + test + + + org.assertj + assertj-core + 1.6.1 + test + + + com.jayway.awaitility + awaitility + 1.6.2 + test org.slf4j @@ -119,6 +135,7 @@ ch.qos.logback logback-classic 1.0.9 + provided diff --git a/webcam-capture/pom.xml b/webcam-capture/pom.xml index 7a255ff3..78a36471 100644 --- a/webcam-capture/pom.xml +++ b/webcam-capture/pom.xml @@ -29,10 +29,10 @@ bridj 0.6.3-SNAPSHOT - - dx - com.google.android.tools - + + dx + com.google.android.tools + @@ -44,11 +44,29 @@ logback-classic provided + + junit junit test + + org.assertj + assertj-core + test + + + org.easymock + easymock + test + + + com.jayway.awaitility + awaitility + test + +