BUG-2682: switch sal-binding-dom-it to sal test models

 - DilcardedDataChangeListenerTest
 - ConcurrentImplicitCreateTest
 - BrokerIntegrationTest
 - ChangeOriginatedInDomBrokerTest

Change-Id: I20f2c6d5d93a535f0ccfb0efc484ec099a75f53b
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
index 01cd1f88ba0e29f5391ac3a07330cc10fb940606..d6a5e498b658a64356950c0f1de5238d018970a2 100644 (file)
--- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml
+++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
@@ -29,11 +29,6 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

-    <dependency>
-      <groupId>org.opendaylight.controller.model</groupId>
-      <artifactId>model-flow-service</artifactId>
-      <scope>test</scope>
-    </dependency>

     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-container-native</artifactId>
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-container-native</artifactId>


@@ -49,10 +44,14 @@
       <artifactId>yang-parser-impl</artifactId>
       <scope>test</scope>
     </dependency>
       <artifactId>yang-parser-impl</artifactId>
       <scope>test</scope>
     </dependency>

-      <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>sal-test-model</artifactId>
-      </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-test-model</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools.model</groupId>
+      <artifactId>opendaylight-l2-types</artifactId>
+    </dependency>

   </dependencies>
   <build>
     <plugins>
   </dependencies>
   <build>
     <plugins>

diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/ConcurrentImplicitCreateTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/ConcurrentImplicitCreateTest.java
index 7135660319e58900493378ac11b4776612eb15ef..3d25018e247daf848f517746f73ff6e79bf9b89d 100644 (file)
--- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/ConcurrentImplicitCreateTest.java
+++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/ConcurrentImplicitCreateTest.java
@@ -24,7 +24,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 

-/*
+/**

  * FIXME: THis test should be moved to sal-binding-broker and rewriten
  * to use new DataBroker API
  */
  * FIXME: THis test should be moved to sal-binding-broker and rewriten
  * to use new DataBroker API
  */

diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/WildcardedDataChangeListenerTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/WildcardedDataChangeListenerTest.java
index 3ac2b0d6bbc1119fc96d90bae25fef7b30d99ad8..0a611a75d0ed2bd57fe27a6fd9117068ca1cf230 100644 (file)
--- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/WildcardedDataChangeListenerTest.java
+++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/WildcardedDataChangeListenerTest.java
@@ -180,4 +180,4 @@ public class WildcardedDataChangeListenerTest extends AbstractDataServiceTest {
         assertFalse(event.getCreatedOperationalData().containsKey(NODE_0_CWU_PATH));
     }
 
         assertFalse(event.getCreatedOperationalData().containsKey(NODE_0_CWU_PATH));
     }
 

-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/BrokerIntegrationTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/BrokerIntegrationTest.java
index 3027eaa6eeedaa3a8d3f596487b45d735b0e8330..48027114d75997b4e99a85d7fc655b668393e3d8 100644 (file)
--- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/BrokerIntegrationTest.java
+++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/BrokerIntegrationTest.java
@@ -25,7 +25,9 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 

-// FIXME: Migrate to use new Data Broker APIs
+/**
+ * FIXME: Migrate to use new Data Broker APIs
+ */

 @SuppressWarnings("deprecation")
 public class BrokerIntegrationTest extends AbstractDataServiceTest {
 
 @SuppressWarnings("deprecation")
 public class BrokerIntegrationTest extends AbstractDataServiceTest {
 

diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/ChangeOriginatedInDomBrokerTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/ChangeOriginatedInDomBrokerTest.java
index 5a436c81b6ce25bf2d84103c2758ac8704388298..25b159b43b297eaeee8755c50688e5d0a2ff9aab 100644 (file)
--- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/ChangeOriginatedInDomBrokerTest.java
+++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/ChangeOriginatedInDomBrokerTest.java
@@ -44,11 +44,13 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.SettableFuture;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.SettableFuture;
 

-// FIXME: Migrate to use new Data Broker APIs
+/**
+ * FIXME: Migrate to use new Data Broker APIs
+ */

 @SuppressWarnings("deprecation")
 public class ChangeOriginatedInDomBrokerTest extends AbstractDataServiceTest {
 
 @SuppressWarnings("deprecation")
 public class ChangeOriginatedInDomBrokerTest extends AbstractDataServiceTest {
 

-    private static final Logger LOG = LoggerFactory.getLogger(ChangeOriginatedInDomBrokerTest.class);
+    protected static final Logger LOG = LoggerFactory.getLogger(ChangeOriginatedInDomBrokerTest.class);

 
     private static final QName TLL_NAME_QNAME = QName.create(TopLevelList.QNAME, "name");
     private static final QName LIST1_ATTR_STR_QNAME = QName.create(List1.QNAME, "attr-str");
 
     private static final QName TLL_NAME_QNAME = QName.create(TopLevelList.QNAME, "name");
     private static final QName LIST1_ATTR_STR_QNAME = QName.create(List1.QNAME, "attr-str");


@@ -61,7 +63,7 @@ public class ChangeOriginatedInDomBrokerTest extends AbstractDataServiceTest {
     private static final List1Key LIST1_KEY = new List1Key(LIST1_ATTR_STR);
     private static final List11Key LIST11_KEY = new List11Key(LIST11_ATTR_INT);
 
     private static final List1Key LIST1_KEY = new List1Key(LIST1_ATTR_STR);
     private static final List11Key LIST11_KEY = new List11Key(LIST11_ATTR_INT);
 

-    private final SettableFuture<DataChangeEvent<InstanceIdentifier<?>, DataObject>> modificationCapture = SettableFuture.create();
+    protected final SettableFuture<DataChangeEvent<InstanceIdentifier<?>, DataObject>> modificationCapture = SettableFuture.create();

 
     private static final Map<QName, Object> TLL_KEY_BI = Collections.<QName, Object> singletonMap(TLL_NAME_QNAME,
             TLL_NAME);
 
     private static final Map<QName, Object> TLL_KEY_BI = Collections.<QName, Object> singletonMap(TLL_NAME_QNAME,
             TLL_NAME);