You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2022/03/11 15:32:45 UTC
[maven-integration-testing] branch MRESOLVER-247 created (now 8819a00)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a change to branch MRESOLVER-247
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git.
at 8819a00 [MRESOLVER-247] IT update for resolver behaviour change
This branch includes the following new commits:
new 8819a00 [MRESOLVER-247] IT update for resolver behaviour change
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-integration-testing] 01/01: [MRESOLVER-247] IT update for resolver behaviour change
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch MRESOLVER-247
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 8819a000d44c63e471d54958bcea70030cab023c
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Fri Mar 11 16:31:20 2022 +0100
[MRESOLVER-247] IT update for resolver behaviour change
I tried to be least intrusive here (so I left old but added
new values w/ explanation).
Once MRESOLVER-247 is merged, and maven consumes it, this IT
will fail, as maven will resolve LESS then this IT expects.
---
.../maven/it/MavenITmng5669ReadPomsOnce.java | 25 ++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
index de432d5..621c862 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5669ReadPomsOnce.java
@@ -45,6 +45,16 @@ public class MavenITmng5669ReadPomsOnce
super( "[4.0.0-alpha-1,)" );
}
+ /**
+ * "Original" resolver w/ DFS and w/o skipper: it did resolve things that were actually later unused.
+ */
+ private static final int EXPECTED_LOG_SIZE_DFS = 168;
+
+ /**
+ * "Modern" resolver w/ BDS and w/ skipper: it does not resolver unnecessary things.
+ */
+ private static final int EXPECTED_LOG_SIZE_BFS = 145;
+
public void testWithoutBuildConsumer()
throws Exception
{
@@ -74,10 +84,11 @@ public class MavenITmng5669ReadPomsOnce
break;
}
}
- assertEquals( logTxt.toString(), 168, logTxt.size() );
+ final int expectedLogSize = EXPECTED_LOG_SIZE_BFS;
+ assertEquals( logTxt.toString(), expectedLogSize, logTxt.size() );
// analyze lines. It is a Hashmap, so we can't rely on the order
- Set<String> uniqueBuildingSources = new HashSet<>( 168 );
+ Set<String> uniqueBuildingSources = new HashSet<>( expectedLogSize );
final String buildSourceKey = "org.apache.maven.model.building.source=";
final int keyLength = buildSourceKey.length();
for ( String line : logTxt )
@@ -95,7 +106,7 @@ public class MavenITmng5669ReadPomsOnce
}
uniqueBuildingSources.add( line.substring( start + keyLength, end ) );
}
- assertEquals( uniqueBuildingSources.size(), 167 /* is 168 minus superpom */ );
+ assertEquals( uniqueBuildingSources.size(), expectedLogSize - 1 /* is 168 minus superpom */ );
}
public void testWithBuildConsumer()
@@ -128,11 +139,13 @@ public class MavenITmng5669ReadPomsOnce
break;
}
}
- assertEquals( logTxt.toString(), 168 + 4 /* reactor poms are read twice: file + raw (=XMLFilters) */,
+ final int expectedLogSize = EXPECTED_LOG_SIZE_BFS;
+
+ assertEquals( logTxt.toString(), expectedLogSize + 4 /* reactor poms are read twice: file + raw (=XMLFilters) */,
logTxt.size() );
// analyze lines. It is a Hashmap, so we can't rely on the order
- Set<String> uniqueBuildingSources = new HashSet<>( 168 );
+ Set<String> uniqueBuildingSources = new HashSet<>( expectedLogSize );
final String buildSourceKey = "org.apache.maven.model.building.source=";
final int keyLength = buildSourceKey.length();
for ( String line : logTxt )
@@ -150,7 +163,7 @@ public class MavenITmng5669ReadPomsOnce
}
uniqueBuildingSources.add( line.substring( start + keyLength, end ) );
}
- assertEquals( uniqueBuildingSources.size(), 167 /* is 168 minus superpom */ );
+ assertEquals( uniqueBuildingSources.size(), expectedLogSize - 1 /* is 168 minus superpom */ );
}
}