Skip to content

Commit 3f478d1

Browse files
committed
Rename report recipe
1 parent 14f6ff3 commit 3f478d1

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/SpringBootUpgradeReportActionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ void verifyRenderedHtml(@TempDir Path tempDir) throws IOException {
203203
.serializeProjectContext(tempDir);
204204

205205
RecipeIntegrationTestSupport.initializeProject(tempDir, "spring-upgrade-report")
206-
.andApplyRecipe("boot-2.7-3.0-upgrade-report2");
206+
.andApplyRecipe("sbu30-report");
207207

208208
try (final WebClient webClient = new WebClient()) {
209209
webClient.getOptions().setThrowExceptionOnScriptError(false);

components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/SpringBootUpgradeReportTestSupport.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import lombok.Setter;
2020
import org.springframework.sbm.engine.context.ProjectContext;
2121
import org.springframework.sbm.engine.context.ProjectContextHolder;
22-
import org.springframework.sbm.engine.recipe.Action;
2322
import org.springframework.sbm.engine.recipe.Recipe;
2423
import org.springframework.sbm.engine.recipe.Recipes;
2524
import org.springframework.sbm.project.resource.TestProjectContext;
@@ -29,6 +28,7 @@
2928
import org.stringtemplate.v4.ST;
3029

3130
import java.nio.file.Path;
31+
import java.util.ArrayList;
3232
import java.util.List;
3333
import java.util.Map;
3434
import java.util.function.Consumer;
@@ -115,7 +115,7 @@ private void verifyDoesNotRender() {
115115
if(SectionBuilderData.class.isInstance(builderData)) {
116116
SectionBuilderData sectionBuilderData = SectionBuilderData.class.cast(builderData);
117117
withRecipes(recipes -> {
118-
Recipe recipe = recipes.getRecipeByName("boot-2.7-3.0-upgrade-report2").get();
118+
Recipe recipe = recipes.getRecipeByName("sbu30-report").get();
119119
SpringBootUpgradeReportAction action = (SpringBootUpgradeReportAction) recipe.getActions().get(0);
120120
List<SpringBootUpgradeReportSection> sections = (List<SpringBootUpgradeReportSection>) ReflectionTestUtils.getField(recipe.getActions().get(0), "sections");
121121
List<SpringBootUpgradeReportSection> matchingSections = sections
@@ -134,7 +134,7 @@ private void verifyDoesNotRender() {
134134
} else if(ReportBuilderData.class.isInstance(builderData)) {
135135
ReportBuilderData reportBuilderData = ReportBuilderData.class.cast(builderData);
136136
withRecipes(recipes -> {
137-
Recipe recipe = recipes.getRecipeByName("boot-2.7-3.0-upgrade-report2").get();
137+
Recipe recipe = recipes.getRecipeByName("sbu30-report").get();
138138
SpringBootUpgradeReportAction action = (SpringBootUpgradeReportAction) recipe.apply(reportBuilderData.getContext()).get(0);
139139
bruteForceProjectContextIntoProjectContextHolder(reportBuilderData.getContext(), action);
140140
List<SpringBootUpgradeReportSection> sections = (List<SpringBootUpgradeReportSection>) ReflectionTestUtils.getField(recipe.getActions().get(0), "sections");
@@ -159,15 +159,15 @@ private void verify(Consumer<String> assertion) {
159159
if(ReportBuilderData.class.isInstance(builderData)) {
160160
ReportBuilderData reportBuilderData = ReportBuilderData.class.cast(builderData);
161161
withRecipes(recipes -> {
162-
Recipe recipe = recipes.getRecipeByName("boot-2.7-3.0-upgrade-report2").get();
162+
Recipe recipe = recipes.getRecipeByName("sbu30-report").get();
163163
SpringBootUpgradeReportAction action = (SpringBootUpgradeReportAction) recipe.getActions().get(0);
164164
bruteForceProjectContextIntoProjectContextHolder(builderData.getContext(), action);
165165
// ReflectionTestUtils.setField(action, "upgradeReportProcessor", (SpringBootUpgradeReportFileSystemRenderer) s -> assertion.accept(s));
166166
action.apply(reportBuilderData.getContext());
167167
});
168168
} else if(SectionBuilderData.class.isInstance(builderData)) {
169169
withRecipes(recipes -> {
170-
Recipe recipe = recipes.getRecipeByName("boot-2.7-3.0-upgrade-report2").get();
170+
Recipe recipe = recipes.getRecipeByName("sbu30-report").get();
171171
SpringBootUpgradeReportAction action = (SpringBootUpgradeReportAction) recipe.getActions().get(0);
172172
bruteForceProjectContextIntoProjectContextHolder(builderData.getContext(), action);
173173
List<SpringBootUpgradeReportSection> sections = (List<SpringBootUpgradeReportSection>) ReflectionTestUtils.getField(recipe.getActions().get(0), "sections");
@@ -239,7 +239,7 @@ private String replaceRecipeButtonCodeFromExpectedOutput(SpringBootUpgradeReport
239239

240240
private void withRecipes(Consumer<Recipes> recipesConsumer) {
241241
RecipeTestSupport.testRecipe(
242-
Path.of("recipes/boot-new-report.yaml"), recipesConsumer,
242+
Path.of("recipes/27_30/report/sbu30-report.yaml"), recipesConsumer,
243243
SpringBootUpgradeReportActionDeserializer.class,
244244
SpringBootUpgradeReportFreemarkerSupport.class,
245245
SpringBootUpgradeReportFileSystemRenderer.class,

0 commit comments

Comments
 (0)