Merge pull request #25006 Split tests into maven and ivy

- Fixes gradle/gradle-private#3848 Co-authored-by: Reinhold Degenfellner <rdegenfellner@gradle.com>
gradle · May 5, 2023 · fba6deb · fba6deb
2 parents 6560cc9 + f61e371
commit fba6deb
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 1 deletion.
diff --git a/...ndencyMetadataRulesIntegrationTest.groovy → ...ndencyMetadataRulesIntegrationTest.groovy b/...ndencyMetadataRulesIntegrationTest.groovy → ...ndencyMetadataRulesIntegrationTest.groovy
@@ -22,7 +22,7 @@ import org.gradle.test.fixtures.maven.MavenFileRepository
 
 import static org.gradle.util.internal.GUtil.toCamelCase
 
-class DependencyMetadataRulesIntegrationTest extends AbstractModuleDependencyResolveTest {
+abstract class AbstractDependencyMetadataRulesIntegrationTest extends AbstractModuleDependencyResolveTest {
     @Override
     String getTestConfiguration() { variantToTest }
 

diff --git a/...oovy/org/gradle/integtests/resolve/rules/DependencyMetadataRulesIvyIntegrationTest.groovy b/...oovy/org/gradle/integtests/resolve/rules/DependencyMetadataRulesIvyIntegrationTest.groovy
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2023 the original author or authors.
+ *
+ * Licensed 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.
+ */
+
+package org.gradle.integtests.resolve.rules
+
+import org.gradle.integtests.fixtures.GradleMetadataResolveRunner
+import org.gradle.integtests.fixtures.RequiredFeature
+
+@RequiredFeature(feature = GradleMetadataResolveRunner.REPOSITORY_TYPE, value = "ivy")
+class DependencyMetadataRulesIvyIntegrationTest extends AbstractDependencyMetadataRulesIntegrationTest {
+}
diff --git a/...vy/org/gradle/integtests/resolve/rules/DependencyMetadataRulesMavenIntegrationTest.groovy b/...vy/org/gradle/integtests/resolve/rules/DependencyMetadataRulesMavenIntegrationTest.groovy
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2023 the original author or authors.
+ *
+ * Licensed 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.
+ */
+
+package org.gradle.integtests.resolve.rules
+
+import org.gradle.integtests.fixtures.GradleMetadataResolveRunner
+import org.gradle.integtests.fixtures.RequiredFeature
+
+@RequiredFeature(feature = GradleMetadataResolveRunner.REPOSITORY_TYPE, value = "maven")
+class DependencyMetadataRulesMavenIntegrationTest extends AbstractDependencyMetadataRulesIntegrationTest{
+}