Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix failing test and another classpath bump #2837

Merged
merged 2 commits into from
Nov 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NOTICE.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ ASM (9.6)

* License: BSD-3-Clause

classgraph (4.8.163)
classgraph (4.8.164)

* License: MIT
* Project: https://github.com/classgraph/classgraph
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.common.types/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Require-Bundle:
org.objectweb.asm;bundle-version="[9.6.0,9.7.0)",
org.eclipse.xtend.lib,
com.google.guava;bundle-version="[32.1.2,33.0.0)"
Import-Package: io.github.classgraph;version="4.8.163",
Import-Package: io.github.classgraph;version="4.8.164",
org.apache.commons.logging;version="1.0.4";resolution:=optional,
org.apache.log4j;version="1.2.24"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.dev-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
<dependency>
<groupId>io.github.classgraph</groupId>
<artifactId>classgraph</artifactId>
<version>4.8.163</version>
<version>4.8.164</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.xtext.p2repository/category.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<bundle id="org.kohsuke.args4j.source" version="0.0.0"/>
<bundle id="org.objectweb.asm" version="9.6.0.qualifier"/>
<bundle id="org.objectweb.asm.source" version="9.6.0.qualifier"/>
<bundle id="io.github.classgraph.classgraph" version="4.8.163.qualifier"/>
<bundle id="io.github.classgraph.classgraph.source" version="4.8.163.qualifier"/>
<bundle id="io.github.classgraph.classgraph" version="4.8.164.qualifier"/>
<bundle id="io.github.classgraph.classgraph.source" version="4.8.164.qualifier"/>
<category-def name="Xtext" label="Xtext" />
</site>
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.163"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
</locations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.163"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
</locations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.163"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
</locations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.163"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
</locations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<unit id="junit-vintage-engine" version="0.0.0"/>
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.163"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
</locations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.163"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
</locations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.163"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
</locations>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.eclipse.ltk.core.refactoring.resource.RenameResourceDescriptor;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.StringExtensions;
import org.junit.Assert;
import org.junit.ComparisonFailure;
import org.junit.Test;
import org.osgi.framework.Version;

