Skip to content

Commit 27b2a79

Browse files
committed
Refactor template property handling and update test dependencies
Replaced `fillDefaultProperties` method with direct property merging for cleaner code and removed unused imports. Updated Gradle dependencies to JUnit 5.10.0 and excluded specific test paths while enabling `useJUnitPlatform()` for improved test management.
1 parent 55f168e commit 27b2a79

File tree

2 files changed

+14
-37
lines changed

2 files changed

+14
-37
lines changed

build.gradle.kts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ repositories {
3232
}
3333

3434
dependencies {
35-
testImplementation(libs.junit)
35+
testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
36+
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
37+
38+
testImplementation("org.junit.vintage:junit-vintage-engine:5.10.0")
39+
3640
implementation("com.googlecode.json-simple:json-simple:1.1.1")
3741
implementation("org.codehaus.plexus:plexus-utils:3.4.0")
3842

@@ -128,6 +132,11 @@ tasks {
128132
publishPlugin {
129133
dependsOn(patchChangelog)
130134
}
135+
136+
test {
137+
exclude("com/magento/idea/magento2plugin/actions/**") //https://github.com/magento/magento2-phpstorm-plugin/issues/2474
138+
useJUnitPlatform()
139+
}
131140
}
132141

133142
intellijPlatformTesting {

src/main/java/com/magento/idea/magento2plugin/actions/generation/generator/util/FileFromTemplateGenerator.java

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package com.magento.idea.magento2plugin.actions.generation.generator.util;
77

8-
import com.intellij.ide.fileTemplates.DefaultTemplatePropertiesProvider;
98
import com.intellij.ide.fileTemplates.FileTemplate;
109
import com.intellij.ide.fileTemplates.FileTemplateManager;
1110
import com.intellij.lang.Language;
@@ -23,7 +22,6 @@
2322
import com.magento.idea.magento2plugin.magento.files.ModuleFileInterface;
2423
import com.magento.idea.magento2plugin.magento.packages.File;
2524
import java.io.IOException;
26-
import java.util.Iterator;
2725
import java.util.List;
2826
import java.util.Properties;
2927
import org.jetbrains.annotations.NotNull;
@@ -151,8 +149,10 @@ public PsiFile createFileFromTemplate(
151149
fileTemplate = templateManager.getInstance(project).getCodeTemplate(templateName);
152150
}
153151

154-
fillDefaultProperties(templateManager, properties, directory);
155-
final String fileTemplateText = fileTemplate.getText(properties);
152+
Properties mergedProperties = new Properties();
153+
mergedProperties.putAll(FileTemplateManager.getInstance(project).getDefaultProperties());
154+
mergedProperties.putAll(properties);
155+
final String fileTemplateText = fileTemplate.getText(mergedProperties);
156156
final PsiFile file = PsiFileFactory.getInstance(project).createFileFromText(
157157
fileName,
158158
language,
@@ -168,38 +168,6 @@ public PsiFile createFileFromTemplate(
168168
return file;
169169
}
170170

171-
/**
172-
* Fill template properties.
173-
*
174-
* @param templateManager FileTemplateManager
175-
* @param props Properties
176-
* @param directory PsiDirectory
177-
*/
178-
public void fillDefaultProperties(
179-
final @NotNull FileTemplateManager templateManager,
180-
final @NotNull Properties props,
181-
final @NotNull PsiDirectory directory
182-
) {
183-
final Properties hardCodedProperties = templateManager.getDefaultProperties();
184-
Iterator iterator = hardCodedProperties.keySet().iterator();
185-
186-
while (iterator.hasNext()) {
187-
final Object propertyKey = iterator.next();
188-
props.setProperty(
189-
(String)propertyKey,
190-
hardCodedProperties.getProperty((String)propertyKey)
191-
);
192-
}
193-
194-
iterator = DefaultTemplatePropertiesProvider.EP_NAME.getExtensionList().iterator();
195-
196-
while (iterator.hasNext()) {
197-
final DefaultTemplatePropertiesProvider provider
198-
= (DefaultTemplatePropertiesProvider)iterator.next();
199-
provider.fillProperties(directory, props);
200-
}
201-
}
202-
203171
public FileTemplateManager getTemplateManager() {
204172
return FileTemplateManager.getInstance(project);
205173
}

0 commit comments

Comments
 (0)