Skip to content

Commit f26d5b6

Browse files
committed
Tweak test coverage
1 parent e948e31 commit f26d5b6

File tree

2 files changed

+52
-1
lines changed

2 files changed

+52
-1
lines changed

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/BuildPluginFuncTest.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ class BuildPluginFuncTest extends AbstractGradleFuncTest {
160160
result.task(":forbiddenPatterns").outcome == TaskOutcome.SUCCESS
161161
result.task(":validateModule").outcome == TaskOutcome.SUCCESS
162162
result.task(":splitPackagesAudit").outcome == TaskOutcome.SUCCESS
163-
// result.task(":validateElasticPom").outcome == TaskOutcome.SUCCESS
164163
// disabled but check for being on the task graph
165164
result.task(":forbiddenApisMain").outcome == TaskOutcome.SKIPPED
166165
result.task(":checkstyleMain").outcome == TaskOutcome.SKIPPED

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/PublishPluginFuncTest.groovy

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,15 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
4646
version = '1.0'
4747
"""
4848

49+
subProject(":libs:some-private-lib") << """
50+
plugins {
51+
id 'elasticsearch.java'
52+
}
53+
54+
group = 'org.acme.xpack'
55+
version = '1.0'
56+
"""
57+
4958
buildFile << """
5059
plugins {
5160
id 'com.gradleup.nmcp.aggregation'
@@ -129,6 +138,49 @@ class PublishPluginFuncTest extends AbstractGradleFuncTest {
129138
"org/acme/xpack/some-other-lib/1.0/some-other-lib-1.0.pom.sha512"
130139
]
131140

141+
assertXmlEquals(zip.file("org/acme/some-public-lib/1.0/some-public-lib-1.0.pom").read(),"""
142+
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
143+
<!-- This module was also published with a richer model, Gradle metadata, -->
144+
<!-- which should be used instead. Do not delete the following line which -->
145+
<!-- is to indicate to Gradle or any Gradle module metadata file consumer -->
146+
<!-- that they should prefer consuming it instead. -->
147+
<!-- do_not_remove: published-with-gradle-metadata -->
148+
<modelVersion>4.0.0</modelVersion>
149+
<groupId>org.acme</groupId>
150+
<artifactId>some-public-lib</artifactId>
151+
<version>1.0</version>
152+
<name>some-public-lib</name>
153+
<description/>
154+
<url>unknown</url>
155+
<scm>
156+
<url>unknown</url>
157+
</scm>
158+
<inceptionYear>2009</inceptionYear>
159+
<licenses>
160+
<license>
161+
<name>Elastic License 2.0</name>
162+
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/ELASTIC-LICENSE-2.0.txt</url>
163+
<distribution>repo</distribution>
164+
</license>
165+
<license>
166+
<name>GNU Affero General Public License Version 3</name>
167+
<url>https://raw.githubusercontent.com/elastic/elasticsearch/v1.0/licenses/AGPL-3.0+SSPL-1.0+ELASTIC-LICENSE-2.0.txt</url>
168+
<distribution>repo</distribution>
169+
</license>
170+
<license>
171+
<name>Server Side Public License, v 1</name>
172+
<url>https://www.mongodb.com/licensing/server-side-public-license</url>
173+
<distribution>repo</distribution>
174+
</license>
175+
</licenses>
176+
<developers>
177+
<developer>
178+
<name>Elastic</name>
179+
<url>https://www.elastic.co</url>
180+
</developer>
181+
</developers>
182+
</project>
183+
""")
132184
assertXmlEquals(zip.file("org/acme/xpack/some-other-lib/1.0/some-other-lib-1.0.pom").read(),"""
133185
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
134186
<!-- This module was also published with a richer model, Gradle metadata, -->

0 commit comments

Comments
 (0)