/**
* @author Christian Schneider - Initial contribution and API
Expand All @@ -34,7 +36,7 @@ public static class TestProgressMonitor extends NullProgressMonitor {
@Override
public void worked(int work) {
accumulatedWork = accumulatedWork + work;
events.add("Worked " +work + " (" + accumulatedWork + ")");
events.add("Worked " + work + " (" + accumulatedWork + ")");
}

@Override
Expand Down Expand Up @@ -80,44 +82,57 @@ public void assertLogged(List<String> expectation) {

@Test
public void testProgressReportOfRenameCommonDir() throws Exception {
String model =
"package foo.bar\n" +
"element X {\n" +
" ref X\n" +
"}\n";
String model = "package foo.bar\n" + "element X {\n" + " ref X\n" + "}\n";
IFile x = file("foo/X.fileawaretestlanguage", model);
String model2 =
"package foo\n" +
"element Y {\n" +
" ref bar.X\n" +
"}\n";
String model2 = "package foo\n" + "element Y {\n" + " ref bar.X\n" + "}\n";
IFile y = file("foo/Y.fileawaretestlanguage", model2);
ProgressReportingTest.TestProgressMonitor monitor = new ProgressReportingTest.TestProgressMonitor();
performRename(x.getParent(), "baz", monitor);
Assert.assertFalse(x.exists());
Assert.assertFalse(y.exists());
List<String> expectation = new ArrayList<>();
expectation.add("BeginTask (44)");
expectation.add("SetTaskName Checking preconditions...");
expectation.add("InternalWorked 4.0 (4.0)");
expectation.add("SetTaskName Checking preconditions...");
expectation.add("InternalWorked 22.22222222222222 (26.22222222222222)");
expectation.add("SetTaskName Preparing the refactoring...");
expectation.add("InternalWorked 1.777777777777778 (28.0)");
expectation.add("SetTaskName Preparing and applying file changes...");
expectation.add("InternalWorked 0.8355555555555556 (28.835555555555555)");
expectation.add("InternalWorked 0.8355555555555556 (29.67111111111111)");
expectation.add("InternalWorked 0.4177777777777778 (30.08888888888889)");
expectation.add("InternalWorked 0.4177777777777778 (30.506666666666668)");
expectation.add("InternalWorked 0.4177777777777778 (30.924444444444447)");
expectation.add("InternalWorked 0.4177777777777778 (31.342222222222226)");
expectation.add("SetTaskName Creating text changes...");
expectation.add("InternalWorked 2.088888888888889 (33.431111111111115)");
expectation.add("InternalWorked 0.8444444444444444 (34.275555555555556)");
expectation.add("InternalWorked 0.8355555555555556 (35.111111111111114)");
expectation.add("InternalWorked 2.2222222222222223 (37.333333333333336)");
expectation.add("InternalWorked 6.666666666666664 (44.0)");
expectation.add("Done");
if (Platform.getBundle("org.eclipse.ltk.core.refactoring").getVersion().compareTo(new Version("3.14.200")) >= 0) {
expectation.add("BeginTask (44)");
expectation.add("InternalWorked 4.0 (4.0)");
expectation.add("InternalWorked 22.2 (26.2)");
expectation.add("InternalWorked 1.76 (27.96)");
expectation.add("SetTaskName Preparing and applying file changes...");
expectation.add("InternalWorked 0.8 (28.76)");
expectation.add("InternalWorked 0.84 (29.6)");
expectation.add("InternalWorked 0.4 (30.0)");
expectation.add("InternalWorked 0.44 (30.44)");
expectation.add("InternalWorked 0.4 (30.84)");
expectation.add("InternalWorked 0.44 (31.28)");
expectation.add("SetTaskName Creating text changes...");
expectation.add("InternalWorked 2.08 (33.36)");
expectation.add("InternalWorked 0.88 (34.24)");
expectation.add("InternalWorked 0.84 (35.080000000000005)");
expectation.add("InternalWorked 8.920000000000002 (44.00000000000001)");
expectation.add("Done");
} else {
expectation.add("BeginTask (44)");
expectation.add("SetTaskName Checking preconditions...");
expectation.add("InternalWorked 4.0 (4.0)");
expectation.add("SetTaskName Checking preconditions...");
expectation.add("InternalWorked 22.22222222222222 (26.22222222222222)");
expectation.add("SetTaskName Preparing the refactoring...");
expectation.add("InternalWorked 1.777777777777778 (28.0)");
expectation.add("SetTaskName Preparing and applying file changes...");
expectation.add("InternalWorked 0.8355555555555556 (28.835555555555555)");
expectation.add("InternalWorked 0.8355555555555556 (29.67111111111111)");
expectation.add("InternalWorked 0.4177777777777778 (30.08888888888889)");
expectation.add("InternalWorked 0.4177777777777778 (30.506666666666668)");
expectation.add("InternalWorked 0.4177777777777778 (30.924444444444447)");
expectation.add("InternalWorked 0.4177777777777778 (31.342222222222226)");
expectation.add("SetTaskName Creating text changes...");
expectation.add("InternalWorked 2.088888888888889 (33.431111111111115)");
expectation.add("InternalWorked 0.8444444444444444 (34.275555555555556)");
expectation.add("InternalWorked 0.8355555555555556 (35.111111111111114)");
expectation.add("InternalWorked 2.2222222222222223 (37.333333333333336)");
expectation.add("InternalWorked 6.666666666666664 (44.0)");
expectation.add("Done");

}
monitor.assertLogged(expectation);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class TargetPlatformProject extends ProjectDescriptor {
<unit id="org.opentest4j" version="0.0.0"/>
�ENDIF�
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.163"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
</locations>
Expand Down
4 changes: 2 additions & 2 deletions xtext-latest.target
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="xtext-latest" sequenceNumber="10">
<target name="xtext-latest" sequenceNumber="11">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/nightly/latest" />
Expand Down Expand Up @@ -55,7 +55,7 @@
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.163"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202203.target
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="xtext-r202203" sequenceNumber="10">
<target name="xtext-r202203" sequenceNumber="11">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.29"/>
Expand Down Expand Up @@ -57,7 +57,7 @@
<unit id="org.aopalliance" version="1.0.0.v20230720-0728"/>
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.163"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202206.target
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="xtext-r202206" sequenceNumber="10">
<target name="xtext-r202206" sequenceNumber="11">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.30"/>
Expand Down Expand Up @@ -56,7 +56,7 @@
<unit id="org.aopalliance" version="1.0.0.v20230720-0728"/>
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.163"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202209.target
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="xtext-r202209" sequenceNumber="10">
<target name="xtext-r202209" sequenceNumber="11">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.31"/>
Expand Down Expand Up @@ -57,7 +57,7 @@
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.163"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202212.target
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="xtext-r202212" sequenceNumber="10">
<target name="xtext-r202212" sequenceNumber="11">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.32"/>
Expand Down Expand Up @@ -57,7 +57,7 @@
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.163"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202303.target
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="xtext-r202303" sequenceNumber="10">
<target name="xtext-r202303" sequenceNumber="11">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.33.0"/>
Expand Down Expand Up @@ -57,7 +57,7 @@
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.163"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202306.target
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="xtext-r202306" sequenceNumber="10">
<target name="xtext-r202306" sequenceNumber="11">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.34.0"/>
Expand Down Expand Up @@ -57,7 +57,7 @@
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.163"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
Expand Down
4 changes: 2 additions & 2 deletions xtext-r202309.target
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="xtext-r202309" sequenceNumber="10">
<target name="xtext-r202309" sequenceNumber="11">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.35.0"/>
Expand Down Expand Up @@ -57,7 +57,7 @@
<unit id="org.opentest4j" version="0.0.0"/>
<unit id="org.apiguardian.api" version="0.0.0"/>
<unit id="org.objectweb.asm" version="9.6.0"/>
<unit id="io.github.classgraph.classgraph" version="4.8.163"/>
<unit id="io.github.classgraph.classgraph" version="4.8.164"/>
<unit id="slf4j.api" version="0.0.0"/>
<unit id="slf4j.simple" version="0.0.0"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
Expand Down