Run dependency tests in project pipeline

legend-sdlc-model/src/main/java/org/finos/legend/sdlc/domain/model/project/configuration/ProjectConfiguration.java

@@ -43,6 +43,11 @@ default List<PlatformConfiguration> getPlatformConfigurations()
 
     List<MetamodelDependency> getMetamodelDependencies();
 
+    default Boolean getRunDependencyTests()
+    {
+        return null;
+    }
+
     @Deprecated
     default List<ArtifactGeneration> getArtifactGenerations()
     {

legend-sdlc-server/src/main/java/org/finos/legend/sdlc/server/domain/api/project/ProjectConfigurationUpdater.java

@@ -40,6 +40,7 @@ public class ProjectConfigurationUpdater
     private String groupId;
     private String artifactId;
     private boolean platformConfigurationsIsSet = false;
+    private Boolean runDependencyTests;
     private MutableList<PlatformConfiguration> platformConfigurations;
     private final MutableSet<ProjectDependency> projectDependenciesToAdd = Sets.mutable.empty();
     private final MutableSet<ProjectDependency> projectDependenciesToRemove = Sets.mutable.empty();
@@ -66,6 +67,12 @@ public ProjectConfigurationUpdater withProjectId(String projectId)
         return this;
     }
 
+    public ProjectConfigurationUpdater withRunDependencyTests(boolean runDependencyTests)
+    {
+        setRunDependencyTests(runDependencyTests);
+        return this;
+    }
+
     // Project type
 
     public ProjectType getProjectType()
@@ -175,6 +182,16 @@ public ProjectConfigurationUpdater withArtifactId(String artifactId)
         return this;
     }
 
+    public void setRunDependencyTests(boolean runDependencyTests)
+    {
+        this.runDependencyTests = runDependencyTests;
+    }
+
+    public boolean getRunDependencyTests()
+    {
+        return this.runDependencyTests;
+    }
+
     // Project dependencies to add
 
     public Set<ProjectDependency> getProjectDependenciesToAdd()
@@ -417,6 +434,8 @@ else if (this.projectStructureExtensionVersion != null || newProjectType == Proj
         // Artifact id
         String newArtifactId = (this.artifactId == null) ? configuration.getArtifactId() : this.artifactId;
 
+        Boolean newRunDependencyTests = (this.runDependencyTests == null) ? configuration.getRunDependencyTests() : this.runDependencyTests;
+
         // Project dependencies
         List<ProjectDependency> newProjectDependencies;
         if (this.projectDependenciesToAdd.isEmpty() && this.projectDependenciesToRemove.isEmpty())
@@ -509,6 +528,12 @@ public List<MetamodelDependency> getMetamodelDependencies()
                 return newMetamodelDependencies;
             }
 
