phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[java] version 14 is now the new default

Browse Source
This commit is contained in:
Andreas Dangel
2020-02-27 15:15:50 +01:00
parent 3a283559b4
commit f3da33944b
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pmd-java/src/main/java/net/sourceforge/pmd/lang/java/JavaLanguageModule.java
View File

@ -28,9 +28,9 @@ public class JavaLanguageModule extends BaseLanguageModule {
addVersion("11", new JavaLanguageHandler(11), false);
addVersion("12", new JavaLanguageHandler(12), false);
addVersion("12-preview", new JavaLanguageHandler(12, true), false);
addVersion("13", new JavaLanguageHandler(13), true); // 13 is the default
addVersion("13", new JavaLanguageHandler(13), false);
addVersion("13-preview", new JavaLanguageHandler(13, true), false);
addVersion("14", new JavaLanguageHandler(14), false);
addVersion("14", new JavaLanguageHandler(14), true); // 14 is the default
addVersion("14-preview", new JavaLanguageHandler(14, true), false);
}

6
pmd-java/src/test/java/net/sourceforge/pmd/LanguageVersionDiscovererTest.java
View File

@ -26,8 +26,8 @@ public class LanguageVersionDiscovererTest {
File javaFile = new File("/path/to/MyClass.java");
LanguageVersion languageVersion = discoverer.getDefaultLanguageVersionForFile(javaFile);
assertEquals("LanguageVersion must be Java 13 !",
LanguageRegistry.getLanguage(JavaLanguageModule.NAME).getVersion("13"), languageVersion);
assertEquals("LanguageVersion must be Java 14 !",
LanguageRegistry.getLanguage(JavaLanguageModule.NAME).getVersion("14"), languageVersion);
}
/**
@ -48,7 +48,7 @@ public class LanguageVersionDiscovererTest {
public void testLanguageVersionDiscoverer() {
PMDConfiguration configuration = new PMDConfiguration();
LanguageVersionDiscoverer languageVersionDiscoverer = configuration.getLanguageVersionDiscoverer();
assertEquals("Default Java version", LanguageRegistry.getLanguage(JavaLanguageModule.NAME).getVersion("13"),
assertEquals("Default Java version", LanguageRegistry.getLanguage(JavaLanguageModule.NAME).getVersion("14"),
languageVersionDiscoverer
.getDefaultLanguageVersion(LanguageRegistry.getLanguage(JavaLanguageModule.NAME)));
configuration

6
pmd-java/src/test/java/net/sourceforge/pmd/LanguageVersionTest.java
View File

@ -20,7 +20,7 @@ public class LanguageVersionTest extends AbstractLanguageVersionTest {
}
@Parameters
public static Collection data() {
public static Collection<Object[]> data() {
return Arrays.asList(new Object[][] {
{ JavaLanguageModule.NAME, JavaLanguageModule.TERSE_NAME, "1.3",
LanguageRegistry.getLanguage(JavaLanguageModule.NAME).getVersion("1.3"), },
@ -48,6 +48,10 @@ public class LanguageVersionTest extends AbstractLanguageVersionTest {
LanguageRegistry.getLanguage(JavaLanguageModule.NAME).getVersion("13"), },
{ JavaLanguageModule.NAME, JavaLanguageModule.TERSE_NAME, "13-preview",
LanguageRegistry.getLanguage(JavaLanguageModule.NAME).getVersion("13-preview"), },
{ JavaLanguageModule.NAME, JavaLanguageModule.TERSE_NAME, "14",
LanguageRegistry.getLanguage(JavaLanguageModule.NAME).getVersion("14"), },
{ JavaLanguageModule.NAME, JavaLanguageModule.TERSE_NAME, "14-preview",
LanguageRegistry.getLanguage(JavaLanguageModule.NAME).getVersion("14-preview"), },
// this one won't be found: case sensitive!
{ "JAVA", "JAVA", "1.7", null, }, });