Revert "Add JUnit testing for ConfigurationServiceImpl class."

This reverts commit eb362a3e296c10ad8ac7b5cb626cd2466f4d558b.

This is to stop regression introduced, where hit the following failure:

https://jenkins.opendaylight.org/releng/view/ovsdb/job/ovsdb-daily-full-integration/OVS_VERSION=1.9.0,jdk=openjdk7,nodes=dynamic_docker/23/consoleFull

apiTests(org.opendaylight.ovsdb.integrationtest.plugin.OvsdbPluginIT)
Tests run: 3, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 53.545 sec <<< FAILURE! - in org.opendaylight.ovsdb.integrationtest.plugin.OvsdbPluginIT
testInventoryListeners(org.opendaylight.ovsdb.integrationtest.plugin.OvsdbPluginIT)  Time elapsed: 10.368 sec  <<< ERROR!
java.lang.NullPointerException: null
	at org.mockito.internal.exceptions.stacktrace.StackTraceFilter.<clinit>(StackTraceFilter.java:21)
	at org.mockito.internal.exceptions.stacktrace.ConditionalStackTraceFilter.<init>(ConditionalStackTraceFilter.java:17)
	at org.mockito.exceptions.base.MockitoException.filterStackTrace(MockitoException.java:30)
	at org.mockito.exceptions.base.MockitoException.<init>(MockitoException.java:19)
	at org.mockito.exceptions.misusing.MockitoConfigurationException.<init>(MockitoConfigurationException.java:18)
	at org.mockito.internal.configuration.ClassPathLoader.loadImplementations(ClassPathLoader.java:145)
	at org.mockito.internal.configuration.ClassPathLoader.findPluginImplementation(ClassPathLoader.java:110)
	at org.mockito.internal.configuration.ClassPathLoader.findPlatformMockMaker(ClassPathLoader.java:106)
	at org.mockito.internal.configuration.ClassPathLoader.<clinit>(ClassPathLoader.java:59)
	at org.mockito.internal.util.MockUtil.<clinit>(MockUtil.java:21)
	at org.mockito.internal.MockitoCore.<init>(MockitoCore.java:40)
	at org.mockito.Mockito.<clinit>(Mockito.java:932)
	at org.opendaylight.ovsdb.integrationtest.plugin.OvsdbPluginIT.testInventoryListeners(OvsdbPluginIT.java:171)

Change-Id: I13d0c3193e297eb9b825bd657478955fc7876733
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

diff --git a/openstack/net-virt/pom.xml b/openstack/net-virt/pom.xml
index 1d44dbd59bbd319b074a6b6f7e8c8f209ab9483d..b44b719e471509395229d767d8e9211083e1e6a6 100644 (file)
--- a/openstack/net-virt/pom.xml
+++ b/openstack/net-virt/pom.xml
@@ -71,14 +71,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
     </dependency>
-    <dependency>
-     <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito</artifactId>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ConfigurationServiceImplTest.java b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ConfigurationServiceImplTest.java
deleted file mode 100644 (file)
index d855ec9..0000000
--- a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/ConfigurationServiceImplTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2015 Inocybe and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.ovsdb.openstack.netvirt.impl;
-
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.same;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.opendaylight.ovsdb.lib.notation.Column;
-import org.opendaylight.ovsdb.lib.notation.Row;
-import org.opendaylight.ovsdb.lib.schema.GenericTableSchema;
-import org.opendaylight.ovsdb.openstack.netvirt.api.Constants;
-import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService;
-import org.opendaylight.ovsdb.schema.openvswitch.OpenVSwitch;
-import org.opendaylight.ovsdb.utils.config.ConfigProperties;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-/**
- * Unit test for {@link ConfigurationServiceImpl}
- */
-@PrepareForTest(ConfigProperties.class)
-@RunWith(PowerMockRunner.class)
-public class ConfigurationServiceImplTest {
-
-    @Mock
-    private OvsdbConfigurationService ovsdbConfigurationService;
-
-    @InjectMocks
-    private ConfigurationServiceImpl configurationServiceImpl;
-
-    private static final String HOST_ADDRESS = "127.0.0.1";
-
-    /**
-     * Test method {@link ConfigurationServiceImpl#getTunnelEndPoint(Node)}
-     */
-    @Test
-    public void testGetTunnelEndPoint() throws Exception {
-        Row row = mock(Row.class);
-        ConcurrentMap<String, Row> ovsTable = new ConcurrentHashMap();
-        ovsTable.put("key", row);
-
-        OpenVSwitch ovsRow = mock(OpenVSwitch.class);
-        Map<String, String> configs = new HashMap();
-        configs.put(Constants.TUNNEL_ENDPOINT_KEY, HOST_ADDRESS);
-        Column<GenericTableSchema, Map<String, String>> otherConfigColumn = mock(Column.class);
-
-        when(ovsRow.getOtherConfigColumn()).thenReturn(otherConfigColumn);
-        when(otherConfigColumn.getData()).thenReturn(configs);
-
-        when(ovsdbConfigurationService.getRows(any(Node.class), anyString())).thenReturn(ovsTable);
-        when(ovsdbConfigurationService.getTypedRow(any(Node.class),same(OpenVSwitch.class), any(Row.class))).thenReturn(ovsRow);
-
-        assertEquals("Error, did not return address of tunnelEndPoint", HOST_ADDRESS, configurationServiceImpl.getTunnelEndPoint(mock(Node.class)).getHostAddress());
-    }
-
-    /**
-     * Test method {@link ConfigurationServiceImpl#getDefaultGatewayMacAddress(Node)}
-     */
-    @Test
-    public void testGetDefaultGatewayMacAddress(){
-        Node node = mock(Node.class);
-        NodeId nodeId = mock(NodeId.class);
-        PowerMockito.mockStatic(ConfigProperties.class);
-
-        when(node.getId()).thenReturn(nodeId);
-        when(nodeId.getValue()).thenReturn("nodeIdValue");
-        PowerMockito.when(ConfigProperties.getProperty(configurationServiceImpl.getClass(), "ovsdb.l3gateway.mac." + node.getId().getValue())).thenReturn("gateway");
-
-        assertEquals("Error, did not return the defaultGatewayMacAddress of the node", "gateway", configurationServiceImpl.getDefaultGatewayMacAddress(node));
-    }
-}