Skip to content

Commit

Permalink
Run tests against javac bits
Browse files Browse the repository at this point in the history
Signed-off-by: Fred Bricon <fbricon@gmail.com>
  • Loading branch information
fbricon committed May 30, 2024
1 parent 0e43e3b commit 10c9501
Show file tree
Hide file tree
Showing 52 changed files with 111 additions and 7 deletions.
3 changes: 2 additions & 1 deletion org.eclipse.jdt.ls.target/org.eclipse.jdt.ls.tp.target
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jdt.core.compiler.batch" version="0.0.0"/>
<unit id="org.eclipse.jdt.core" version="0.0.0"/>
<unit id="org.eclipse.jdt.core.javac" version="0.0.0"/>
<unit id="org.eclipse.jdt.apt.core" version="0.0.0"/>
<repository location="https://download.eclipse.org/jdtls/jdt-core-incubator/snapshots/"/>
<repository location="https://ci.eclipse.org/ls/job/jdt-core-incubator/job/dom-with-javac/lastSuccessfulBuild/artifact/repository/target/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.xbase.lib" version="0.0.0"/>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.jdt.ls.tests/.classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-22"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/">
<attributes>
Expand Down
6 changes: 3 additions & 3 deletions org.eclipse.jdt.ls.tests/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.codegen.targetPlatform=22
org.eclipse.jdt.core.compiler.compliance=22
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
org.eclipse.jdt.core.compiler.source=22
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
Expand Down
6 changes: 4 additions & 2 deletions org.eclipse.jdt.ls.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.jdt.ls.tests;singleton:=true
Bundle-Version: 1.36.0.qualifier
Export-Package: org.eclipse.jdt.ls.core.internal;x-friends:="org.eclipse.jdt.ls.tests.syntaxserver"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Import-Package: org.osgi.framework;version="1.3.0"
Bundle-RequiredExecutionEnvironment: JavaSE-22
Import-Package: org.osgi.framework;version="1.3.0",
org.eclipse.jdt.internal.javac,
org.eclipse.jdt.internal.javac.dom
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.jdt.ls.core,
Expand Down
11 changes: 11 additions & 0 deletions org.eclipse.jdt.ls.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,17 @@
</artifactItems>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-toolchains-plugin</artifactId>
<configuration>
<toolchains>
<jdk>
<id>JavaSE-22</id>
</jdk>
</toolchains>
</configuration>
</plugin>
</plugins>
</build>
</profile>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","main",["~#set",[["^ ","~:flags",["^2",["~:method","~:public","~:static"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","Bar",["~#set",[["^ ","~:flags",["^1",["~:method","~:public"]]]]],"somethingFromLombok",["^1",[["^ ","^2",["^1",["^3","^4"]]]]],"somethingFromJPAModelGen",["^1",[["^ ","^2",["^1",["^3","^4"]]]]],"somethingElseFromLombok",["^1",[["^ ","^2",["^1",["^3","^4"]]]]],"foo",["^1",[["^ ","^2",["^1",["^3","^4"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","main",["~#set",[["^ ","~:flags",["^2",["~:method","~:public","~:static"]]]]],"foo",["^2",[["^ ","^3",["^2",["^4","^5"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","main",["~#set",[["^ ","~:flags",["^2",["~:method","~:public","~:static"]]]]],"foo",["^2",[["^ ","^3",["^2",["^4","^5"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","main",["~#set",[["^ ","~:flags",["^2",["~:method","~:public","~:static"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","name",["~#set",[["^ ","~:flags",["^2",["~:method","~:public"]]]]],"toString",["^2",[["^ ","^3",["^2",["^4","^5"]]]]],"build",["^2",[["^ ","^3",["^2",["^4","^5"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","Apple",["~#set",[["^ ","~:flags",["^2",["~:method","~:public"]]]]],"getName",["^2",[["^ ","^3",["^2",["^4","^5"]]]]],"setName",["^2",[["^ ","^3",["^2",["^4","^5"]]]]],"builder",["^2",[["^ ","^3",["^2",["^4","^5","~:static"]]]]],"name",["^2",[["^ ","^3",["^2",["^4","^5"]]]]],"toString",["^2",[["^ ","^3",["^2",["^4","^5"]]]]],"build",["^2",[["^ ","^3",["^2",["^4","^5"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","main",["~#set",[["^ ","~:flags",["^2",["~:method","~:public","~:static"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","someMethod",["~#set",[["^ ","~:flags",["^2",["~:method","~:abstract"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","getGreeting",["~#set",[["^ ","~:flags",["^2",["~:method","~:public"]]]]],"main",["^2",[["^ ","^3",["^2",["^4","^5","~:static"]]]]],"apply",["^2",[["^ ","^3",["^2",["^4","^5"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","getParent",["~#set",[["^ ","~:flags",["^2",["~:method","~:protected"]]]]],"deleteSomething",["^2",[["^ ","^3",["^2",["^4","^5"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","main",["~#set",[["^ ","~:flags",["^2",["~:method","~:public","~:static"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","STATIC_FIELD",["~#set",[["^ ","~:flags",["^2",["~:static","~:field"]]]]],"protectedField",["^2",[["^ ","^3",["^2",["^5","~:protected"]]]]],"Base",["^2",[["^ ","^3",["^2",["~:method","~:public"]]]]],"foo",["^2",[["^ ","^3",["^2",["^9","^:"]]]]],"bar",["^2",[["^ ","^3",["^2",["^9","^:"]]]]],"method_1",["^2",[["^ ","^3",["^2",["^9","^7"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","Child",["~#set",[["^ ","~:flags",["^2",["~:method"]]]]],"method_2",["^2",[["^ ","^3",["^2",["^4","~:protected"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","foo",["~#set",[["^ ","~:flags",["^1",["~:method","~:public"]]]]],"bar",["^1",[["^ ","^2",["^1",["^3","^4"]]]]],"Base",["^1",[["^ ","^2",["^1",["^3","^4"]]]]],"STATIC_FIELD",["^1",[["^ ","^2",["^1",["~:static","~:field"]]]]],"recursive2",["^1",[["^ ","^2",["^1",["^3","^4"]]]]],"method_1",["^1",[["^ ","^2",["^1",["^3","~:protected"]]]]],"recursive1",["^1",[["^ ","^2",["^1",["^3","^4"]]]]],"main",["^1",[["^ ","^2",["^1",["^3","^4","^7"]]]]],"protectedField",["^1",[["^ ","^2",["^1",["^8","^;"]]]]],"method_2",["^1",[["^ ","^2",["^1",["^3","^;"]]]]],"Child",["^1",[["^ ","^2",["^1",["^3"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","of",["~#set",[["^ ","~:flags",["^1",["~:method","~:public","~:static"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","name",["~#set",[["^ ","~:flags",["^2",["~:method"]]]]],"of",["^2",[["^ ","^3",["^2",["^4","~:public","~:static"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","name",["~#set",[["^ ","~:flags",["^2",["~:field","~:protected"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","get",["~#set",[["^ ","~:flags",["^1",["~:method","~:public","~:abstract"]]],["^ ","^2",["^1",["^3","^4"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","main",["~#set",[["^ ","~:flags",["^2",["~:method","~:public","~:static"]]]]],"someMethod",["^2",[["^ ","^3",["^2",["^4","^5"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","someMethod",["~#set",[["^ ","~:flags",["^2",["~:method","~:public"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","get",["~#set",[["^ ","~:flags",["^1",["~:method","~:public","~:static"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","name",["~#set",[["^ ","~:flags",["^2",["~:method","~:public"]]]]],"bar",["^2",[["^ ","^3",["^2",["^4","^5"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","list",["~#set",[["^ ","~:flags",["^2",["~:field"]]]]],"i",["^2",[["^ ","^3",["^2",["^4"]]]]],"pi",["^2",[["^ ","^3",["^2",["^4"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","someMethod",["~#set",[["^ ","~:flags",["^2",["~:method","~:public"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","foo",["~#set",[["^ ","~:flags",["^1",["~:method","~:public"]]]]],"bar",["^1",[["^ ","^2",["^1",["^3","^4"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","bar",["~#set",[["^ ","~:flags",["^1",["~:method"]]]]],"bar1",["^1",[["^ ","^2",["^1",["^3"]]]]],"bar2",["^1",[["^ ","^2",["^1",["^3"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","build",["~#set",[["^ ","~:flags",["^2",["~:method","~:public","~:static"]]]]],"accept",["^2",[["^ ","^3",["^2",["^4","^5"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","getFoo",["~#set",[["^ ","~:flags",["^2",["~:method","~:public"]]]]],"getBar",["^2",[["^ ","^3",["^2",["^4","^5"]]]]],"foo",["^2",[["^ ","^3",["^2",["^4","^5"]]]]],"bar",["^2",[["^ ","^3",["^2",["^4","^5"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","someMethod",["~#set",[["^ ","~:flags",["^2",["~:method"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","add",["~#set",[["^ ","~:flags",["^1",["~:method"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","parentName",["~#set",[["^ ","~:flags",["^2",["~:field","~:protected"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","run",["~#set",[["^ ","~:flags",["^1",["~:method","~:public"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","test",["~#set",[["^ ","~:flags",["^2",["~:public","~:field"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","fooField",["~#set",[["^ ","~:flags",["^2",["~:public","~:field"]]]]],"test",["^2",[["^ ","^3",["^2",["^4","^5"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","foo",["~#set",[["^ ","~:flags",["^1",["~:method","~:public","~:static"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","bar",["~#set",[["^ ","~:flags",["^1",["~:method","~:public"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","success",["~#set",[["^ ","~:flags",["^2",["~:method","~:public"]]]]],"fail",["^2",[["^ ","^3",["^2",["^4","^5"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","SignatureHelp",["~#set",[["^ ","~:flags",["^2",["~:method","~:public"]]]]],"test",["^2",[["^ ","^3",["^2",["^4","^5"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","signatureHelp",["~#set",[["^ ","~:flags",["^2",["~:field"]]]]],"SignatureHelp2097",["^2",[["^ ","^3",["^2",["~:method","~:public"]]]]],"test",["^2",[["^ ","^3",["^2",["^6"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","main",["~#set",[["^ ","~:flags",["^2",["~:method","~:public","~:static"]]]]]]]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:members",["^ ","main",["~#set",[["^ ","~:flags",["^2",["~:method","~:public","~:static"]]]]],"run",["^2",[["^ ","^3",["^2",["^4","^5","^6"]]],["^ ","^3",["^2",["^4","^5"]]]]]]]
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["^ ","~:classpath",["~#set",[]],"~:project-hash","","~:project-root","/Users/fbricon/Dev/projects/eclipse.jdt.ls/org.eclipse.jdt.ls.tests/projects/eclipse/hello","~:kondo-config-hash","4ebd216040cc62c1866dfb9daa08519edbe5c941ac30d9e559d1a2ccf39d816a","~:dependency-scheme","jar","~:analysis",null,"~:analysis-checksums",["^ "],"~:project-analysis-type","~:project-and-full-dependencies","~:version",12,"~:stubs-generation-namespaces",["^1",[]]]
Binary file not shown.
Binary file not shown.
47 changes: 47 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
<!-- skip for local builds, set it to true on Eclipse.org infrastructure -->
<cbi.jarsigner.skip>true</cbi.jarsigner.skip>
<generateSourceRef>true</generateSourceRef>
<cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url>
<cbi-ecj-version>3.38.0.v20240524-2033</cbi-ecj-version>
</properties>
<modules>
<module>org.eclipse.jdt.ls.target</module>
Expand Down Expand Up @@ -187,6 +189,35 @@
</dependency-resolution>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho-version}</version>
<dependencies>
<dependency>
<groupId>org.eclipse.jdt</groupId>
<artifactId>ecj</artifactId>
<version>${cbi-ecj-version}</version>
</dependency>
</dependencies>
<configuration>
<compilerArgs>
<args>-verbose</args>
<args>-inlineJSR</args>
<args>-enableJavadoc</args>
<args>-encoding</args>
<args>${project.build.sourceEncoding}</args>
<args>-proceedOnError</args>
</compilerArgs>
<log>xml</log>
<logDirectory>${compileLogDir}</logDirectory>
<showWarnings>true</showWarnings>
<excludeResources>
<exclude>**/package.html</exclude>
</excludeResources>
<useProjectSettings>true</useProjectSettings>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down Expand Up @@ -315,12 +346,28 @@
<generateSourceRef>false</generateSourceRef>
</properties>
</profile>
<profile>
<id>javac</id>
<properties>
<tycho.testArgLine>--add-opens jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED -DICompilationUnitResolver=org.eclipse.jdt.core.dom.JavacCompilationUnitResolver -DCompilationUnit.DOM_BASED_OPERATIONS=true -DAbstractImageBuilder.compiler=org.eclipse.jdt.internal.javac.JavacCompiler</tycho.testArgLine>
</properties>
</profile>
</profiles>
<pluginRepositories>
<pluginRepository>
<id>cbi-release</id>
<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
</pluginRepository>
<pluginRepository>
<id>cbi-jdt</id>
<url>${cbi-jdt-repo.url}</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<distributionManagement>
<repository>
Expand Down

0 comments on commit 10c9501

Please sign in to comment.