From 30101af0ab83b5972d187a7a2514a4f5bbf30b55 Mon Sep 17 00:00:00 2001 From: Geert Bevin Date: Sun, 25 Feb 2024 12:42:24 -0500 Subject: [PATCH] Test fixes for changed dependency versions. Tweaked vscode project structures. Changed lib project to use JUnit and extend Project instead of BaseProject --- .../bld/blueprints/LibProjectBlueprint.java | 4 + .../bld/blueprints/Rife2ProjectBlueprint.java | 2 +- .../operations/AbstractCreateOperation.java | 19 +- .../templates/bld/app/vscode/launch.json | 24 -- .../templates/bld/app/vscode/settings.json | 1 + .../templates/bld/base/vscode/launch.json | 17 -- .../templates/bld/base/vscode/settings.json | 1 + .../lib/idea/runConfigurations/Run_Tests.xml | 8 +- .../templates/bld/lib/project_build.txt | 14 +- .../templates/bld/lib/project_test.txt | 19 +- .../templates/bld/lib/vscode/launch.json | 11 - .../templates/bld/lib/vscode/settings.json | 1 + .../bld/rife2_hello/vscode/launch.json | 24 -- .../bld/rife2_hello/vscode/settings.json | 1 + .../operations/TestCreateAppOperation.java | 117 ++++---- .../operations/TestCreateBaseOperation.java | 4 - .../operations/TestCreateLibOperation.java | 280 ++++++------------ .../operations/TestCreateRife2Operation.java | 117 ++++---- 18 files changed, 240 insertions(+), 424 deletions(-) delete mode 100644 src/main/resources/templates/bld/app/vscode/launch.json delete mode 100644 src/main/resources/templates/bld/base/vscode/launch.json delete mode 100644 src/main/resources/templates/bld/lib/vscode/launch.json delete mode 100644 src/main/resources/templates/bld/rife2_hello/vscode/launch.json diff --git a/src/main/java/rife/bld/blueprints/LibProjectBlueprint.java b/src/main/java/rife/bld/blueprints/LibProjectBlueprint.java index 0805cd7..5c2c872 100644 --- a/src/main/java/rife/bld/blueprints/LibProjectBlueprint.java +++ b/src/main/java/rife/bld/blueprints/LibProjectBlueprint.java @@ -13,6 +13,7 @@ import java.util.List; import static rife.bld.dependencies.Repository.MAVEN_CENTRAL; import static rife.bld.dependencies.Repository.SONATYPE_SNAPSHOTS; +import static rife.bld.dependencies.Scope.test; /** * Provides the dependency information required to create a new lib project. @@ -35,5 +36,8 @@ public class LibProjectBlueprint extends Project { downloadSources = true; repositories = List.of(MAVEN_CENTRAL, SONATYPE_SNAPSHOTS); + scope(test) + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,2))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,2))); } } \ No newline at end of file diff --git a/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java b/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java index b8259f5..4401ab4 100644 --- a/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java +++ b/src/main/java/rife/bld/blueprints/Rife2ProjectBlueprint.java @@ -40,7 +40,7 @@ public class Rife2ProjectBlueprint extends WebProject { scope(compile) .include(dependency("com.uwyn.rife2", "rife2", version(1,7,3))); scope(test) - .include(dependency("org.jsoup", "jsoup", version(1,17,3))) + .include(dependency("org.jsoup", "jsoup", version(1,17,2))) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5,10,2))) .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1,10,2))); scope(standalone) diff --git a/src/main/java/rife/bld/operations/AbstractCreateOperation.java b/src/main/java/rife/bld/operations/AbstractCreateOperation.java index ec5a23d..945f922 100644 --- a/src/main/java/rife/bld/operations/AbstractCreateOperation.java +++ b/src/main/java/rife/bld/operations/AbstractCreateOperation.java @@ -206,8 +206,12 @@ public abstract class AbstractCreateOperation - -