diff options
Diffstat (limited to 'subprojects/language/src/testFixtures/java/tools/refinery')
2 files changed, 11 insertions, 11 deletions
diff --git a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedClassDeclaration.java b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedClassDeclaration.java index a228137c..14ac7bfc 100644 --- a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedClassDeclaration.java +++ b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedClassDeclaration.java | |||
@@ -1,19 +1,19 @@ | |||
1 | /* | 1 | /* |
2 | * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/> | 2 | * SPDX-FileCopyrightText: 2021-2024 The Refinery Authors <https://refinery.tools/> |
3 | * | 3 | * |
4 | * SPDX-License-Identifier: EPL-2.0 | 4 | * SPDX-License-Identifier: EPL-2.0 |
5 | */ | 5 | */ |
6 | package tools.refinery.language.model.tests.utils; | 6 | package tools.refinery.language.model.tests.utils; |
7 | 7 | ||
8 | import tools.refinery.language.model.problem.ClassDeclaration; | 8 | import tools.refinery.language.model.problem.ClassDeclaration; |
9 | import tools.refinery.language.model.problem.FeatureDeclaration; | 9 | import tools.refinery.language.model.problem.ReferenceDeclaration; |
10 | 10 | ||
11 | public record WrappedClassDeclaration(ClassDeclaration classDeclaration) { | 11 | public record WrappedClassDeclaration(ClassDeclaration classDeclaration) { |
12 | public ClassDeclaration get() { | 12 | public ClassDeclaration get() { |
13 | return classDeclaration; | 13 | return classDeclaration; |
14 | } | 14 | } |
15 | 15 | ||
16 | public FeatureDeclaration feature(String name) { | 16 | public ReferenceDeclaration feature(String name) { |
17 | return ProblemNavigationUtil.named(classDeclaration.getFeatureDeclarations(), name); | 17 | return ProblemNavigationUtil.named(classDeclaration.getFeatureDeclarations(), name); |
18 | } | 18 | } |
19 | } | 19 | } |
diff --git a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedProblem.java b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedProblem.java index 58bfce44..b31eed6d 100644 --- a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedProblem.java +++ b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedProblem.java | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/> | 2 | * SPDX-FileCopyrightText: 2021-2024 The Refinery Authors <https://refinery.tools/> |
3 | * | 3 | * |
4 | * SPDX-License-Identifier: EPL-2.0 | 4 | * SPDX-License-Identifier: EPL-2.0 |
5 | */ | 5 | */ |
@@ -7,9 +7,9 @@ package tools.refinery.language.model.tests.utils; | |||
7 | 7 | ||
8 | import org.eclipse.emf.ecore.resource.Resource.Diagnostic; | 8 | import org.eclipse.emf.ecore.resource.Resource.Diagnostic; |
9 | import org.eclipse.emf.ecore.util.Diagnostician; | 9 | import org.eclipse.emf.ecore.util.Diagnostician; |
10 | import org.eclipse.emf.ecore.util.EcoreUtil; | ||
11 | import tools.refinery.language.library.BuiltinLibrary; | ||
10 | import tools.refinery.language.model.problem.*; | 12 | import tools.refinery.language.model.problem.*; |
11 | import tools.refinery.language.utils.BuiltinSymbols; | ||
12 | import tools.refinery.language.utils.ProblemDesugarer; | ||
13 | 13 | ||
14 | import java.util.List; | 14 | import java.util.List; |
15 | import java.util.stream.Stream; | 15 | import java.util.stream.Stream; |
@@ -32,11 +32,11 @@ public record WrappedProblem(Problem problem) { | |||
32 | } | 32 | } |
33 | 33 | ||
34 | public WrappedProblem builtin() { | 34 | public WrappedProblem builtin() { |
35 | return new WrappedProblem(new ProblemDesugarer().getBuiltinProblem(problem).orElseThrow()); | 35 | var resourceSet = problem.eResource().getResourceSet(); |
36 | } | 36 | var builtinResource = resourceSet.getResource(BuiltinLibrary.BUILTIN_LIBRARY_URI, true); |
37 | 37 | EcoreUtil.resolveAll(builtinResource); | |
38 | public BuiltinSymbols builtinSymbols() { | 38 | var builtinProblem = (Problem) builtinResource.getContents().getFirst(); |
39 | return new ProblemDesugarer().getBuiltinSymbols(problem).orElseThrow(); | 39 | return new WrappedProblem(builtinProblem); |
40 | } | 40 | } |
41 | 41 | ||
42 | public List<String> nodeNames() { | 42 | public List<String> nodeNames() { |