MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Gradle tests: fix assertion of unresolved entry url

Browse Source
This commit is contained in:
Vladislav.Soroka
2017-11-22 18:11:53 +03:00
parent e58fbe99fa
commit b62c5e6d88
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleDependenciesImportingTest.java
+6 -2
View File
@@ -454,7 +454,7 @@ public class GradleDependenciesImportingTest extends GradleImportingTestCase {
assertEquals(DependencyScope.COMPILE, unresolvableEntry.getScope()); assertEquals(DependencyScope.COMPILE, unresolvableEntry.getScope());
String[] unresolvableEntryUrls = unresolvableEntry.getUrls(OrderRootType.CLASSES); String[] unresolvableEntryUrls = unresolvableEntry.getUrls(OrderRootType.CLASSES);
assertEquals(1, unresolvableEntryUrls.length); assertEquals(1, unresolvableEntryUrls.length);
assertTrue(unresolvableEntryUrls[0].contains("Could not find some:unresolvable-lib:0.1")); assertUnresolvedEntryUrl(unresolvableEntryUrls[0], "some:unresolvable-lib:0.1");
assertModuleLibDep("project_test", depName, depJar.getUrl()); assertModuleLibDep("project_test", depName, depJar.getUrl());
assertModuleLibDepScope("project_test", depName, DependencyScope.COMPILE); assertModuleLibDepScope("project_test", depName, DependencyScope.COMPILE);
@@ -484,6 +484,10 @@ public class GradleDependenciesImportingTest extends GradleImportingTestCase {
} }
} }
private static void assertUnresolvedEntryUrl(String entryUrl, String artifactNotation) {
assertTrue(entryUrl.contains("Could not find " + artifactNotation) || entryUrl.contains("Could not resolve " + artifactNotation));
}
@Test @Test
public void testSourceSetOutputDirsAsRuntimeDependencies() throws Exception { public void testSourceSetOutputDirsAsRuntimeDependencies() throws Exception {
importProject( importProject(
@@ -1243,7 +1247,7 @@ public class GradleDependenciesImportingTest extends GradleImportingTestCase {
assertModuleLibDepScope("project2_test", "Gradle: org.hamcrest:hamcrest-core:1.3", DependencyScope.COMPILE); assertModuleLibDepScope("project2_test", "Gradle: org.hamcrest:hamcrest-core:1.3", DependencyScope.COMPILE);
} }
@TargetVersions("2.0+") @TargetVersions("2.5+")
@Test @Test
public void testJavadocAndSourcesForDependencyWithMultipleArtifacts() throws Exception { public void testJavadocAndSourcesForDependencyWithMultipleArtifacts() throws Exception {
createProjectSubFile("repo/depGroup/depArtifact/1.0-SNAPSHOT/ivy-1.0-SNAPSHOT.xml", createProjectSubFile("repo/depGroup/depArtifact/1.0-SNAPSHOT/ivy-1.0-SNAPSHOT.xml",