azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tests compilation in 201

Browse Source
This commit is contained in:
Andrey Uskov
2020-04-27 10:00:32 +03:00
parent 11390d9de3
commit b51649dcc6
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/ArtifactsTestUtil.java
+8 -8
View File
@@ -26,7 +26,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.jar.Attributes; import java.util.jar.Attributes;
import java.util.jar.Manifest; import java.util.jar.Manifest;
import static org.assertj.core.api.Assertions.*; import static org.junit.Assert.*;
public class ArtifactsTestUtil { public class ArtifactsTestUtil {
public static String printToString(PackagingElement element, int level) { public static String printToString(PackagingElement element, int level) {
@@ -50,7 +50,7 @@ public class ArtifactsTestUtil {
} }
public static void assertLayout(PackagingElement element, String expected) { public static void assertLayout(PackagingElement element, String expected) {
assertThat(printToString(element, 0)).isEqualTo(adjustMultiLine(expected)); assertEquals(adjustMultiLine(expected), printToString(element, 0));
} }
private static String adjustMultiLine(String expected) { private static String adjustMultiLine(String expected) {
@@ -75,11 +75,11 @@ public class ArtifactsTestUtil {
} }
public static void assertOutputPath(Project project, String artifactName, String expected) { public static void assertOutputPath(Project project, String artifactName, String expected) {
assertThat(findArtifact(project, artifactName).getOutputPath()).isEqualTo(expected); assertEquals(expected, findArtifact(project, artifactName).getOutputPath());
} }
public static void assertOutputFileName(Project project, String artifactName, String expected) { public static void assertOutputFileName(Project project, String artifactName, String expected) {
assertThat(findArtifact(project, artifactName).getRootElement().getName()).isEqualTo(expected); assertEquals(expected, findArtifact(project, artifactName).getRootElement().getName());
} }
public static void setOutput(final Project project, final String artifactName, final String outputPath) { public static void setOutput(final Project project, final String artifactName, final String outputPath) {
@@ -102,7 +102,7 @@ public class ArtifactsTestUtil {
public static Artifact findArtifact(Project project, String artifactName) { public static Artifact findArtifact(Project project, String artifactName) {
final ArtifactManager manager = ArtifactManager.getInstance(project); final ArtifactManager manager = ArtifactManager.getInstance(project);
final Artifact artifact = manager.findArtifact(artifactName); final Artifact artifact = manager.findArtifact(artifactName);
assertThat(artifact).describedAs("'" + artifactName + "' artifact not found").isNotNull(); assertNotNull("\"'\" + artifactName + \"' artifact not found\"", artifact);
return artifact; return artifact;
} }
@@ -117,10 +117,10 @@ public class ArtifactsTestUtil {
ArtifactType type, ArtifactType type,
@Nullable String mainClass, @Nullable String classpath) { @Nullable String mainClass, @Nullable String classpath) {
final VirtualFile file = ManifestFileUtil.findManifestFile(rootElement, context, type); final VirtualFile file = ManifestFileUtil.findManifestFile(rootElement, context, type);
assertThat(file).isNotNull(); assertNotNull(file);
final Manifest manifest = ManifestFileUtil.readManifest(file); final Manifest manifest = ManifestFileUtil.readManifest(file);
assertThat(manifest.getMainAttributes().getValue(Attributes.Name.MAIN_CLASS)).isEqualTo(mainClass); assertEquals(mainClass, manifest.getMainAttributes().getValue(Attributes.Name.MAIN_CLASS));
assertThat(manifest.getMainAttributes().getValue(Attributes.Name.CLASS_PATH)).isEqualTo(classpath); assertEquals(classpath, manifest.getMainAttributes().getValue(Attributes.Name.CLASS_PATH));
} }
} }