Sonar issues and coverage #466

Author: fugerit79

fj-doc-maven-plugin/src/main/java/org/fugerit/java/doc/project/facade/BasicVenusFacade.java

@@ -31,13 +31,13 @@ protected BasicVenusFacade() {}
 
     private static final String MIN_FJ_VERSION = "8.6.9";
 
-    private static String versionToCheck(String groupIdToCheck, String artifactIdToCheck, Model model) {
+    public static String versionToCheck(String groupIdToCheck, String artifactIdToCheck, Model model) {
         List<Dependency> dependencies = model.getDependencies();
         for (Dependency dep : dependencies) {
             if (dep.getGroupId().equals(groupIdToCheck) &&
                     dep.getArtifactId().equals(artifactIdToCheck)) {
                 String version = dep.getVersion();
-                if (version != null && version.startsWith("${") && version.endsWith("}")) {
+                if (version != null && version.startsWith("${")) {
                     String propertyKey = version.substring(2, version.length() - 1);
                     return model.getProperties().getProperty(propertyKey);
                 }
@@ -188,6 +188,10 @@ protected static void addExtensionList( File pomFile, VenusContext context ) thr
         // check fj-core
         String projectPomFjCoreVersion = versionToCheck( FJCoreMaven.FJ_CORE_GROUP_ID, FJCoreMaven.FJ_CORE_ARTIFACT_ID, model );
         Optional<String> fjCoreVersion = FJCoreMaven.getFJCoreVersion();
+        fjVersionCheck( projectPomFjCoreVersion, fjCoreVersion );
+    }
+
+    public static void fjVersionCheck(String projectPomFjCoreVersion, Optional<String> fjCoreVersion ) {
         if ( StringUtils.isNotEmpty( projectPomFjCoreVersion ) ) {
             // required version
             if ( VersionCompare.isGreaterThan( MIN_FJ_VERSION, projectPomFjCoreVersion ) ) {

fj-doc-maven-plugin/src/test/java/test/org/fugerit/java/doc/project/facade/TestAddVenusFacade.java

@@ -1,11 +1,14 @@
 package test.org.fugerit.java.doc.project.facade;
 
 import lombok.extern.slf4j.Slf4j;
+import org.apache.logging.log4j.core.util.Assert;
 import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Model;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.fugerit.java.core.cfg.ConfigRuntimeException;
 import org.fugerit.java.core.io.FileIO;
+import org.fugerit.java.core.util.mvn.FJCoreMaven;
 import org.fugerit.java.doc.maven.MojoAdd;
 import org.fugerit.java.doc.project.facade.BasicVenusFacade;
 import org.fugerit.java.doc.project.facade.VenusContext;
@@ -15,7 +18,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Optional;
 import java.util.UUID;
 
 @Slf4j
@@ -177,7 +182,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
     }
 
     @Test
-    void testMojoAddFjCoreVersion2() throws IOException, MojoExecutionException, MojoFailureException {
+    void testMojoAddFjCoreVersion2() throws IOException {
         for ( String currentConfig : Arrays.asList( "ko2-pom" ) ) {
             File projectDir = this.initConfigWorker( currentConfig );
             MojoAdd mojoAdd = new MojoAdd() {
@@ -195,8 +200,27 @@ public void execute() throws MojoExecutionException, MojoFailureException {
                     super.execute();
                 }
             };
-            Assertions.assertThrows( ConfigRuntimeException.class, () -> mojoAdd.execute() );
+            Assertions.assertThrows( ConfigRuntimeException.class, mojoAdd::execute );
         }
     }
 
+    @Test
+    void testFjVersionCheck() {
+        Model model = new Model();
+        String projectPomFjCoreVersion = BasicVenusFacade.versionToCheck( FJCoreMaven.FJ_CORE_GROUP_ID, FJCoreMaven.FJ_CORE_ARTIFACT_ID, model );
+        Assertions.assertNull( projectPomFjCoreVersion );
+        model.setDependencies( new ArrayList<>() );
+        Dependency d = new Dependency();
+        d.setGroupId( FJCoreMaven.FJ_CORE_GROUP_ID );
+        d.setArtifactId( FJCoreMaven.FJ_CORE_ARTIFACT_ID );
+        model.getDependencies().add( d );
+        projectPomFjCoreVersion = BasicVenusFacade.versionToCheck( FJCoreMaven.FJ_CORE_GROUP_ID, FJCoreMaven.FJ_CORE_ARTIFACT_ID, model );
+        Assertions.assertNull( projectPomFjCoreVersion );
+        Optional<String> fjCoreVersion = Optional.empty();
+        BasicVenusFacade.fjVersionCheck( projectPomFjCoreVersion, fjCoreVersion );
+        BasicVenusFacade.fjVersionCheck( "8.6.9", Optional.of( "8.7.0" ) );
+        BasicVenusFacade.fjVersionCheck( "8.7.1", Optional.of( "8.7.0" ) );
+        Assertions.assertNull( projectPomFjCoreVersion );
+    }
+
 }