X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-dom-adapter%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fdom%2Fadapter%2Ftest%2FAbstractBaseDataBrokerTest.java;h=81270a9bb89fc37bdca27b15838a3a1f351ba4c7;hb=133ae0cce0740ccbe8a00d04490a934ee05faad9;hp=9f8baa54362546c1f9d5fde6aa24e42030aa024a;hpb=a97a183bfd67200e5a0c5d6c47449d464329a7a2;p=mdsal.git diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractBaseDataBrokerTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractBaseDataBrokerTest.java index 9f8baa5436..81270a9bb8 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractBaseDataBrokerTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractBaseDataBrokerTest.java @@ -12,11 +12,10 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeContext; import org.opendaylight.mdsal.dom.api.DOMDataBroker; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; public abstract class AbstractBaseDataBrokerTest extends AbstractSchemaAwareTest { - private static final int ASSERT_COMMIT_DEFAULT_TIMEOUT = 5000; private AbstractDataBrokerTestCustomizer testCustomizer; @@ -33,11 +32,12 @@ public abstract class AbstractBaseDataBrokerTest extends AbstractSchemaAwareTest } @Override - protected void setupWithSchema(final SchemaContext context) { + protected void setupWithRuntimeContext(final BindingRuntimeContext runtimeContext) { testCustomizer = createDataBrokerTestCustomizer(); dataBroker = testCustomizer.createDataBroker(); domBroker = testCustomizer.getDOMDataBroker(); - testCustomizer.updateSchema(context); + testCustomizer.updateSchema(runtimeContext); + super.setupWithRuntimeContext(runtimeContext); } public DataBroker getDataBroker() { @@ -52,7 +52,7 @@ public abstract class AbstractBaseDataBrokerTest extends AbstractSchemaAwareTest assertCommit(commit, ASSERT_COMMIT_DEFAULT_TIMEOUT); } - protected static final void assertCommit(final ListenableFuture commit, long timeoutInMS) { + protected static final void assertCommit(final ListenableFuture commit, final long timeoutInMS) { try { commit.get(timeoutInMS, TimeUnit.MILLISECONDS); } catch (InterruptedException | ExecutionException | TimeoutException e) {