Skip to content

Commit 92aba7f

Browse files
committed
Add test to use Namespace Package as Resolution Strategy
1 parent 9176a4a commit 92aba7f

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

core/esmf-aspect-meta-model-java/src/test/java/org/eclipse/esmf/aspectmodel/resolver/NamespacePackageTest.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.io.FileInputStream;
2323
import java.io.FileNotFoundException;
2424
import java.io.IOException;
25+
import java.io.InputStream;
2526
import java.net.URI;
2627
import java.net.URISyntaxException;
2728
import java.nio.file.Path;
@@ -35,7 +36,6 @@
3536
import org.eclipse.esmf.metamodel.HasDescription;
3637
import org.eclipse.esmf.samm.KnownVersion;
3738

38-
import org.apache.commons.io.IOUtils;
3939
import org.assertj.core.api.Assertions;
4040
import org.junit.jupiter.api.Test;
4141

@@ -204,14 +204,13 @@ void testSerializeNamespacePackage() throws IOException {
204204
@Test
205205
void testNamespacePackageAsResolutionStrategy() throws IOException {
206206
final File archivePath = getPackage( "namespaces.zip" ).toFile();
207-
final FileInputStream input = new FileInputStream( archivePath );
208-
final byte[] content = IOUtils.toByteArray( input );
209-
final NamespacePackage namespacePackage = new NamespacePackage( content, archivePath.toURI() );
210-
211-
// By using the NamespacePackage as an AspectModelLoader constructor argument, it is used as a ResolutionStrategy
212-
final AspectModelLoader aspectModelLoader = new AspectModelLoader( namespacePackage );
213-
final AspectModel aspectModel = aspectModelLoader.load(
214-
AspectModelUrn.fromUrn( "urn:samm:org.eclipse.esmf.examples:1.0.0#Movement" ) );
215-
assertThat( aspectModel ).hasSingleAspectThat().hasName( "Movement" );
207+
try ( final InputStream input = new FileInputStream( archivePath ) ) {
208+
final NamespacePackage namespacePackage = new NamespacePackage( input, archivePath.toURI() );
209+
// By using the NamespacePackage as an AspectModelLoader constructor argument, it is used as a ResolutionStrategy
210+
final AspectModelLoader aspectModelLoader = new AspectModelLoader( namespacePackage );
211+
final AspectModel aspectModel = aspectModelLoader.load(
212+
AspectModelUrn.fromUrn( "urn:samm:org.eclipse.esmf.examples:1.0.0#Movement" ) );
213+
assertThat( aspectModel ).hasSingleAspectThat().hasName( "Movement" );
214+
}
216215
}
217216
}
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)