Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switched to Mockito 2 #3238

Merged
merged 1 commit into from
Feb 13, 2018
Merged

switched to Mockito 2 #3238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions addons/binding/org.openhab.binding.avmfritz.test/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,9 @@ Import-Package:
org.hamcrest;core=split,
org.junit;version="4.0.0",
org.mockito,
org.mockito.stubbing,
org.openhab.binding.avmfritz,
org.openhab.binding.avmfritz.handler,
org.osgi.framework,
org.osgi.service.device,
org.slf4j
Require-Bundle:
org.hamcrest,
org.junit,
org.mockito
2 changes: 1 addition & 1 deletion addons/binding/org.openhab.binding.freebox/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/freeboxos-client-0.4.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/httpcore-4.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/httpclient-4.3.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-core-asl-1.9.13.jar"/>
Expand All @@ -10,5 +9,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="lib" path="lib/freeboxos-client-0.4.2.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
1 change: 1 addition & 0 deletions addons/binding/org.openhab.binding.fronius/OSGI-INF/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/*.xml
5 changes: 1 addition & 4 deletions addons/binding/org.openhab.binding.nest.test/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,9 @@ Import-Package:
org.hamcrest;core=split,
org.junit,
org.mockito,
org.mockito.stubbing,
org.openhab.binding.nest,
org.openhab.binding.nest.handler,
org.osgi.framework,
org.osgi.service.device,
org.slf4j
Require-Bundle:
org.hamcrest,
org.junit,
org.mockito
8 changes: 4 additions & 4 deletions addons/binding/org.openhab.binding.network.test/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ Import-Package:
org.eclipse.smarthome.core.thing.util,
org.hamcrest;core=split,
org.junit;version="4.0.0",
org.junit.runner,
org.mockito,
org.mockito.invocation,
org.mockito.runners,
org.mockito.stubbing,
org.openhab.binding.network,
org.openhab.binding.network.handler,
org.osgi.framework,
org.osgi.service.device,
org.slf4j
Require-Bundle:
org.hamcrest,
org.junit,
org.mockito
5 changes: 1 addition & 4 deletions ...etwork.test/src/test/java/org/openhab/binding/network/internal/PresenceDetectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.*;
import static org.mockito.Matchers.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;

import java.io.IOException;
Expand All @@ -23,11 +23,9 @@
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.runners.MockitoJUnitRunner;
import org.openhab.binding.network.internal.toberemoved.cache.ExpiringCacheAsync;
import org.openhab.binding.network.internal.toberemoved.cache.ExpiringCacheHelper;
import org.openhab.binding.network.internal.utils.NetworkUtils;
Expand All @@ -39,7 +37,6 @@
*
* @author David Graeff - Initial contribution
*/
@RunWith(MockitoJUnitRunner.class)
public class PresenceDetectionTest {
static long CACHETIME = 2000L;
@Mock
Expand Down
2 changes: 1 addition & 1 deletion addons/binding/org.openhab.binding.onewiregpio/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
7 changes: 4 additions & 3 deletions addons/binding/org.openhab.binding.tplinksmarthome.test/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@ Import-Package: org.apache.commons.io,
org.eclipse.smarthome.test.storage,
org.hamcrest;core=split,
org.junit,
org.junit.runner;version="4.12.0",
org.junit.runners;version="4.12.0",
org.mockito,
org.mockito.invocation,
org.mockito.stubbing,
org.openhab.binding.tplinksmarthome,
org.openhab.binding.tplinksmarthome.handler,
org.osgi.framework,
org.osgi.service.device,
org.slf4j
Require-Bundle: org.junit,
org.mockito,
org.hamcrest
Export-Package:
org.openhab.binding.tplinksmarthome;uses:="org.eclipse.smarthome.test"