michael-o commented on a change in pull request #672:
URL: https://github.com/apache/maven/pull/672#discussion_r800195086
##########
File path:
maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
##########
@@ -103,9 +106,9 @@ public void testVersionlessManagedDependency()
ProjectBuildingException e = assertThrows(
ProjectBuildingException.class,
() -> getContainer().lookup(
org.apache.maven.project.ProjectBuilder.class ).build( pomFile, configuration )
);
- assertThat( e.getMessage(),
- containsString( "[ERROR] 'dependencies.dependency.version'
for org.apache.maven.its:a:jar is missing. "
- + "@ line 9, column 17" ) );
+ assertThat( e.getResults(), contains(
projectBuildingResultWithProblemMessage(
+ "'dependencies.dependency.version' for
org.apache.maven.its:a:jar is missing" ) ) );
+ assertThat( e.getResults(), contains(
projectBuildingResultWithLocation( 17, 9) ) );
Review comment:
Trailing space missing
##########
File path:
maven-core/src/test/java/org/apache/maven/project/ProjectBuildingResultWithLocationMatcher.java
##########
@@ -0,0 +1,87 @@
+package org.apache.maven.project;
+
+/*
+ * 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 org.apache.maven.model.building.ModelProblem;
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+
+import static java.util.stream.Collectors.joining;
+
+/**
+ * Hamcrest matcher to help create fluent assertions about {@link
ProjectBuildingResult} instances.
+ */
+class ProjectBuildingResultWithLocationMatcher extends
BaseMatcher<ProjectBuildingResult>
+{
+ private final int columnNumber;
+ private final int lineNumber;
+
+ ProjectBuildingResultWithLocationMatcher( int columnNumber, int lineNumber
) {
+ this.columnNumber = columnNumber;
+ this.lineNumber = lineNumber;
+ }
+
+ @Override
+ public boolean matches( Object o )
+ {
+ if ( !( o instanceof ProjectBuildingResult ) ) {
+ return false;
+ }
+
+ final ProjectBuildingResult r = (ProjectBuildingResult) o;
+
+ return r.getProblems().stream()
+ .anyMatch( p -> p.getLineNumber() == lineNumber &&
p.getColumnNumber() == columnNumber );
+ }
+
+ @Override
+ public void describeTo( Description description )
+ {
+ description.appendText("a ProjectBuildingResult with location ")
Review comment:
space
##########
File path:
maven-core/src/test/java/org/apache/maven/project/ProjectBuildingResultWithProblemMessageMatcher.java
##########
@@ -0,0 +1,81 @@
+package org.apache.maven.project;
+
+/*
+ * 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 org.apache.maven.model.building.ModelProblem;
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+
+import static java.util.stream.Collectors.joining;
+
+/**
+ * Hamcrest matcher to help create fluent assertions about {@link
ProjectBuildingResult} instances.
+ */
+class ProjectBuildingResultWithProblemMessageMatcher extends
BaseMatcher<ProjectBuildingResult>
+{
+ private final String problemMessage;
+
+ ProjectBuildingResultWithProblemMessageMatcher( String problemMessage ) {
+ this.problemMessage = problemMessage;
+ }
+
+ @Override
+ public boolean matches( Object o )
+ {
+ if ( !( o instanceof ProjectBuildingResult ) ) {
+ return false;
+ }
+
+ final ProjectBuildingResult r = (ProjectBuildingResult) o;
+
+ return r.getProblems().stream()
+ .anyMatch( p -> p.getMessage().contains( problemMessage ) );
+ }
+
+ @Override
+ public void describeTo( Description description )
+ {
+ description.appendText("a ProjectBuildingResult with message ")
Review comment:
space
##########
File path:
maven-core/src/main/java/org/apache/maven/project/ProjectBuildingException.java
##########
@@ -72,7 +67,7 @@ protected ProjectBuildingException( String projectId, String
message, File pomFi
public ProjectBuildingException( List<ProjectBuildingResult> results )
{
- super( createMessage( results ) );
+ super( "Some problems were encountered while processing the POMs" );
Review comment:
POMs? Not POM?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
