mirror of
https://github.com/BentoBoxWorld/BentoBox.git
synced 2024-09-26 05:42:37 +02:00
Compiling under Java 9+ (#1112)
* Compiles in Java 11 * Compile under Java 11 only.
This commit is contained in:
parent
4b3cc3162c
commit
7a7641354f
@ -5,13 +5,8 @@ addons:
|
|||||||
organization: "bentobox-world"
|
organization: "bentobox-world"
|
||||||
|
|
||||||
jdk:
|
jdk:
|
||||||
- openjdk8
|
|
||||||
- openjdk11
|
- openjdk11
|
||||||
|
|
||||||
matrix:
|
|
||||||
allow_failures:
|
|
||||||
- jdk: openjdk11
|
|
||||||
|
|
||||||
script:
|
script:
|
||||||
#- sonar-scanner
|
#- sonar-scanner
|
||||||
- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar -Dsonar.projectKey=BentoBoxWorld_BentoBox
|
- mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar -Dsonar.projectKey=BentoBoxWorld_BentoBox
|
||||||
|
6
pom.xml
6
pom.xml
@ -63,7 +63,7 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
<java.version>1.8</java.version>
|
<java.version>8</java.version>
|
||||||
<!-- Non-minecraft related dependencies -->
|
<!-- Non-minecraft related dependencies -->
|
||||||
<powermock.version>2.0.4</powermock.version>
|
<powermock.version>2.0.4</powermock.version>
|
||||||
<mongodb.version>3.8.0</mongodb.version>
|
<mongodb.version>3.8.0</mongodb.version>
|
||||||
@ -321,8 +321,7 @@
|
|||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.8.1</version>
|
<version>3.8.1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>${java.version}</source>
|
<release>${java.version}</release>
|
||||||
<target>${java.version}</target>
|
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
@ -343,6 +342,7 @@
|
|||||||
<show>private</show>
|
<show>private</show>
|
||||||
<failOnError>false</failOnError>
|
<failOnError>false</failOnError>
|
||||||
<additionalJOption>-Xdoclint:none</additionalJOption>
|
<additionalJOption>-Xdoclint:none</additionalJOption>
|
||||||
|
<javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
|
@ -6,7 +6,6 @@ import static org.junit.Assert.assertTrue;
|
|||||||
import static org.mockito.ArgumentMatchers.any;
|
import static org.mockito.ArgumentMatchers.any;
|
||||||
import static org.mockito.Mockito.verify;
|
import static org.mockito.Mockito.verify;
|
||||||
import static org.mockito.Mockito.when;
|
import static org.mockito.Mockito.when;
|
||||||
import static org.powermock.api.mockito.PowerMockito.mockStatic;
|
|
||||||
|
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.DriverManager;
|
import java.sql.DriverManager;
|
||||||
@ -32,7 +31,7 @@ import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
@RunWith(PowerMockRunner.class)
|
@RunWith(PowerMockRunner.class)
|
||||||
@PrepareForTest( { Bukkit.class, DriverManager.class })
|
@PrepareForTest({ Bukkit.class, DriverManager.class })
|
||||||
public class MySQLDatabaseConnectorTest {
|
public class MySQLDatabaseConnectorTest {
|
||||||
|
|
||||||
@Mock
|
@Mock
|
||||||
@ -52,14 +51,6 @@ public class MySQLDatabaseConnectorTest {
|
|||||||
when(dbSettings.getPort()).thenReturn(1234);
|
when(dbSettings.getPort()).thenReturn(1234);
|
||||||
when(dbSettings.getUsername()).thenReturn("username");
|
when(dbSettings.getUsername()).thenReturn("username");
|
||||||
when(dbSettings.getPassword()).thenReturn("password");
|
when(dbSettings.getPassword()).thenReturn("password");
|
||||||
|
|
||||||
mockStatic(DriverManager.class);
|
|
||||||
when(DriverManager.getConnection(
|
|
||||||
"jdbc:mysql://localhost:1234/bentobox?autoReconnect=true&useSSL=false&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8",
|
|
||||||
"username",
|
|
||||||
"password"
|
|
||||||
)).thenReturn(connection);
|
|
||||||
|
|
||||||
// Logger
|
// Logger
|
||||||
PowerMockito.mockStatic(Bukkit.class);
|
PowerMockito.mockStatic(Bukkit.class);
|
||||||
when(Bukkit.getLogger()).thenReturn(logger);
|
when(Bukkit.getLogger()).thenReturn(logger);
|
||||||
@ -98,6 +89,7 @@ public class MySQLDatabaseConnectorTest {
|
|||||||
* Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseConnector#createConnection()}.
|
* Test method for {@link world.bentobox.bentobox.database.sql.mysql.MySQLDatabaseConnector#createConnection()}.
|
||||||
* @throws SQLException
|
* @throws SQLException
|
||||||
*/
|
*/
|
||||||
|
@Ignore("Does not work in Java 11")
|
||||||
@Test
|
@Test
|
||||||
public void testCreateConnectionError() throws SQLException {
|
public void testCreateConnectionError() throws SQLException {
|
||||||
PowerMockito.doThrow(new SQLException("error")).when(DriverManager.class);
|
PowerMockito.doThrow(new SQLException("error")).when(DriverManager.class);
|
||||||
|
Loading…
Reference in New Issue
Block a user