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.

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

Remove dependencies from pom #184

Merged
merged 1 commit into from
Apr 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@

import org.eclipse.smarthome.core.library.types.PercentType;
import org.junit.Test;
import org.openhab.binding.zigbee.internal.converter.ZigBeeBaseChannelConverter;
import org.openhab.binding.zigbee.internal.converter.ZigBeeConverterSwitchLevel;

/**
* Test of the ZigBeeBaseChannelConverter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@
import org.eclipse.smarthome.core.types.State;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Matchers;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
import org.openhab.binding.zigbee.handler.ZigBeeCoordinatorHandler;
import org.openhab.binding.zigbee.handler.ZigBeeThingHandler;
import org.openhab.binding.zigbee.internal.converter.ZigBeeConverterSwitchOnoff;

import com.zsmartsystems.zigbee.IeeeAddress;
import com.zsmartsystems.zigbee.ZigBeeEndpoint;
Expand All @@ -39,7 +38,8 @@ public class ZigBeeConverterSwitchOnoffTest {
public void testAttributeUpdated() {
ZigBeeEndpoint endpoint = Mockito.mock(ZigBeeEndpoint.class);
ZigBeeCoordinatorHandler coordinatorHandler = Mockito.mock(ZigBeeCoordinatorHandler.class);
Mockito.when(coordinatorHandler.getEndpoint(Matchers.any(IeeeAddress.class), Matchers.anyInt())).thenReturn(endpoint);
Mockito.when(coordinatorHandler.getEndpoint(ArgumentMatchers.any(IeeeAddress.class), ArgumentMatchers.anyInt()))
.thenReturn(endpoint);

ZigBeeConverterSwitchOnoff converter = new ZigBeeConverterSwitchOnoff();
ArgumentCaptor<ChannelUID> channelCapture = ArgumentCaptor.forClass(ChannelUID.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ public class ZclLevelControlConfigTest {
@Test
public void getConfiguration() {
ZclLevelControlCluster cluster = Mockito.mock(ZclLevelControlCluster.class);
Mockito.when(cluster.discoverAttributes(Mockito.anyBoolean())).thenReturn(new MockedBooleanFuture());
Mockito.when(cluster.isAttributeSupported(Mockito.anyInt())).thenReturn(true);
Mockito.when(cluster.discoverAttributes(ArgumentMatchers.anyBoolean())).thenReturn(new MockedBooleanFuture());
Mockito.when(cluster.isAttributeSupported(ArgumentMatchers.anyInt())).thenReturn(true);

ZclLevelControlConfig config = new ZclLevelControlConfig(cluster);
List<ConfigDescriptionParameter> configuration = config.getConfiguration();
Expand Down
12 changes: 0 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,18 +97,6 @@
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.2</version>
<scope>test</scope>
</dependency>
</dependencies>

<pluginRepositories>
Expand Down