Skip to content

Commit b34d7e6

Browse files
prepared template set version conflict test
added issue to TODO adjusted test to check for only one matching template
1 parent b045ea2 commit b34d7e6

File tree

1 file changed

+4
-3
lines changed
  • cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest

1 file changed

+4
-3
lines changed

cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/ClassLoadingIT.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ public void callClassLoadingTemplateSetTest() throws Exception {
121121
* @throws Exception test fails
122122
*/
123123
@Test
124-
@Ignore
124+
@Ignore // TODO: re-enable when versions can be detected and version handling was implemented, see:
125+
// https://github.com/devonfw/cobigen/issues/1665
125126
public void callClassLoadingTemplateSetTestWithVersionConflict() throws Exception {
126127

127128
// Mocking
@@ -138,14 +139,14 @@ public void callClassLoadingTemplateSetTestWithVersionConflict() throws Exceptio
138139
// pre-processing
139140
List<TemplateTo> templates = cobigen.getMatchingTemplates(input);
140141

141-
// Execution
142142
GenerationReportTo report = cobigen.generate(input, templates.get(0), Paths.get(generationRootFolder.toURI()),
143143
false);
144144

145145
// Verification
146+
assertThat(report).isSuccessful();
147+
assertThat(templates).hasSize(1);
146148
File expectedResult = new File(testTemplateSetFileRootPath, "expected-conflicted/generated.txt");
147149
File generatedFile = new File(generationRootFolder, "generated.txt");
148-
assertThat(report).isSuccessful();
149150
assertThat(generatedFile).exists();
150151
assertThat(generatedFile).isFile().hasSameContentAs(expectedResult);
151152
}

0 commit comments

Comments
 (0)