Cleaned up template builder and related tests

This commit is contained in:
Erik C. Thauvin 2024-07-04 20:35:28 -07:00
parent 81212468fd
commit c4f143ae02
Signed by: erik
GPG key ID: 776702A6A2DA330E
5 changed files with 12 additions and 8 deletions

View file

@ -66,12 +66,12 @@ public void genver() throws Exception {
.projectName("My App")
.packageName("com.example.myapp")
.className("MyAppVersion")
.classTemplate("myversion.txt")
.classTemplate("my_app_version.txt")
.execute();
}
```
```java
// myversion.txt
// my_app_version.txt
package {{v packageName/}};

View file

@ -19,7 +19,6 @@ package rife.bld.extension;
import rife.bld.BaseProject;
import rife.resources.ResourceFinderDirectories;
import rife.template.Template;
import rife.template.TemplateConfig;
import rife.template.TemplateFactory;
import rife.tools.FileUtils;
@ -61,7 +60,7 @@ public class GeneratedVersion {
Template template;
var version = project_.version();
if (template_ == null) {
template = TemplateFactory.TXT.get("version.txt");
template = TemplateFactory.TXT.get("default_generated_version");
} else {
File parent;
if (template_.getParentFile() != null) {
@ -70,8 +69,7 @@ public class GeneratedVersion {
parent = new File(template_.getAbsolutePath()).getParentFile();
}
var dirs = new ResourceFinderDirectories(parent);
template = new TemplateFactory(TemplateConfig.TXT, "txt", TemplateFactory.TXT)
.setResourceFinder(dirs).get(template_.getName());
template = TemplateFactory.TXT.setResourceFinder(dirs).get(template_.getName());
}
if (packageName_ == null) {

View file

@ -134,14 +134,20 @@ class GeneratedVersionTest {
.fromProject(PROJECT)
.directory(tmpDir.getAbsolutePath())
.extension(".java")
.classTemplate("src/test/resources/other_version_test.txt")
.classTemplate("src/test/resources/foo/version_test.txt")
.packageName("")
.className("MyVersion")
.execute();
deleteOnExit(tmpDir);
assertThat(new File(tmpDir, "MyVersion.java")).exists();
var template = new File(tmpDir, "MyVersion.java");
assertThat(template).exists();
var content = Files.readString(template.toPath());
assertThat(content).contains("class MyVersion")
.contains("PROJECT = \"MyExample\";").contains("MAJOR = 2").contains("MINOR = 1")
.contains("REVISION = 3").contains("QUALIFIER = \"\"").contains("private MyVersion");
}
@Test