Revert "Add support for keyed entries"

[mdsal.git] / binding / mdsal-binding-dom-adapter / src / test / java / org / opendaylight / mdsal / binding / dom / adapter / query / QueryBuilderTest.java

diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/query/QueryBuilderTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/query/QueryBuilderTest.java
index 983929fcfb6f3fffb39eb6765413bfc68c4a879b..d9b8d78623a67ac301712db2eeeeeed45b070762 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/query/QueryBuilderTest.java
+++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/query/QueryBuilderTest.java
@@ -21,6 +21,7 @@ import org.opendaylight.mdsal.binding.api.query.QueryExpression;
 import org.opendaylight.mdsal.binding.api.query.QueryFactory;
 import org.opendaylight.mdsal.binding.api.query.QueryResult;
 import org.opendaylight.mdsal.binding.api.query.QueryResult.Item;
+import org.opendaylight.mdsal.binding.api.query.QueryStructureException;
 import org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry;
 import org.opendaylight.mdsal.binding.generator.impl.GeneratedClassLoadingStrategy;
 import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext;
@@ -30,7 +31,6 @@ import org.opendaylight.yang.gen.v1.mdsal.query.norev.Foo;
 import org.opendaylight.yang.gen.v1.mdsal.query.norev.FooBuilder;
 import org.opendaylight.yang.gen.v1.mdsal.query.norev.first.grp.System;
 import org.opendaylight.yang.gen.v1.mdsal.query.norev.first.grp.SystemBuilder;
-import org.opendaylight.yang.gen.v1.mdsal.query.norev.first.grp.SystemKey;
 import org.opendaylight.yang.gen.v1.mdsal.query.norev.second.grp.Alarms;
 import org.opendaylight.yang.gen.v1.mdsal.query.norev.second.grp.AlarmsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.Top;
@@ -102,7 +102,7 @@ public class QueryBuilderTest {
     }
 
     @Test
-    public void bar() {
+    public void bar() throws QueryStructureException {
         final Stopwatch sw = Stopwatch.createStarted();
         final QueryExpression<TopLevelList> query = factory.querySubtree(InstanceIdentifier.create(Top.class))
                 .extractChild(TopLevelList.class)
@@ -117,7 +117,7 @@ public class QueryBuilderTest {
     }
 
     @Test
-    public void testFindCriticalAlarms() {
+    public void testFindCriticalAlarms() throws QueryStructureException {
         final Stopwatch sw = Stopwatch.createStarted();
         final QueryExpression<Alarms> query = factory.querySubtree(InstanceIdentifier.create(Foo.class))
             .extractChild(System.class)
@@ -132,7 +132,7 @@ public class QueryBuilderTest {
     }
 
     @Test
-    public void testFindNonCriticalAlarms() {
+    public void testFindNonCriticalAlarms() throws QueryStructureException {
         final Stopwatch sw = Stopwatch.createStarted();
         final QueryExpression<Alarms> query = factory.querySubtree(InstanceIdentifier.create(Foo.class))
             .extractChild(System.class)
@@ -147,7 +147,7 @@ public class QueryBuilderTest {
     }
 
     @Test
-    public void testFindZeroAlarms() {
+    public void testFindZeroAlarms() throws QueryStructureException {
         final Stopwatch sw = Stopwatch.createStarted();
         final QueryExpression<Alarms> query = factory.querySubtree(InstanceIdentifier.create(Foo.class))
             .extractChild(System.class)
@@ -161,37 +161,6 @@ public class QueryBuilderTest {
         assertEquals(2, items.size());
     }
 
-    @Test
-    public void testFindSystemFirstAlarmOne() {
-        final Stopwatch sw = Stopwatch.createStarted();
-        final QueryExpression<Alarms> query = factory.querySubtree(InstanceIdentifier.create(Foo.class))
-            .extractChild(System.class, new SystemKey("first"))
-            .extractChild(Alarms.class)
-                .matching()
-                    .leaf(Alarms::getId).valueEquals(Uint64.ZERO)
-                .build();
-        LOG.info("Query built in {}", sw);
-
-        final List<? extends Item<@NonNull Alarms>> items = execute(query).getItems();
-        assertEquals(1, items.size());
-    }
-
-    @Test
-    public void testFindSystemFirstWithAlarmOne() {
-        final Stopwatch sw = Stopwatch.createStarted();
-        final QueryExpression<System> query = factory.querySubtree(InstanceIdentifier.create(Foo.class))
-            .extractChild(System.class, new SystemKey("first"))
-                .matching()
-                    .childObject(Alarms.class)
-                        .leaf(Alarms::getId).valueEquals(Uint64.ZERO)
-                .build();
-        LOG.info("Query built in {}", sw);
-
-        final List<? extends Item<@NonNull System>> items = execute(query).getItems();
-        assertEquals(1, items.size());
-    }
-
-
     private <T extends @NonNull DataObject> QueryResult<T> execute(final QueryExpression<T> query) {
         final Stopwatch sw = Stopwatch.createStarted();
         final QueryResult<T> result = executor.executeQuery(query);