From 09d95118c64a20dfc897116121bfd751cd2e545d Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Sat, 29 Apr 2023 14:26:41 -0700 Subject: [PATCH] Added project name to custom test template --- .../java/rife/bld/extension/GeneratedVersionTest.java | 3 ++- src/test/resources/version_test.txt | 11 ++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/test/java/rife/bld/extension/GeneratedVersionTest.java b/src/test/java/rife/bld/extension/GeneratedVersionTest.java index 8974732..1a41d5e 100644 --- a/src/test/java/rife/bld/extension/GeneratedVersionTest.java +++ b/src/test/java/rife/bld/extension/GeneratedVersionTest.java @@ -71,13 +71,14 @@ class GeneratedVersionTest { gv.setTemplate(new File(gv.getProject().srcTestResourcesDirectory().getAbsolutePath(), "version_test.txt")); gv.setPackageName("com.example.my"); + gv.setProjectName("My App"); gv.setClassName("MyVersion"); var t = GeneratedVersionOperation.buildTemplate(gv); assertThat(t.getContent()).contains("package com.example.my;").contains("class MyVersion") .contains("MAJOR = 2").contains("MINOR = 1").contains("REVISION = 3").contains("QUALIFIER = \"\"") - .contains("private MyVersion"); + .contains("private MyVersion").contains("PROJECT = \"My App\""); } @Test diff --git a/src/test/resources/version_test.txt b/src/test/resources/version_test.txt index 757425b..9e4a2c3 100644 --- a/src/test/resources/version_test.txt +++ b/src/test/resources/version_test.txt @@ -1,20 +1,13 @@ package {{v packageName/}}; -import java.util.Date; - -/** - * Provides project version information. - */ public final class {{v className/}} { + public static final int PROJECT = "{{v project/}}"; public static final int MAJOR = {{v major/}}; public static final int MINOR = {{v minor/}}; public static final int REVISION = {{v revision/}}; public static final String QUALIFIER = "{{v qualifier/}}"; - /** - * Disables the default constructor. - */ private {{v className/}}() { - throw new UnsupportedOperationException("Illegal constructor call."); + // no-op } }