import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+
import com.google.common.util.concurrent.CheckedFuture;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.MoreExecutors;
import java.io.InputStream;
import java.util.Collections;
import java.util.List;
-import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import org.junit.After;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.model.api.Module;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.opendaylight.yangtools.yang.model.api.SchemaPath;
-import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser;
-import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl;
+import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
/**
* Test case for reported bug 560
@Before
public void setUp() throws Exception {
final BindingBrokerTestFactory testFactory = new BindingBrokerTestFactory();
- testFactory.setExecutor(MoreExecutors.sameThreadExecutor());
+ testFactory.setExecutor(MoreExecutors.newDirectExecutorService());
testFactory.setStartWithParsedSchema(true);
testContext = testFactory.getTestContext();
bindingMountPointService = testContext.getBindingMountProviderService();
assertNotNull(domMountPointService);
- final YangContextParser parser = new YangParserImpl();
final InputStream moduleStream = BindingReflections.getModuleInfo(
OpendaylightTestRpcServiceService.class)
.getModuleSourceStream();
assertNotNull(moduleStream);
final List<InputStream> rpcModels = Collections.singletonList(moduleStream);
- final Set<Module> modules = parser.parseYangModelsFromStreams(rpcModels);
- final SchemaContext mountSchemaContext = parser.resolveSchemaContext(modules);
- schemaContext = mountSchemaContext;
+ schemaContext = YangParserTestUtils.parseYangStreams(rpcModels);
}
private static org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier createBITllIdentifier(
.builder().node(Top.QNAME)
.node(TopLevelList.QNAME)
.nodeWithKey(TopLevelList.QNAME, TLL_NAME_QNAME, mount)
- .toInstance();
+ .build();
}
private static InstanceIdentifier<TopLevelList> createBATllIdentifier(
final String mount) {
return InstanceIdentifier.builder(Top.class)
- .child(TopLevelList.class, new TopLevelListKey(mount)).toInstance();
+ .child(TopLevelList.class, new TopLevelListKey(mount)).build();
}
@Test
public void test() throws ExecutionException, InterruptedException {
- // FIXME: This is made to only make sure instance identifier codec
- // for path is instantiated.
+ // FIXME: This is made to only make sure instance identifier codec for path is instantiated.
domMountPointService
.createMountPoint(BI_MOUNT_ID).addService(DOMRpcService.class, new DOMRpcService() {