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

[coverage] Update coverage agent version to 1.0.749

Browse Source 
GitOrigin-RevId: f9b506784601f2fc4863dab5819b29c593815683
This commit is contained in:
Maksim Zuev
2024-02-21 15:34:05 +01:00
committed by intellij-monorepo-bot
parent 36171164c5
commit 4361551418
9 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.idea/libraries/intellij_coverage.xml generated
View File

@@ -1,18 +1,18 @@
<component name="libraryTable">
<library name="intellij-coverage" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps:intellij-coverage-agent:1.0.744">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps:intellij-coverage-agent:1.0.749">
<verification>
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/intellij-coverage-agent/1.0.744/intellij-coverage-agent-1.0.744.jar">
<sha256sum>0a1f52150436c911842b75a5f8b713046159667f3a1abf222e5d0be722b73b0c</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/intellij-coverage-agent/1.0.749/intellij-coverage-agent-1.0.749.jar">
<sha256sum>f3165c6ed09f4929f85f5e02af74641e193b1870621877d0c739701b0e486f87</sha256sum>
</artifact>
</verification>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/intellij-coverage-agent/1.0.744/intellij-coverage-agent-1.0.744.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/intellij-coverage-agent/1.0.749/intellij-coverage-agent-1.0.749.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/intellij-coverage-agent/1.0.744/intellij-coverage-agent-1.0.744-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/intellij-coverage-agent/1.0.749/intellij-coverage-agent-1.0.749-sources.jar!/" />
</SOURCES>
</library>
</component>

10
.idea/libraries/intellij_test_discovery.xml generated
View File

@@ -1,18 +1,18 @@
<component name="libraryTable">
<library name="intellij-test-discovery" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps:intellij-test-discovery-agent:1.0.744">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps:intellij-test-discovery-agent:1.0.749">
<verification>
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/intellij-test-discovery-agent/1.0.744/intellij-test-discovery-agent-1.0.744.jar">
<sha256sum>6f6b862c476dccc7711b0e4724785fc00eb42a563aab659fca92cf63f3947be0</sha256sum>
<artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/intellij-test-discovery-agent/1.0.749/intellij-test-discovery-agent-1.0.749.jar">
<sha256sum>39e587358d3481cdf28eebe91c9f4a24b360deeddaaf86c534b0e4a231564e25</sha256sum>
</artifact>
</verification>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/intellij-test-discovery-agent/1.0.744/intellij-test-discovery-agent-1.0.744.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/intellij-test-discovery-agent/1.0.749/intellij-test-discovery-agent-1.0.749.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/intellij-test-discovery-agent/1.0.744/intellij-test-discovery-agent-1.0.744-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/intellij-test-discovery-agent/1.0.749/intellij-test-discovery-agent-1.0.749-sources.jar!/" />
</SOURCES>
</library>
</component>

2
plugins/coverage-common/src/com/intellij/coverage/CoverageSuitesBundle.java
View File