+            @Override
+            public Boolean getRunDependencyTests()
+            {
+                return newRunDependencyTests;
+            }
+
             @Override
             public List<ArtifactGeneration> getArtifactGenerations()
             {

legend-sdlc-server/src/main/java/org/finos/legend/sdlc/server/project/SimpleProjectConfiguration.java

@@ -32,6 +32,7 @@ public class SimpleProjectConfiguration implements ProjectConfiguration
 {
     private final String projectId;
     private ProjectType projectType;
+    private Boolean runDepenedencyTests;
     private ProjectStructureVersion projectStructureVersion;
     private List<PlatformConfiguration> platformConfigurations;
     private String groupId;
@@ -40,7 +41,7 @@ public class SimpleProjectConfiguration implements ProjectConfiguration
     private List<MetamodelDependency> metamodelDependencies;
     private List<ArtifactGeneration> artifactGeneration;
 
-    private SimpleProjectConfiguration(String projectId, ProjectType projectType, ProjectStructureVersion projectStructureVersion, List<PlatformConfiguration> platformConfigurations, String groupId, String artifactId, List<ProjectDependency> projectDependencies, List<MetamodelDependency> metamodelDependencies, List<ArtifactGeneration> artifactGeneration)
+    private SimpleProjectConfiguration(String projectId, ProjectType projectType, Boolean runDependencyTests, ProjectStructureVersion projectStructureVersion, List<PlatformConfiguration> platformConfigurations, String groupId, String artifactId, List<ProjectDependency> projectDependencies, List<MetamodelDependency> metamodelDependencies, List<ArtifactGeneration> artifactGeneration)
     {
         this.projectId = projectId;
         this.projectType = projectType;
@@ -51,11 +52,12 @@ private SimpleProjectConfiguration(String projectId, ProjectType projectType, Pr
         this.projectDependencies = (projectDependencies == null) ? Collections.emptyList() : projectDependencies;
         this.metamodelDependencies = (metamodelDependencies == null) ? Collections.emptyList() : metamodelDependencies;
         this.artifactGeneration = (artifactGeneration == null) ? Collections.emptyList() : artifactGeneration;
+        this.runDepenedencyTests = runDependencyTests;
     }
 
     SimpleProjectConfiguration(ProjectConfiguration config)
     {
-        this(config.getProjectId(), config.getProjectType(), config.getProjectStructureVersion(), config.getPlatformConfigurations(), config.getGroupId(), config.getArtifactId(), config.getProjectDependencies(), config.getMetamodelDependencies(), config.getArtifactGenerations());
+        this(config.getProjectId(), config.getProjectType(), config.getRunDependencyTests(), config.getProjectStructureVersion(), config.getPlatformConfigurations(), config.getGroupId(), config.getArtifactId(), config.getProjectDependencies(), config.getMetamodelDependencies(), config.getArtifactGenerations());
     }
 
     @Override
@@ -75,6 +77,17 @@ public void setProjectType(ProjectType projectType)
         this.projectType = projectType;
     }
 
+    @Override
+    public Boolean getRunDependencyTests()
+    {
+        return this.runDepenedencyTests;
+    }
+
+    public void setRunDepenedencyTests(Boolean runDepenedencyTests)
+    {
+        this.runDepenedencyTests = runDepenedencyTests;
+    }
+
     @Override
     public ProjectStructureVersion getProjectStructureVersion()
     {
@@ -162,6 +175,7 @@ public void setArtifactGeneration(List<ArtifactGeneration> artifactGeneration)
     static SimpleProjectConfiguration newConfiguration(
             @JsonProperty("projectId") String projectId,
             @JsonProperty("projectType") ProjectType projectType,
+            @JsonProperty("runDependencyTests") Boolean runDepenedencyTests,
             @JsonProperty("projectStructureVersion") @JsonDeserialize(as = SimpleProjectStructureVersion.class) ProjectStructureVersion projectStructureVersion,
             @JsonProperty("platformConfigurations") @JsonDeserialize(contentAs = SimplePlatformConfiguration.class) List<PlatformConfiguration> platforms,
             @JsonProperty("groupId") String groupId,
@@ -170,18 +184,23 @@ static SimpleProjectConfiguration newConfiguration(
             @JsonProperty("metamodelDependencies") @JsonDeserialize(contentAs = SimpleMetamodelDependency.class) List<MetamodelDependency> metamodelDependencies,
             @Deprecated @JsonProperty("artifactGenerations") @JsonDeserialize(contentAs = SimpleArtifactGeneration.class) List<ArtifactGeneration> artifactGenerations)
     {
-        return new SimpleProjectConfiguration(projectId, projectType, projectStructureVersion, platforms, groupId, artifactId, projectDependencies, metamodelDependencies, artifactGenerations);
+        return new SimpleProjectConfiguration(projectId, projectType, runDepenedencyTests, projectStructureVersion, platforms, groupId, artifactId, projectDependencies, metamodelDependencies, artifactGenerations);
     }
 
     @Deprecated
     static SimpleProjectConfiguration newConfiguration(String projectId, ProjectStructureVersion projectStructureVersion, String groupId, String artifactId, List<ProjectDependency> projectDependencies, List<MetamodelDependency> metamodelDependencies, List<ArtifactGeneration> artifactGenerations)
     {
-        return newConfiguration(projectId, ProjectType.MANAGED, projectStructureVersion, null, groupId, artifactId, projectDependencies, metamodelDependencies, artifactGenerations);
+        return newConfiguration(projectId, ProjectType.MANAGED, null, projectStructureVersion, null, groupId, artifactId, projectDependencies, metamodelDependencies, artifactGenerations);
     }
 
     static SimpleProjectConfiguration newConfiguration(String projectId, ProjectStructureVersion projectStructureVersion, List<PlatformConfiguration> platforms, String groupId, String artifactId, List<ProjectDependency> projectDependencies, List<MetamodelDependency> metamodelDependencies, List<ArtifactGeneration> artifactGenerations)
     {
-        return newConfiguration(projectId, ProjectType.MANAGED, projectStructureVersion, platforms, groupId, artifactId, projectDependencies, metamodelDependencies, artifactGenerations);
+        return newConfiguration(projectId, ProjectType.MANAGED, null, projectStructureVersion, platforms, groupId, artifactId, projectDependencies, metamodelDependencies, artifactGenerations);
+    }
+
+    static SimpleProjectConfiguration newConfiguration(String projectId, ProjectStructureVersion projectStructureVersion, Boolean runDepenedencyTests, List<PlatformConfiguration> platforms, String groupId, String artifactId, List<ProjectDependency> projectDependencies, List<MetamodelDependency> metamodelDependencies, List<ArtifactGeneration> artifactGenerations)
+    {
+        return newConfiguration(projectId, ProjectType.MANAGED, runDepenedencyTests, projectStructureVersion, platforms, groupId, artifactId, projectDependencies, metamodelDependencies, artifactGenerations);
     }
 
     public static class SimpleProjectStructureVersion extends ProjectStructureVersion

legend-sdlc-server/src/main/java/org/finos/legend/sdlc/server/project/maven/LegendJUnitTestGenerationPluginMavenHelper.java

@@ -17,10 +17,18 @@
 import org.apache.maven.model.Dependency;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
+import java.util.Optional;
 import java.util.function.Consumer;
 
 public class LegendJUnitTestGenerationPluginMavenHelper extends AbstractLegendMavenPluginHelper
 {
+    public Boolean runDependencyTests;
+    public LegendJUnitTestGenerationPluginMavenHelper(String groupId, String artifactId, String version, Dependency generationExtensionsCollection, Boolean runDependencyTests)
+    {
+        super(groupId, artifactId, version, "generate-test-sources", "generate-junit-tests", generationExtensionsCollection);
+        this.runDependencyTests = runDependencyTests;
+    }
+
     public LegendJUnitTestGenerationPluginMavenHelper(String groupId, String artifactId, String version, Dependency generationExtensionsCollection)
     {
         super(groupId, artifactId, version, "generate-test-sources", "generate-junit-tests", generationExtensionsCollection);
@@ -34,5 +42,22 @@ protected void configurePlugin(MavenProjectStructure projectStructure, Consumer<
         {
             configConsumer.accept(MavenPluginTools.newDom("packagePrefix", groupId));
         }
+        if (this.runDependencyTests != null && this.runDependencyTests == true)
+        {
+            configConsumer.accept(MavenPluginTools.newDom("runDependencyTests", "true"));
+        }
+    }
+
+    protected void addDependencies(MavenProjectStructure projectStructure, Consumer<? super Dependency> dependencyConsumer)
+    {
+        if(this.runDependencyTests != null && this.runDependencyTests == true)
+        {
+            super.addDependencies(projectStructure, dependencyConsumer);
+            if (projectStructure instanceof MultiModuleMavenProjectStructure)
+            {
+                MultiModuleMavenProjectStructure multiModuleProjectStructure = (MultiModuleMavenProjectStructure) projectStructure;
+                dependencyConsumer.accept(multiModuleProjectStructure.getModuleWithProjectVersionDependency(multiModuleProjectStructure.getEntitiesModuleName()));
+            }
+        }
     }
 }

legend-sdlc-server/src/main/resources/META-INF/services/org.finos.legend.sdlc.server.project.ProjectStructureVersionFactory

@@ -2,3 +2,4 @@ org.finos.legend.sdlc.server.project.ProjectStructureV0Factory
 org.finos.legend.sdlc.server.project.ProjectStructureV11Factory
 org.finos.legend.sdlc.server.project.ProjectStructureV12Factory
 org.finos.legend.sdlc.server.project.ProjectStructureV13Factory
+org.finos.legend.sdlc.server.project.ProjectStructureV14Factory

legend-sdlc-server/src/test/java/org/finos/legend/sdlc/server/project/TestProjectStructureFactory.java

@@ -26,7 +26,7 @@ public class TestProjectStructureFactory
     @Test
     public void testFactoryWithV0_V11_V12_V13()
     {
-        assertFactoryWithV0(ProjectStructureFactory.newFactory(Lists.mutable.with(new ProjectStructureV0Factory(), new ProjectStructureV11Factory(), new ProjectStructureV12Factory(), new ProjectStructureV13Factory())));
+        assertFactoryWithV0(ProjectStructureFactory.newFactory(Lists.mutable.with(new ProjectStructureV0Factory(), new ProjectStructureV11Factory(), new ProjectStructureV12Factory(), new ProjectStructureV13Factory(), new ProjectStructureV14Factory())));
     }
 
     @Test
@@ -68,7 +68,7 @@ protected void assertSupportsVersions(ProjectStructureFactory factory, IntIterab
 
     private void assertFactoryWithV0(ProjectStructureFactory factory)
     {
-        assertSupportsVersions(factory, 0, 11, 12, 13);
+        assertSupportsVersions(factory, 0, 11, 12, 13, 14);
 
         ProjectStructure structure = factory.newProjectStructure(null, null);
         Assert.assertEquals(0, structure.getVersion());