MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (formatting)

Browse Source 
GitOrigin-RevId: 7f44765fa0cfbcf6664d493f7af3ad87bba6aed2
This commit is contained in:
Roman Shevchenko
2023-07-06 15:40:15 +02:00
committed by intellij-monorepo-bot
parent b2143a1ff8
commit f5a9700aa0
3 changed files with 32 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platform/build-scripts/resources/win/scripts/executable-template.bat
View File

@@ -12,6 +12,7 @@ PUSHD %IDE_BIN_DIR%
SET "IDE_BIN_DIR=%CD%"
POPD
FOR /F "delims=" %%i in ("%IDE_BIN_DIR%\..") DO SET "IDE_HOME=%%~fi"
:: ---------------------------------------------------------------------
:: Locate a JRE installation directory which will be used to run the IDE.
:: Try (in order): @@product_uc@@_JDK, @@vm_options@@.jdk, ..\jbr, JDK_HOME, JAVA_HOME.

18
platform/build-scripts/src/org/jetbrains/intellij/build/impl/TestingTasksImpl.kt
View File

@@ -1,11 +1,7 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
@file:Suppress("ReplacePutWithAssignment")
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.intellij.build.impl
import com.intellij.TestCaseLoader
import com.intellij.platform.diagnostic.telemetry.helpers.use
import com.intellij.platform.diagnostic.telemetry.helpers.useWithScope
import com.intellij.execution.CommandLineWrapperUtil
import com.intellij.openapi.util.Pair
import com.intellij.openapi.util.SystemInfoRt
@@ -13,6 +9,8 @@ import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.util.io.FileUtilRt
import com.intellij.openapi.util.io.NioFiles
import com.intellij.openapi.util.text.StringUtilRt
import com.intellij.platform.diagnostic.telemetry.helpers.use
import com.intellij.platform.diagnostic.telemetry.helpers.useWithScope
import com.intellij.util.lang.UrlClassLoader
import io.opentelemetry.api.common.AttributeKey
import kotlinx.coroutines.Dispatchers
@@ -41,6 +39,8 @@ import java.util.regex.Pattern
import java.util.stream.Stream
internal class TestingTasksImpl(private val context: CompilationContext, private val options: TestingOptions) : TestingTasks {
private val NO_TESTS_ERROR = 42
private fun loadRunConfigurations(name: String): List<JUnitRunConfigurationProperties> {
return try {
val projectHome = context.paths.projectHome
@@ -495,7 +495,7 @@ internal class TestingTasksImpl(private val context: CompilationContext, private
if (options.isEnableCausalProfiling) {
val causalProfilingOptions = CausalProfilingOptions.IMPL
systemProperties.put("intellij.build.test.patterns", causalProfilingOptions.testClass.replace(".", "\\."))
systemProperties["intellij.build.test.patterns"] = causalProfilingOptions.testClass.replace(".", "\\.")
jvmArgs.addAll(buildCausalProfilingAgentJvmArg(causalProfilingOptions))
}
@@ -590,7 +590,7 @@ internal class TestingTasksImpl(private val context: CompilationContext, private
val exitCode3 = runJUnit5Engine(systemProperties, jvmArgs, envVariables, bootstrapClasspath, null, testClasspath, qName, null)
noTests = exitCode3 == NO_TESTS_ERROR
}
noTestsInAllClasses = noTestsInAllClasses && java.lang.Boolean.TRUE == noTests
noTestsInAllClasses = noTestsInAllClasses && noTests
}
catch (e: Throwable) {
throw RuntimeException("Failed to process ${qName}", e)
@@ -639,7 +639,7 @@ internal class TestingTasksImpl(private val context: CompilationContext, private
methodName = null)
}
if (exitCode5 == NO_TESTS_ERROR && exitCode3 == NO_TESTS_ERROR &&
// bucket may be empty for run configurations with too few tests due to imperfect tests balancing
// a bucket might be empty for run configurations with too few tests due to imperfect tests balancing
numberOfBuckets < 2) {
throw RuntimeException("No tests were found in the configuration")
}
@@ -782,5 +782,3 @@ private fun publishTestDiscovery(messages: BuildMessages, file: String?) {
}
messages.buildStatus("With Discovery, {build.status.text}")
}
private const val NO_TESTS_ERROR = 42

50
plugins/junit5_rt/src/com/intellij/junit5/JUnit5TestExecutionListener.java
View File

@@ -32,6 +32,7 @@ import static com.intellij.rt.execution.TestListenerProtocol.CLASS_CONFIGURATION
public class JUnit5TestExecutionListener implements TestExecutionListener {
private static final String NO_LOCATION_HINT = "";
private static final String NO_LOCATION_HINT_VALUE = "";
private final PrintStream myPrintStream;
private TestPlan myTestPlan;
private long myCurrentTestStart;
@@ -107,9 +108,8 @@ public class JUnit5TestExecutionListener implements TestExecutionListener {
}
}
private void sendTreeUnderRoot(TestIdentifier root,
HashSet<TestIdentifier> visited) {
final String idAndName = idAndName(root);
private void sendTreeUnderRoot(TestIdentifier root, HashSet<TestIdentifier> visited) {
String idAndName = idAndName(root);
if (root.isContainer()) {
boolean skipContainer = shouldSkipContainer(root);
if (!skipContainer) myPrintStream.println("##teamcity[suiteTreeStarted" + idAndName + " " + getLocationHint(root) + "]");
@@ -128,10 +128,6 @@ public class JUnit5TestExecutionListener implements TestExecutionListener {
}
}
@Override
public void testPlanExecutionFinished(TestPlan testPlan) {
}
@Override
public void executionSkipped(TestIdentifier testIdentifier, String reason) {
executionStarted (testIdentifier);
@@ -152,8 +148,8 @@ public class JUnit5TestExecutionListener implements TestExecutionListener {
@Override
public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult testExecutionResult) {
final TestExecutionResult.Status status = testExecutionResult.getStatus();
final Throwable throwableOptional = testExecutionResult.getThrowable().orElse(null);
TestExecutionResult.Status status = testExecutionResult.getStatus();
Throwable throwableOptional = testExecutionResult.getThrowable().orElse(null);
executionFinished(testIdentifier, status, throwableOptional, null);
mySuccessful &= TestExecutionResult.Status.SUCCESSFUL == testExecutionResult.getStatus();
}
@@ -162,9 +158,8 @@ public class JUnit5TestExecutionListener implements TestExecutionListener {
TestExecutionResult.Status status,
Throwable throwableOptional,
String reason) {
final String displayName = testIdentifier.getDisplayName();
if (testIdentifier.isTest()) {
final long duration = getDuration();
long duration = getDuration();
if (status == TestExecutionResult.Status.FAILED) {
testFailure(testIdentifier, MapSerializerUtil.TEST_FAILED, throwableOptional, duration, reason, true);
}
@@ -183,7 +178,7 @@ public class JUnit5TestExecutionListener implements TestExecutionListener {
messageName = MapSerializerUtil.TEST_IGNORED;
}
if (messageName != null) {
final Set<TestIdentifier> descendants = myTestPlan != null ? myTestPlan.getDescendants(testIdentifier) : Collections.emptySet();
Set<TestIdentifier> descendants = myTestPlan != null ? myTestPlan.getDescendants(testIdentifier) : Collections.emptySet();
if (status == TestExecutionResult.Status.FAILED) {
String parentId = getParentId(testIdentifier);
String nameAndId = " name='" + CLASS_CONFIGURATION +
@@ -200,13 +195,14 @@ public class JUnit5TestExecutionListener implements TestExecutionListener {
if (!descendants.isEmpty() && myFinishCount == 0) {
for (TestIdentifier childIdentifier : descendants) {
testStarted(childIdentifier);
testFailure(childIdentifier, MapSerializerUtil.TEST_IGNORED, status == TestExecutionResult.Status.ABORTED ? throwableOptional : null, 0, reason, status == TestExecutionResult.Status.ABORTED);
Throwable throwable = status == TestExecutionResult.Status.ABORTED ? throwableOptional : null;
testFailure(childIdentifier, MapSerializerUtil.TEST_IGNORED, throwable, 0, reason, status == TestExecutionResult.Status.ABORTED);
testFinished(childIdentifier, 0);
}
myFinishCount = 0;
}
}
myPrintStream.println("##teamcity[testSuiteFinished" + idAndName(testIdentifier, displayName) + "]");
myPrintStream.println("##teamcity[testSuiteFinished" + idAndName(testIdentifier) + "]");
}
}
@@ -248,7 +244,7 @@ public class JUnit5TestExecutionListener implements TestExecutionListener {
long duration,
String reason,
boolean includeThrowable) {
final Map<String, String> attrs = new LinkedHashMap<>();
Map<String, String> attrs = new LinkedHashMap<>();
attrs.put("name", methodName);
attrs.put("id", id);
attrs.put("nodeId", id);
@@ -267,9 +263,12 @@ public class JUnit5TestExecutionListener implements TestExecutionListener {
testFailure(methodName, id, parentId, messageName, assertionError, duration, reason, true);
}
}
else if (ex instanceof AssertionFailedError && !(ex instanceof FileComparisonData) && ((AssertionFailedError)ex).isActualDefined() && ((AssertionFailedError)ex).isExpectedDefined()) {
final ValueWrapper actual = ((AssertionFailedError)ex).getActual();
final ValueWrapper expected = ((AssertionFailedError)ex).getExpected();
else if (ex instanceof AssertionFailedError &&
!(ex instanceof FileComparisonData) &&
((AssertionFailedError)ex).isActualDefined() &&
((AssertionFailedError)ex).isExpectedDefined()) {
ValueWrapper actual = ((AssertionFailedError)ex).getActual();
ValueWrapper expected = ((AssertionFailedError)ex).getExpected();
failureData = new ComparisonFailureData(expected.getStringRepresentation(), actual.getStringRepresentation());
}
else {
@@ -294,8 +293,8 @@ public class JUnit5TestExecutionListener implements TestExecutionListener {
}
protected String getTrace(Throwable ex) {
final StringWriter stringWriter = new StringWriter();
final PrintWriter writer = new PrintWriter(stringWriter);
StringWriter stringWriter = new StringWriter();
PrintWriter writer = new PrintWriter(stringWriter);
ex.printStackTrace(writer);
return stringWriter.toString();
}
@@ -317,19 +316,14 @@ public class JUnit5TestExecutionListener implements TestExecutionListener {
}
private String idAndName(TestIdentifier testIdentifier) {
return idAndName(testIdentifier, testIdentifier.getDisplayName());
}
private String idAndName(TestIdentifier testIdentifier, String displayName) {
return " id='" + escapeName(getId(testIdentifier)) +
"' name='" + escapeName(displayName) +
"' name='" + escapeName(testIdentifier.getDisplayName()) +
"' nodeId='" + escapeName(getId(testIdentifier)) +
"' parentNodeId='" + escapeName(getParentId(testIdentifier)) + "'";
}
private String getParentId(TestIdentifier testIdentifier) {
Optional<TestIdentifier> parent = myTestPlan.getParent(testIdentifier);
return parent
.map(identifier -> shouldSkipContainer(identifier) ? getParentId(identifier) : identifier.getUniqueId() + myIdSuffix)
.orElse("0");
@@ -340,7 +334,7 @@ public class JUnit5TestExecutionListener implements TestExecutionListener {
return getLocationHint(root, myTestPlan.getParent(root).orElse(null));
}
static String getLocationHint(TestIdentifier root, final TestIdentifier rootParent) {
static String getLocationHint(TestIdentifier root, TestIdentifier rootParent) {
return root.getSource()
.map(testSource -> getLocationHintValue(testSource, rootParent != null ? rootParent.getSource().orElse(null) : null))
.filter(maybeLocationHintValue -> !NO_LOCATION_HINT_VALUE.equals(maybeLocationHintValue))
@@ -352,9 +346,11 @@ public class JUnit5TestExecutionListener implements TestExecutionListener {
return root.getSource()
.map(testSource -> {
if (testSource instanceof MethodSource) {
//noinspection SpellCheckingInspection
return " metainfo='" + ((MethodSource)testSource).getMethodParameterTypes() + "'";
}
if (testSource instanceof ClassSource) {
//noinspection SpellCheckingInspection
return ((ClassSource)testSource).getPosition()
.map(position -> " metainfo='" + position.getLine() + ":" + position.getColumn() + "'")
.orElse(NO_LOCATION_HINT);