Skip to content

Commit c5c3910

Browse files
author
Lucas Killgore
committed
Maven: fixes for legacy unit tests
1 parent 859861b commit c5c3910

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

Tests-Legacy/L0/Maven/_suite.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ describe('Maven Suite', function () {
591591
tr.run()
592592
.then(() => {
593593
assert(tr.ran('/home/bin/maven/bin/mvn -version'), 'it should have run mvn -version');
594-
assert(tr.ran('/home/bin/maven/bin/mvn -f pom.xml help:effective-pom'), 'it should have calculated the effective pom');
594+
assert(tr.ran('/home/bin/maven/bin/mvn -f pom.xml help:effective-pom /o -s settings.xml /p /t'), 'it should have calculated the effective pom');
595595
assert(tr.ran('/home/bin/maven/bin/mvn -f pom.xml -s /tmp/settings.xml /o /p /t package'), 'it should have run mvn -f pom.xml -s /tmp/settings.xml /o /p /t package std=' + tr.stdout + ' err=' + tr.stderr);
596596
assert(tr.invokedToolCount == 3, 'should have only run maven 3 times');
597597
assert(tr.resultWasSet, 'task should have set a result');

Tests-Legacy/L0/Maven/response.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@
2323
"code": 0,
2424
"stdout": "Effective POMs, after inheritance, interpolation, and profiles are applied:\r\n\r\n<!-- ====================================================================== -->\r\n<!-- -->\r\n<!-- Generated by Maven Help Plugin on 2017-06-29T09:43:41 -->\r\n<!-- See: http:\/\/maven.apache.org\/plugins\/maven-help-plugin\/ -->\r\n<!-- -->\r\n<!-- ====================================================================== -->\r\n\r\n<!-- ====================================================================== -->\r\n<!-- -->\r\n<!-- Effective POM for project -->\r\n<!-- 'com.microsoft.xplatalm:xplatalmApp:jar:1.0-SNAPSHOT' -->\r\n<!-- -->\r\n<!-- ====================================================================== -->\r\n\r\n<project xmlns=\"http:\/\/maven.apache.org\/POM\/4.0.0\" xmlns:xsi=\"http:\/\/www.w3.org\/2001\/XMLSchema-instance\" xsi:schemaLocation=\"http:\/\/maven.apache.org\/POM\/4.0.0 http:\/\/maven.apache.org\/xsd\/maven-4.0.0.xsd\">\r\n<\/project>\r\n\r\n[INFO] ------------------------------------------------------------------------\r\n[INFO] BUILD SUCCESS\r\n[INFO] ------------------------------------------------------------------------\r\n[INFO] Total time: 0.927 s\r\n[INFO] Finished at: 2017-06-29T09:43:41-04:00\r\n[INFO] Final Memory: 7M\/18M\r\n[INFO] ------------------------------------------------------------------------"
2525
},
26+
"/home/bin/maven/bin/mvn -f pom.xml help:effective-pom /o /p /t:i o /n /s": {
27+
"code": 0,
28+
"stdout": "Effective POMs, after inheritance, interpolation, and profiles are applied:\r\n\r\n<!-- ====================================================================== -->\r\n<!-- -->\r\n<!-- Generated by Maven Help Plugin on 2017-06-29T09:43:41 -->\r\n<!-- See: http:\/\/maven.apache.org\/plugins\/maven-help-plugin\/ -->\r\n<!-- -->\r\n<!-- ====================================================================== -->\r\n\r\n<!-- ====================================================================== -->\r\n<!-- -->\r\n<!-- Effective POM for project -->\r\n<!-- 'com.microsoft.xplatalm:xplatalmApp:jar:1.0-SNAPSHOT' -->\r\n<!-- -->\r\n<!-- ====================================================================== -->\r\n\r\n<project xmlns=\"http:\/\/maven.apache.org\/POM\/4.0.0\" xmlns:xsi=\"http:\/\/www.w3.org\/2001\/XMLSchema-instance\" xsi:schemaLocation=\"http:\/\/maven.apache.org\/POM\/4.0.0 http:\/\/maven.apache.org\/xsd\/maven-4.0.0.xsd\">\r\n<\/project>\r\n\r\n[INFO] ------------------------------------------------------------------------\r\n[INFO] BUILD SUCCESS\r\n[INFO] ------------------------------------------------------------------------\r\n[INFO] Total time: 0.927 s\r\n[INFO] Finished at: 2017-06-29T09:43:41-04:00\r\n[INFO] Final Memory: 7M\/18M\r\n[INFO] ------------------------------------------------------------------------"
29+
},
30+
"/home/bin/maven/bin/mvn -f pom.xml help:effective-pom /o /p /t /i /o /n /s": {
31+
"code": 0,
32+
"stdout": "Effective POMs, after inheritance, interpolation, and profiles are applied:\r\n\r\n<!-- ====================================================================== -->\r\n<!-- -->\r\n<!-- Generated by Maven Help Plugin on 2017-06-29T09:43:41 -->\r\n<!-- See: http:\/\/maven.apache.org\/plugins\/maven-help-plugin\/ -->\r\n<!-- -->\r\n<!-- ====================================================================== -->\r\n\r\n<!-- ====================================================================== -->\r\n<!-- -->\r\n<!-- Effective POM for project -->\r\n<!-- 'com.microsoft.xplatalm:xplatalmApp:jar:1.0-SNAPSHOT' -->\r\n<!-- -->\r\n<!-- ====================================================================== -->\r\n\r\n<project xmlns=\"http:\/\/maven.apache.org\/POM\/4.0.0\" xmlns:xsi=\"http:\/\/www.w3.org\/2001\/XMLSchema-instance\" xsi:schemaLocation=\"http:\/\/maven.apache.org\/POM\/4.0.0 http:\/\/maven.apache.org\/xsd\/maven-4.0.0.xsd\">\r\n<\/project>\r\n\r\n[INFO] ------------------------------------------------------------------------\r\n[INFO] BUILD SUCCESS\r\n[INFO] ------------------------------------------------------------------------\r\n[INFO] Total time: 0.927 s\r\n[INFO] Finished at: 2017-06-29T09:43:41-04:00\r\n[INFO] Final Memory: 7M\/18M\r\n[INFO] ------------------------------------------------------------------------"
33+
},
2634
"/home/bin/maven2/bin/mvn -f pom.xml help:effective-pom": {
2735
"code": 0,
2836
"stdout": "Effective POMs, after inheritance, interpolation, and profiles are applied:\r\n\r\n<!-- ====================================================================== -->\r\n<!-- -->\r\n<!-- Generated by Maven Help Plugin on 2017-06-29T09:43:41 -->\r\n<!-- See: http:\/\/maven.apache.org\/plugins\/maven-help-plugin\/ -->\r\n<!-- -->\r\n<!-- ====================================================================== -->\r\n\r\n<!-- ====================================================================== -->\r\n<!-- -->\r\n<!-- Effective POM for project -->\r\n<!-- 'com.microsoft.xplatalm:xplatalmApp:jar:1.0-SNAPSHOT' -->\r\n<!-- -->\r\n<!-- ====================================================================== -->\r\n\r\n<project xmlns=\"http:\/\/maven.apache.org\/POM\/4.0.0\" xmlns:xsi=\"http:\/\/www.w3.org\/2001\/XMLSchema-instance\" xsi:schemaLocation=\"http:\/\/maven.apache.org\/POM\/4.0.0 http:\/\/maven.apache.org\/xsd\/maven-4.0.0.xsd\">\r\n<\/project>\r\n\r\n[INFO] ------------------------------------------------------------------------\r\n[INFO] BUILD SUCCESS\r\n[INFO] ------------------------------------------------------------------------\r\n[INFO] Total time: 0.927 s\r\n[INFO] Finished at: 2017-06-29T09:43:41-04:00\r\n[INFO] Final Memory: 7M\/18M\r\n[INFO] ------------------------------------------------------------------------"

0 commit comments

Comments
 (0)