Clean up tests a bit

Reorder fields, fix raw type warnings, remove superfluous empty lines.

Change-Id: I5bc3b2ef61e76a5746eb6df9932224343a0c1414
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/CapabilityChangeNotificationProducerTest.java b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/CapabilityChangeNotificationProducerTest.java
index a2d07018fa1025f52ec6522cef3628bdd5edeae7..a177b5c96ecdf3e899eb2d2b1de3684f45e623b2 100644 (file)
--- a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/CapabilityChangeNotificationProducerTest.java
+++ b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/CapabilityChangeNotificationProducerTest.java
@@ -44,19 +44,17 @@ import org.opendaylight.yangtools.yang.common.Empty;
 
 @RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class CapabilityChangeNotificationProducerTest {
-
-    private CapabilityChangeNotificationProducer capabilityChangeNotificationProducer;
-
     @Mock
     private BaseNotificationPublisherRegistration baseNotificationPublisherRegistration;
     @Mock
-    private ListenerRegistration listenerRegistration;
-
+    private ListenerRegistration<?> listenerRegistration;
     @Mock
     private NetconfNotificationCollector netconfNotificationCollector;
     @Mock
     private DataBroker dataBroker;
 
+    private CapabilityChangeNotificationProducer capabilityChangeNotificationProducer;
+
     @Before
     public void setUp() {
         doReturn(listenerRegistration).when(dataBroker).registerDataTreeChangeListener(any(DataTreeIdentifier.class),

diff --git a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/SessionNotificationProducerTest.java b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/SessionNotificationProducerTest.java
index 17eb4be0c6ff0c19f987c8c280f0b306e5e9b5ed..eafd000b139426c0735bfb725ff1d45d810b0d9a 100644 (file)
--- a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/SessionNotificationProducerTest.java
+++ b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/netconf/mdsal/notification/impl/SessionNotificationProducerTest.java
@@ -45,21 +45,19 @@ import org.slf4j.LoggerFactory;
 
 @RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class SessionNotificationProducerTest {
-
     private static final Logger LOG = LoggerFactory.getLogger(SessionNotificationProducerTest.class);
 
-    private SessionNotificationProducer publisher;
-
     @Mock
     private BaseNotificationPublisherRegistration registration;
     @Mock
-    private ListenerRegistration listenerRegistration;
-
+    private ListenerRegistration<?> listenerRegistration;
     @Mock
     private NetconfNotificationCollector netconfNotificationCollector;
     @Mock
     private DataBroker dataBroker;
 
+    private SessionNotificationProducer publisher;
+
     @Before
     public void setUp() {
         doReturn(listenerRegistration).when(dataBroker).registerDataTreeChangeListener(any(DataTreeIdentifier.class),