This is an automated email from the ASF dual-hosted git repository.
stephenc pushed a commit to branch mng-5668-poc
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 56a8e6e74f74eb8dcf41c0d4a90d656a7603be06
Author: Stephen Connolly <stephen.alan.conno...@gmail.com>
AuthorDate: Mon Nov 11 19:27:39 2019 +0000
[MNG-5668] Add some tests
---
.../apache/maven/lifecycle/internal/PhaseId.java | 2 +-
.../lifecycle/internal/PhaseComparatorTest.java | 42 ++++++++
.../maven/lifecycle/internal/PhaseIdTest.java | 114 +++++++++++++++++++++
3 files changed, 157 insertions(+), 1 deletion(-)
diff --git
a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseId.java
b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseId.java
index 646ac56..a225541 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseId.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/PhaseId.java
@@ -107,7 +107,7 @@ public class PhaseId
int priorityEnd = phase.lastIndexOf( ']' );
boolean havePriority;
int priority;
- if ( priorityEnd < phaseEnd + 1 )
+ if ( priorityEnd < phaseEnd + 1 || priorityEnd != phase.length() -
1 )
{
priority = 0;
havePriority = false;
diff --git
a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseComparatorTest.java
b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseComparatorTest.java
new file mode 100644
index 0000000..a6fc853
--- /dev/null
+++
b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseComparatorTest.java
@@ -0,0 +1,42 @@
+package org.apache.maven.lifecycle.internal;
+
+/*
+ * 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 java.util.Arrays;
+
+public class PhaseComparatorTest
+ extends TestCase
+{
+ public void testSmokes() throws Exception {
+ PhaseComparator comparator = new PhaseComparator( Arrays.asList(
"site", "site-deploy" ) );
+ assertTrue( comparator.compare( "site", "site-deploy" ) < 0);
+ assertTrue( comparator.compare( "site-deploy", "site" ) > 0);
+ assertTrue( comparator.compare( "site", "site" ) == 0);
+ assertTrue( comparator.compare( "site", "deploy" ) < 0);
+ assertTrue( comparator.compare( "before:site", "site" ) < 0);
+ assertTrue( comparator.compare( "after:site", "site-deploy" ) < 0);
+ assertTrue( comparator.compare( "after:site", "site" ) > 0);
+ assertTrue( comparator.compare( "site", "site[1]" ) > 0);
+ assertTrue( comparator.compare( "site", "site[-1]" ) < 0);
+ assertTrue( comparator.compare( "site[1000]", "site[500]" ) < 0);
+ }
+}
diff --git
a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseIdTest.java
b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseIdTest.java
new file mode 100644
index 0000000..9a27a82
--- /dev/null
+++
b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/PhaseIdTest.java
@@ -0,0 +1,114 @@
+package org.apache.maven.lifecycle.internal;
+
+/*
+ * 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 java.util.Arrays;
+
+public class PhaseIdTest
+ extends TestCase
+{
+ public void testStaticDefaultPhasesParse()
+ throws Exception
+ {
+ for ( String phase : Arrays.asList( "validate", "initialize",
"generate-sources", "process-sources",
+ "generate-resources",
"process-resources", "compile", "process-classes",
+ "generate-test-sources",
"process-test-sources", "generate-test-resources",
+ "process-test-resources",
"test-compile", "process-test-classes", "test",
+ "prepare-package", "package",
"pre-integration-test", "integration-test",
+ "post-integration-test", "verify",
"install", "deploy" ) )
+ {
+ assertEquals( phase, PhaseId.of( phase ).phase() );
+ assertEquals( 0, PhaseId.of( phase ).priority() );
+ assertEquals( PhaseExecutionPoint.AS, PhaseId.of( phase
).executionPoint() );
+ }
+ }
+
+ public void testStaticSitePhasesParse()
+ throws Exception
+ {
+ for ( String phase : Arrays.asList( "pre-site", "site", "post-site",
"site-deploy" ) )
+ {
+ assertEquals( phase, PhaseId.of( phase ).phase() );
+ assertEquals( 0, PhaseId.of( phase ).priority() );
+ assertEquals( PhaseExecutionPoint.AS, PhaseId.of( phase
).executionPoint() );
+ }
+ }
+
+ public void testStaticCleanPhasesParse()
+ throws Exception
+ {
+ for ( String phase : Arrays.asList( "pre-clean", "clean", "post-clean"
) )
+ {
+ assertEquals( phase, PhaseId.of( phase ).phase() );
+ assertEquals( 0, PhaseId.of( phase ).priority() );
+ assertEquals( PhaseExecutionPoint.AS, PhaseId.of( phase
).executionPoint() );
+ }
+ }
+
+ public void testDynamicPhasesParse()
+ {
+ assertEquals( "verify", PhaseId.of( "before:verify[1000]" ).phase() );
+ assertEquals( "verify", PhaseId.of( "after:verify[1000]" ).phase() );
+ assertEquals( "verify", PhaseId.of( "verify[1000]" ).phase() );
+ assertEquals( PhaseExecutionPoint.BEFORE, PhaseId.of(
"before:verify[1000]" ).executionPoint() );
+ assertEquals( PhaseExecutionPoint.AFTER, PhaseId.of(
"after:verify[1000]" ).executionPoint() );
+ assertEquals( PhaseExecutionPoint.AS, PhaseId.of( "verify[1000]"
).executionPoint() );
+ assertEquals( 1000, PhaseId.of( "before:verify[1000]" ).priority() );
+ assertEquals( 1000, PhaseId.of( "after:verify[1000]" ).priority() );
+ assertEquals( 1000, PhaseId.of( "verify[1000]" ).priority() );
+ assertEquals( -1000, PhaseId.of( "before:verify[-1000]" ).priority() );
+ assertEquals( -1000, PhaseId.of( "after:verify[-1000]" ).priority() );
+ assertEquals( -1000, PhaseId.of( "verify[-1000]" ).priority() );
+ assertEquals( "verify", PhaseId.of( "before:verify" ).phase() );
+ assertEquals( "verify", PhaseId.of( "after:verify" ).phase() );
+ assertEquals( PhaseExecutionPoint.BEFORE, PhaseId.of( "before:verify"
).executionPoint() );
+ assertEquals( PhaseExecutionPoint.AFTER, PhaseId.of( "after:verify"
).executionPoint() );
+ assertEquals( 0, PhaseId.of( "before:verify" ).priority() );
+ assertEquals( 0, PhaseId.of( "after:verify" ).priority() );
+ }
+
+ public void testInvalidPhasesParseAsUnknown()
+ {
+ for ( String phase : Arrays.asList( "pre:verify", "before-verify",
"BEFORE:verify", "verify(1000)",
+ "verify[1000", "verify(1000]",
"verify[1.0]", "verify[[1000]",
+ "verify[1000]]",
"[before]verify[1000]", "[1000]verify:before" ) )
+ {
+ assertEquals( phase, PhaseId.of( phase ).phase() );
+ assertEquals( PhaseExecutionPoint.AS, PhaseId.of( phase
).executionPoint() );
+ assertEquals( 0, PhaseId.of( phase ).priority() );
+ }
+ // a valid prefix gets extracted even if the priority fails to parse
+ for ( String phase : Arrays.asList( "before:verify[1000",
"before:verify[1.0]", "before:verify(1000]" ) )
+ {
+ assertEquals( phase.substring( 7 ), PhaseId.of( phase ).phase() );
+ assertEquals( PhaseExecutionPoint.BEFORE, PhaseId.of( phase
).executionPoint() );
+ assertEquals( 0, PhaseId.of( phase ).priority() );
+ }
+ // a valid priority gets extracted even if the prefix fails to parse
+ for ( String phase : Arrays.asList( "beFore:verify[1000]",
"before-verify[1000]", "pre:verify[1000]" ) )
+ {
+ assertEquals( phase.replace( "[1000]", "" ), PhaseId.of( phase
).phase() );
+ assertEquals( PhaseExecutionPoint.AS, PhaseId.of( phase
).executionPoint() );
+ assertEquals( 1000, PhaseId.of( phase ).priority() );
+ }
+ }
+}
