diff --git a/tools.descartes.dni.adaptation/resources-test/scenario0B.dniap b/tools.descartes.dni.adaptation/resources-test/scenario0B.dniap index 1eb33ace4da49df88708f2b4155ec82c34bbb5c7..0ae641e3657e04762718a03de2a235e11057860c 100644 --- a/tools.descartes.dni.adaptation/resources-test/scenario0B.dniap +++ b/tools.descartes.dni.adaptation/resources-test/scenario0B.dniap @@ -6,4 +6,5 @@ </nodes> </repositories> <groups/> + <networkInfrastructure href="scenario0B.dni#_YRLUIOlEEeWVGvgYicTWCQ"/> </dnimm3ap:AdaptationPoints> diff --git a/tools.descartes.dni.adaptation/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java b/tools.descartes.dni.adaptation/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java index 9e96d2993d9691af2c57ca62cf7581fe1d568047..967e92c4b3bb18372dfa232368b37605e04b9b25 100644 --- a/tools.descartes.dni.adaptation/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java +++ b/tools.descartes.dni.adaptation/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java @@ -23,6 +23,13 @@ public class ParserTest { Assert.assertTrue(adaptationPoints.getRepositories().getNodes().size() > 0); } + @Test + public void shouldConvertFileToModelWithNetworkStructure() { + File file = new File("resources-test/scenario0B.dniap"); + AdaptationPointsImpl adaptationPoints = Parser.convertToModel(file); + Assert.assertEquals(6, adaptationPoints.getNetworkInfrastructure().getStructure().getNodes().size()); + } + @Test public void shouldConvertModelToFile() throws IOException { DNIAPFactoryImpl factory = new DNIAPFactoryImpl(); diff --git a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/tools/Parser.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/tools/Parser.java index bdff6cde66e1d2ad859c5a2f8be39e55d7f4b35e..977301090b4c42c4e0e5a14f604c8d3162b6249e 100644 --- a/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/tools/Parser.java +++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/tools/Parser.java @@ -23,7 +23,7 @@ public class Parser { resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap() .put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl()); resourceSet.getPackageRegistry().put(DNIAPPackage.eNS_URI, DNIAPPackage.eINSTANCE); - Resource resource = resourceSet.getResource(URI.createFileURI(file.getPath()), true); + Resource resource = resourceSet.getResource(URI.createFileURI(file.getAbsolutePath()), true); return (AdaptationPointsImpl) resource.getContents().get(0); } @@ -54,7 +54,7 @@ public class Parser { resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap() .put(Resource.Factory.Registry.DEFAULT_EXTENSION, new XMIResourceFactoryImpl()); resourceSet.getPackageRegistry().put(DNIAPPackage.eNS_URI, DNIAPPackage.eINSTANCE); - Resource resource = resourceSet.createResource(URI.createFileURI(file.toURI().getPath())); + Resource resource = resourceSet.createResource(URI.createFileURI(file.getAbsolutePath())); resource.getContents().add(adaptationPoints); resource.save(Collections.EMPTY_MAP); }