Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-6370] ConcurrencyDependencyGraph#getNumberOfBuilds() does not remove finished projects from unfinished ones 

This closes #161
This commit is contained in:
Sylwester Lachiewicz 2018-03-07 23:39:56 +01:00 committed by Michael Osipov
parent 85b4e3d8e8
commit faa9ef0cd3
2 changed files with 86 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraph.java
View File

@ -45,7 +45,7 @@ public class ConcurrencyDependencyGraph
private final ProjectDependencyGraph projectDependencyGraph;
private final HashSet<MavenProject> finishedProjects = new HashSet<>();
private final Set<MavenProject> finishedProjects = new HashSet<>();
public ConcurrencyDependencyGraph( ProjectBuildList projectBuilds, ProjectDependencyGraph projectDependencyGraph )
{
@ -69,7 +69,7 @@ public List<MavenProject> getRootSchedulableBuilds()
List<MavenProject> result = new ArrayList<>();
for ( ProjectSegment projectBuild : projectBuilds )
{
if ( projectDependencyGraph.getUpstreamProjects( projectBuild.getProject(), false ).size() == 0 )
if ( projectDependencyGraph.getUpstreamProjects( projectBuild.getProject(), false ).isEmpty() )
{
result.add( projectBuild.getProject() );
}
@ -111,7 +111,7 @@ private List<MavenProject> getSchedulableNewProcesses( MavenProject finishedProj
public Set<MavenProject> getUnfinishedProjects()
{
Set<MavenProject> unfinished = new HashSet<>( projectBuilds.getProjects() );
unfinished.remove( finishedProjects );
unfinished.removeAll( finishedProjects );
return unfinished;
}

83
maven-core/src/test/java/org/apache/maven/lifecycle/internal/builder/multithreaded/ConcurrencyDependencyGraphTest.java Normal file
View File

@ -0,0 +1,83 @@
package org.apache.maven.lifecycle.internal.builder.multithreaded;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
* agreements. See the NOTICE file distributed with this work for additional information regarding
* copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
import junit.framework.TestCase;
import org.apache.maven.execution.ProjectDependencyGraph;
import org.apache.maven.lifecycle.internal.ProjectBuildList;
import org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub;
import org.apache.maven.project.MavenProject;
import java.util.List;
import java.util.Set;
public class ConcurrencyDependencyGraphTest extends TestCase {
public void testGraph() throws Exception {
ProjectBuildList projectBuildList = ProjectDependencyGraphStub.getProjectBuildList(
ProjectDependencyGraphStub.getMavenSession() );
ProjectDependencyGraph projectDependencyGraph = new ProjectDependencyGraphStub();
ConcurrencyDependencyGraph graph = new ConcurrencyDependencyGraph( projectBuildList, projectDependencyGraph );
// start
assertEquals( 0, graph.getFinishedProjects().size() );
assertEquals( 6, graph.getNumberOfBuilds() );
List<MavenProject> rootSchedulableBuilds = graph.getRootSchedulableBuilds();
// only Project.A has no dependences
assertEquals( 1, rootSchedulableBuilds.size() );
assertEquals( ProjectDependencyGraphStub.A, rootSchedulableBuilds.iterator().next() );
// double check A deps
List<MavenProject> dependenciesA = graph.getDependencies( ProjectDependencyGraphStub.A );
assertEquals( 0, dependenciesA.size() );
assertEquals( 6, graph.getUnfinishedProjects().size() );
List<MavenProject> schedulableNewProcesses = graph.markAsFinished( ProjectDependencyGraphStub.A );
// expect Project B, C
assertEquals( 2, schedulableNewProcesses.size() );
assertEquals( 1, graph.getFinishedProjects().size() );
graph.markAsFinished( ProjectDependencyGraphStub.A );
// still only A
assertEquals( 1, graph.getFinishedProjects().size() );
Set<MavenProject> unfinishedProjects = graph.getUnfinishedProjects();
assertEquals( 5, unfinishedProjects.size() );
graph.markAsFinished( schedulableNewProcesses.get( 0 ) );
assertEquals( 2, graph.getFinishedProjects().size() );
assertEquals( 4, graph.getUnfinishedProjects().size() );
List<MavenProject> dependenciesC = graph.getDependencies( ProjectDependencyGraphStub.C );
// C depends only on A
assertEquals( 1, dependenciesC.size() );
List<MavenProject> dependenciesX = graph.getDependencies( ProjectDependencyGraphStub.X );
// X depends only on B and C
assertEquals( 2, dependenciesX.size() );
List<MavenProject> activeDependenciesC = graph.getActiveDependencies( ProjectDependencyGraphStub.C );
// A already finished
assertEquals( 0, activeDependenciesC.size() );
List<MavenProject> activeDependenciesX = graph.getActiveDependencies( ProjectDependencyGraphStub.X );
// waiting for C
assertEquals( 1, activeDependenciesX.size() );
}
}