From 603e39ef97f1062f8df246801581eb1273f9b7fc Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 25 Apr 2018 10:22:38 +0200 Subject: [PATCH] fix test data, cleanup --- .../java/execution/ConfigurationsTest.java | 53 ++++++------------- .../testSrc/com/intellij/util/Assertion.java | 20 +------ 2 files changed, 18 insertions(+), 55 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/java/execution/ConfigurationsTest.java b/java/java-tests/testSrc/com/intellij/java/execution/ConfigurationsTest.java index 14dcbe7e35c3..18c16a411073 100644 --- a/java/java-tests/testSrc/com/intellij/java/execution/ConfigurationsTest.java +++ b/java/java-tests/testSrc/com/intellij/java/execution/ConfigurationsTest.java @@ -31,6 +31,7 @@ import com.intellij.openapi.roots.*; import com.intellij.openapi.ui.LabeledComponent; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.io.FileUtilRt; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.JarFileSystem; @@ -53,7 +54,9 @@ import com.intellij.util.containers.ContainerUtilRt; import junit.framework.TestCase; import org.jdom.Element; -import java.io.*; +import java.io.File; +import java.io.IOException; +import java.io.PrintStream; import java.util.*; import static org.assertj.core.api.Assertions.assertThat; @@ -141,7 +144,7 @@ public class ConfigurationsTest extends BaseConfigurationTestCase { PsiClass testA = findTestA(getModule1()); JUnitConfiguration configuration = createConfiguration(testA); JavaParameters parameters = checkCanRun(configuration); - assertEquals("[-Didea.test.cyclic.buffer.size=1048576]", parameters.getVMParametersList().toString()); + assertEquals("[-ea, -Didea.test.cyclic.buffer.size=1048576]", parameters.getVMParametersList().toString()); final SegmentedOutputStream notifications = new SegmentedOutputStream(System.out); assertTrue(JUnitStarter.checkVersion(parameters.getProgramParametersList().getArray(), new PrintStream(notifications))); @@ -194,7 +197,7 @@ public class ConfigurationsTest extends BaseConfigurationTestCase { JavaParameters parameters = checkCanRun(configuration); String filePath = ContainerUtil.find(parameters.getProgramParametersList().getArray(), value -> StringUtil.startsWithChar(value, '@') && !StringUtil.startsWith(value, "@w@")).substring(1); - List lines = readLinesFrom(new File(filePath)); + List lines = FileUtilRt.loadLines(new File(filePath)); lines.remove(0); Assertion.compareUnordered( //category, filters, classNames... @@ -320,20 +323,20 @@ public class ConfigurationsTest extends BaseConfigurationTestCase { ApplicationConfiguration applicationConfiguration = createConfiguration(findClass(module4, "Application")); JavaParameters parameters = checkCanRun(applicationConfiguration); String classPath = parameters.getClassPath().getPathsString(); - checkDoesNotContain(classPath, testOuput); - checkContains(classPath, output); + assertThat(classPath).doesNotContain(testOuput); + assertThat(classPath).contains(output); JUnitConfiguration junitConfiguration = createJUnitConfiguration(findClass(module4, "TestApplication"), TestInClassConfigurationProducer.class, new MapDataContext()); parameters = checkCanRun(junitConfiguration); classPath = parameters.getClassPath().getPathsString(); - checkContains(classPath, testOuput); - checkContains(classPath, output); + assertThat(classPath).contains(testOuput); + assertThat(classPath).contains(output); applicationConfiguration.setMainClassName(junitConfiguration.getPersistentData().getMainClassName()); classPath = checkCanRun(applicationConfiguration).getClassPath().getPathsString(); - checkContains(classPath, testOuput); - checkContains(classPath, output); + assertThat(classPath).contains(testOuput); + assertThat(classPath).contains(output); } public void testSameTestAndCommonOutput() throws ExecutionException { @@ -347,11 +350,11 @@ public class ConfigurationsTest extends BaseConfigurationTestCase { RunConfiguration configuration = createConfiguration(findClass(module, "Application")); JavaParameters javaParameters = checkCanRun(configuration); - checkContains(javaParameters.getClassPath().getPathsString(), output); + assertThat(javaParameters.getClassPath().getPathsString()).contains(output); configuration = createConfiguration(findClass(module, "TestApplication")); javaParameters = checkCanRun(configuration); - checkContains(javaParameters.getClassPath().getPathsString(), output); + assertThat(javaParameters.getClassPath().getPathsString()).contains(output); } public void testCreatingApplicationConfiguration() throws ConfigurationException { @@ -443,8 +446,8 @@ public class ConfigurationsTest extends BaseConfigurationTestCase { assertEquals(-1, classPath.indexOf(JarFileSystem.PROTOCOL_PREFIX)); assertEquals(-1, classPath.indexOf(LocalFileSystem.PROTOCOL_PREFIX)); for (int i = 0; i < 4; i++) { - checkContains(classPath, outputs[i][0]); - checkContains(classPath, outputs[i][1]); + assertThat(classPath).contains(outputs[i][0]); + assertThat(classPath).contains(outputs[i][1]); } } @@ -611,39 +614,17 @@ public class ConfigurationsTest extends BaseConfigurationTestCase { return findClass(module, "test1.TestA"); } - private static List readLinesFrom(File file) throws IOException { - if (!file.exists()) file.createNewFile(); - ArrayList result = new ArrayList<>(); - BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file))); - try { - String line; - while ((line = reader.readLine()) != null) result.add(line); - return result; - } - finally { - reader.close(); - } - } - private static List extractAllInPackageTests(JavaParameters parameters, PsiPackage psiPackage) throws IOException { String filePath = ContainerUtil.find(parameters.getProgramParametersList().getArray(), value -> StringUtil.startsWithChar(value, '@') && !StringUtil.startsWith(value, "@w@")).substring(1); - List lines = readLinesFrom(new File(filePath)); + List lines = FileUtilRt.loadLines(new File(filePath)); assertEquals(psiPackage.getQualifiedName(), lines.get(0)); //lines.remove(0); lines.remove(0); return lines; } - private static void checkContains(String string, String fragment) { - assertTrue(fragment + " in " + string, string.contains(fragment)); - } - - private static void checkDoesNotContain(String string, String fragment) { - assertFalse(fragment + " in " + string, string.contains(fragment)); - } - @Override protected void tearDown() throws Exception { myJdk = null; diff --git a/platform/util/testSrc/com/intellij/util/Assertion.java b/platform/util/testSrc/com/intellij/util/Assertion.java index 92769218229c..005c21142d00 100644 --- a/platform/util/testSrc/com/intellij/util/Assertion.java +++ b/platform/util/testSrc/com/intellij/util/Assertion.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2009 JetBrains s.r.o. - * - * 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. - */ +// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.util; @@ -280,10 +266,6 @@ public class Assertion extends Assert { containsAll(array, Arrays.asList(subArray)); } - public void compareAll(char[] expected, char[] actual) { - compareAll(asObjectArray(expected), asObjectArray(actual)); - } - private static Object[] asObjectArray(char[] chars) { Object[] array = new Object[chars.length]; for (int i = 0; i < chars.length; i++) {