@@ -234,7 +234,7 @@ public class CoverageSuitesBundle {
boolean hasEmptyFilters = false;
Set<String> result = new HashSet<>();
for (ProjectData data : dataList) {
List<Pattern> patterns = data.getIncudePatterns();
List<Pattern> patterns = data.getIncludePatterns();
if (patterns == null || patterns.isEmpty()) {
hasEmptyFilters = true;
}

2
plugins/coverage/src/com/intellij/coverage/IDEACoverageRunner.java
View File

@@ -58,7 +58,7 @@ public final class IDEACoverageRunner extends JavaCoverageRunner {
// Do not overwrite existing patterns if present, as they are written in the format expected by IDEA,
// while the patterns passed to the agent are converted to the regex format.
if (ArrayUtil.isEmpty(javaSuite.getIncludeFilters())) {
String[] includeFilters = extractPatterns(projectData.getIncudePatterns());
String[] includeFilters = extractPatterns(projectData.getIncludePatterns());
javaSuite.setIncludeFilters(includeFilters);
}
if (ArrayUtil.isEmpty(javaSuite.getExcludePatterns())) {

2
plugins/coverage/src/com/intellij/coverage/JavaCoverageRunner.java
View File

@@ -66,7 +66,7 @@ public abstract class JavaCoverageRunner extends CoverageRunner {
final ProjectData projectData = suite.getCoverageData();
if (projectData == null) return;
IDEACoverageRunner.setExcludeAnnotations(project, projectData);
UnloadedUtil.appendUnloaded(projectData, new IdeaClassFinder(project, suite), false, suite.isBranchCoverage());
UnloadedUtil.appendUnloaded(projectData, new IdeaClassFinder(project, suite), suite.isBranchCoverage());
final long generationStartNs = System.nanoTime();
final ExportToHTMLSettings settings = ExportToHTMLSettings.getInstance(project);

2
plugins/coverage/src/com/intellij/coverage/SourceLineCounterUtil.java
View File

@@ -19,7 +19,7 @@ public final class SourceLineCounterUtil {
final String qualifiedName = ClassNameUtil.convertToFQName(reader.getClassName());
final ProjectData projectData = new ProjectData();
IDEACoverageRunner.setExcludeAnnotations(project, projectData);
UnloadedUtil.appendUnloadedClass(projectData, qualifiedName, reader, false, false);
UnloadedUtil.appendUnloadedClass(projectData, qualifiedName, reader, false);
final ClassData classData = projectData.getClassData(qualifiedName);
if (classData == null || classData.getLines() == null) return;
final LineData[] lines = (LineData[])classData.getLines();

2
plugins/coverage/src/com/intellij/coverage/analysis/PackageAnnotator.java
View File

@@ -212,7 +212,7 @@ public final class PackageAnnotator {
catch (IOException e) {
return null;
}
UnloadedUtil.appendUnloadedClass(projectData, className, new ClassReader(content), mySuite.isBranchCoverage(), false);
UnloadedUtil.appendUnloadedClass(projectData, className, new ClassReader(content), mySuite.isBranchCoverage());
return projectData.getClassData(className);
}

3
plugins/coverage/testSrc/com/intellij/coverage/ExternalCoverageTest.kt
View File

@@ -3,6 +3,7 @@ package com.intellij.coverage
import com.intellij.openapi.vfs.VirtualFileManager
import com.intellij.rt.coverage.data.LineCoverage
import com.intellij.rt.coverage.instrumentation.InstrumentationOptions
import com.intellij.rt.coverage.util.CoverageReport
import com.intellij.rt.coverage.util.ProjectDataLoader
import kotlinx.coroutines.runBlocking
@@ -30,7 +31,7 @@ class ExternalCoverageTest : CoverageIntegrationBaseTest() {
val lineData = classData.getLineData(9)
lineData.hits = 1
lineData.setStatus(LineCoverage.FULL)
CoverageReport.save(projectData, ijSuiteFile, null)
CoverageReport.save(projectData, InstrumentationOptions.Builder().setDataFile(ijSuiteFile).build())
// does not work without force refreshing
VirtualFileManager.getInstance().asyncRefresh()

11
plugins/coverage/testSrc/com/intellij/coverage/PatternsTest.kt
View File

@@ -3,6 +3,7 @@ package com.intellij.coverage
import com.intellij.openapi.util.io.FileUtil
import com.intellij.rt.coverage.data.ProjectData
import com.intellij.rt.coverage.instrumentation.InstrumentationOptions
import com.intellij.rt.coverage.util.CoverageReport
import com.intellij.testFramework.HeavyPlatformTestCase
import junit.framework.TestCase
@@ -48,11 +49,11 @@ class PatternsTest : HeavyPlatformTestCase() {
if (includes1.isNullOrEmpty() || includes2.isNullOrEmpty()) {
// include patterns are merged, as suite2 include patterns are empty
assertTrue(data.incudePatterns.isNullOrEmpty())
assertTrue(data.includePatterns.isNullOrEmpty())
}
else {
// include patterns are merged
TestCase.assertEquals((includes1.toSet() + includes2.toSet()).toList(), convertFromPatterns(data.incudePatterns))
TestCase.assertEquals((includes1.toSet() + includes2.toSet()).toList(), convertFromPatterns(data.includePatterns))
}
// exclude patterns are not merged
@@ -63,7 +64,7 @@ class PatternsTest : HeavyPlatformTestCase() {
val suite = createSuite(includes, excludes, saveToSuite)
val data = suite.getCoverageData(null)!!
if (!saveToSuite) {
TestCase.assertEquals(includes.orEmpty(), convertFromPatterns(data.incudePatterns))
TestCase.assertEquals(includes.orEmpty(), convertFromPatterns(data.includePatterns))
TestCase.assertEquals(excludes.orEmpty(), convertFromPatterns(data.excludePatterns))
}
TestCase.assertEquals(includes.orEmpty(), suite.includeFilters?.toList())
@@ -72,12 +73,12 @@ class PatternsTest : HeavyPlatformTestCase() {
private fun createSuite(includes: List<String>?, excludes: List<String>?, saveToSuite: Boolean = false): JavaCoverageSuite {
val data = ProjectData()
data.setIncludePatterns(convertPatterns(includes))
data.includePatterns = convertPatterns(includes)
data.excludePatterns = convertPatterns(excludes)
val file = FileUtil.createTempFile("coverage", ".ic")
file.deleteOnExit()
CoverageReport.save(data, file, null)
CoverageReport.save(data, InstrumentationOptions.Builder().setDataFile(file).build())
val engine = JavaCoverageEngine.getInstance()
val runner = CoverageRunner.getInstance(IDEACoverageRunner::class.java)