Bump dependencies and gradle (lavalink-devs#85)

schnapster · freyacodes · commit 4f7428dbb15a · 2018-03-06T11:12:45.000+01:00
* Bump deps

* Bump Spring Boot to v2

* Bump gradle to v4.6

* Move publishing to lavalink client only

* Adjust archive name of task that builds the jar

* Fix and pimp client tests
diff --git a/LavalinkClient/build.gradle b/LavalinkClient/build.gradle
@@ -3,6 +3,34 @@ version System.getenv('dev') == 'true' ? '-SNAPSHOT' : '2.0'
 ext {
     moduleName = 'Lavalink-Client'
 }
+
+apply plugin: 'maven-publish'
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            groupId rootProject.group
+            artifactId moduleName
+
+            from components.java
+
+            artifact sourceJar {
+                classifier "sources"
+            }
+        }
+    }
+}
+
+task install(dependsOn: 'publishToMavenLocal')
+publishToMavenLocal.dependsOn 'jar'
+
+test {
+    useJUnitPlatform()
+
+    systemProperty("TEST_TOKEN", System.getProperty("TEST_TOKEN"))
+    systemProperty("TEST_VOICE_CHANNEL", System.getProperty("TEST_VOICE_CHANNEL"))
+}
+
 dependencies {
     compile group: 'com.sedmelluq', name: 'lavaplayer', version: lavaplayerVersion
     compile group: 'org.java-websocket', name: 'Java-WebSocket', version: javaWebSocketVersion
diff --git a/LavalinkClient/src/test/java/lavalink/client/LavalinkTest.java b/LavalinkClient/src/test/java/lavalink/client/LavalinkTest.java
@@ -35,8 +35,8 @@
 import net.dv8tion.jda.core.JDABuilder;
 import net.dv8tion.jda.core.entities.VoiceChannel;
 import org.json.JSONArray;
+import org.json.JSONObject;
 import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
@@ -50,10 +50,22 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@RequireSystemProperty({
+        LavalinkTest.PROPERTY_TOKEN,
+        LavalinkTest.PROPERTY_CHANNEL,
+})
 class LavalinkTest {
 
     private static final Logger log = LoggerFactory.getLogger(LavalinkTest.class);
 
+    public static final String PROPERTY_TOKEN = "TEST_TOKEN";
+    public static final String PROPERTY_CHANNEL = "TEST_VOICE_CHANNEL";
+
     private static JDA jda = null;
     private static Lavalink lavalink = null;
     private static final String[] BILL_WURTZ_JINGLES = {
@@ -67,37 +79,40 @@ class LavalinkTest {
     };
 
     @BeforeAll
-    static void setUp() {
-        try {
-            jda = new JDABuilder(AccountType.BOT)
-                    .setToken(System.getenv("TEST_TOKEN"))
-                    .addEventListener(lavalink)
-                    .buildBlocking();
-
-            lavalink = new Lavalink("152691313123393536", 1, integer -> jda);
-            lavalink.addNode(new URI("ws://localhost"), "youshallnotpass");
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
+    static void setUp() throws Exception {
+        JDABuilder jdaBuilder = new JDABuilder(AccountType.BOT)
+                .setToken(getSystemProperty(PROPERTY_TOKEN));
+
+        JDA selfId = jdaBuilder.buildAsync();
+        lavalink = new Lavalink(selfId.asBot().getApplicationInfo().submit().get(30, TimeUnit.SECONDS).getId(), 1, integer -> jda);
+        selfId.shutdown();
+
+        lavalink.addNode(new URI("ws://localhost:5555"), "youshallnotpass");
+
+        jda = jdaBuilder
+                .addEventListener(lavalink)
+                .buildAsync();
+
+        Thread.sleep(2000);
+        assertTrue(lavalink.getNodes().get(0).isAvailable(), "Could not connect to lavalink server");
     }
 
     @AfterAll
     static void tearDown() {
-        lavalink.shutdown();
-        jda.shutdown();
+        if (lavalink != null) {
+            lavalink.shutdown();
+        }
+        if (jda != null) {
+            jda.shutdown();
+        }
     }
 
     @Test
     void vcJoinTest() {
-        VoiceChannel vc = jda.getVoiceChannelById(System.getenv("TEST_VOICE_CHANNEL"));
-        lavalink.getLink(vc.getGuild()).connect(vc);
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-
-        lavalink.getLink(vc.getGuild()).disconnect();
+        VoiceChannel vc = fetchVoiceChannel(jda, getTestVoiceChannelId());
+        ensureConnected(lavalink, vc);
+        assertEquals(Link.State.CONNECTED, lavalink.getLink(vc.getGuild()).getState(), "Failed to connect to voice channel");
+        ensureNotConnected(lavalink, vc);
     }
 
     private List<AudioTrack> loadAudioTracks(String identifier) {
@@ -106,13 +121,12 @@ private List<AudioTrack> loadAudioTracks(String identifier) {
                     .header("Authorization", "youshallnotpass")
                     .asJson()
                     .getBody()
-                    .getObject()
-                    .getJSONArray("tracks");
+                    .getArray();
 
             ArrayList<AudioTrack> list = new ArrayList<>();
             trackData.forEach(o -> {
                 try {
-                    list.add(LavalinkUtil.toAudioTrack((String) o));
+                    list.add(LavalinkUtil.toAudioTrack(((JSONObject) o).getString("track")));
                 } catch (IOException e) {
                     throw new RuntimeException(e);
                 }
@@ -125,8 +139,8 @@ private List<AudioTrack> loadAudioTracks(String identifier) {
     }
 
     private void connectAndPlay(AudioTrack track) throws InterruptedException {
-        VoiceChannel vc = jda.getVoiceChannelById(System.getenv("TEST_VOICE_CHANNEL"));
-        lavalink.getLink(vc.getGuild()).connect(vc);
+        VoiceChannel vc = fetchVoiceChannel(jda, getTestVoiceChannelId());
+        ensureConnected(lavalink, vc);
 
         IPlayer player = lavalink.getLink(vc.getGuild()).getPlayer();
         CountDownLatch latch = new CountDownLatch(1);
@@ -141,11 +155,11 @@ public void onTrackStart(IPlayer player, AudioTrack track) {
         player.playTrack(track);
 
         latch.await(5, TimeUnit.SECONDS);
-        lavalink.getLink(vc.getGuild()).disconnect();
+        ensureNotConnected(lavalink, vc);
         player.removeListener(listener);
         player.stopTrack();
 
-        Assertions.assertEquals(0, latch.getCount());
+        assertEquals(0, latch.getCount());
     }
 
     @Test
@@ -160,8 +174,8 @@ void vcStreamTest() throws InterruptedException {
 
     @Test
     void stopTest() throws InterruptedException {
-        VoiceChannel vc = jda.getVoiceChannelById(System.getenv("TEST_VOICE_CHANNEL"));
-        lavalink.getLink(vc.getGuild()).connect(vc);
+        VoiceChannel vc = fetchVoiceChannel(jda, getTestVoiceChannelId());
+        ensureConnected(lavalink, vc);
 
         IPlayer player = lavalink.getLink(vc.getGuild()).getPlayer();
         CountDownLatch latch = new CountDownLatch(1);
@@ -185,25 +199,26 @@ public void onTrackEnd(IPlayer player, AudioTrack track, AudioTrackEndReason end
         player.playTrack(loadAudioTracks("aGOFOP2BIhI").get(0));
 
         latch.await(5, TimeUnit.SECONDS);
-        lavalink.getLink(vc.getGuild()).disconnect();
+        ensureNotConnected(lavalink, vc);
         player.removeListener(listener);
         player.stopTrack();
 
-        Assertions.assertEquals(0, latch.getCount());
+        assertEquals(0, latch.getCount());
     }
 
     @Test
     void testPlayback() throws InterruptedException {
-        VoiceChannel vc = jda.getVoiceChannelById(System.getenv("TEST_VOICE_CHANNEL"));
+        VoiceChannel vc = fetchVoiceChannel(jda, getTestVoiceChannelId());
         Link link = lavalink.getLink(vc.getGuild());
-        link.connect(vc);
+        ensureConnected(lavalink, vc);
 
         IPlayer player = link.getPlayer();
         CountDownLatch latch = new CountDownLatch(1);
 
         PlayerEventListenerAdapter listener = new PlayerEventListenerAdapter() {
             @Override
             public void onTrackEnd(IPlayer player, AudioTrack track, AudioTrackEndReason endReason) {
+                log.info(endReason.name());
                 if (endReason == AudioTrackEndReason.FINISHED) {
                     latch.countDown();
                 }
@@ -217,12 +232,82 @@ public void onTrackEnd(IPlayer player, AudioTrack track, AudioTrackEndReason end
         player.playTrack(loadAudioTracks(jingle).get(0));
 
         latch.await(20, TimeUnit.SECONDS);
-        link.disconnect();
+        ensureNotConnected(lavalink, vc);
         player.removeListener(listener);
 
         player.stopTrack();
 
-        Assertions.assertEquals(0, latch.getCount());
+        assertEquals(0, latch.getCount());
+    }
+
+    private static String getSystemProperty(String key) {
+        String value = System.getProperty(key);
+
+        assertNotNull(value, "Missing system property " + key);
+        assertFalse(value.isEmpty(), "System property " + key + " is empty");
+
+        return value;
     }
 
+    private static long getTestVoiceChannelId() {
+        return Long.parseUnsignedLong(getSystemProperty(PROPERTY_CHANNEL));
+    }
+
+    private static VoiceChannel fetchVoiceChannel(JDA jda, long voiceChannelId) {
+        long started = System.currentTimeMillis();
+        while (jda.getStatus() != JDA.Status.CONNECTED
+                && System.currentTimeMillis() - started < 10000 //wait 10 sec max
+                && !Thread.currentThread().isInterrupted()) {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+        }
+        assertEquals(JDA.Status.CONNECTED, jda.getStatus(), "Failed to connect to Discord in a reasonable amount of time");
+
+        VoiceChannel voiceChannel = jda.getVoiceChannelById(voiceChannelId);
+        assertNotNull(voiceChannel, "Configured VoiceChannel not found on the configured Discord bot account");
+
+        return voiceChannel;
+    }
+
+
+    private static void ensureConnected(Lavalink lavalink, VoiceChannel voiceChannel) {
+
+        Link link = lavalink.getLink(voiceChannel.getGuild());
+        link.connect(voiceChannel);
+        long started = System.currentTimeMillis();
+        while (link.getState() != Link.State.CONNECTED
+                && System.currentTimeMillis() - started < 10000 //wait 10 sec max
+                && !Thread.currentThread().isInterrupted()) {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+            link.connect(voiceChannel);
+        }
+
+        assertEquals(Link.State.CONNECTED, link.getState(), "Failed to connect to voice channel in a reasonable amount of time");
+    }
+
+    private static void ensureNotConnected(Lavalink lavalink, VoiceChannel voiceChannel) {
+        Link link = lavalink.getLink(voiceChannel.getGuild());
+        link.disconnect();
+        long started = System.currentTimeMillis();
+        while (link.getState() != Link.State.NOT_CONNECTED && link.getState() != Link.State.DISCONNECTING
+                && System.currentTimeMillis() - started < 10000 //wait 10 sec max
+                && !Thread.currentThread().isInterrupted()) {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
+            link.disconnect();
+        }
+
+        assertTrue(link.getState() == Link.State.NOT_CONNECTED
+                || link.getState() == Link.State.DISCONNECTING, "Failed to disconnect from voice channel in a reasonable amount of time");
+    }
 }
diff --git a/LavalinkClient/src/test/java/lavalink/client/RequireSystemProperty.java b/LavalinkClient/src/test/java/lavalink/client/RequireSystemProperty.java
@@ -0,0 +1,19 @@
+package lavalink.client;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Created by napster on 06.03.18.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@ExtendWith(RequireSystemPropertyExists.class)
+public @interface RequireSystemProperty {
+
+    /**
+     * @return an array of System property keys
+     */
+    String[] value();
+}
diff --git a/LavalinkClient/src/test/java/lavalink/client/RequireSystemPropertyExists.java b/LavalinkClient/src/test/java/lavalink/client/RequireSystemPropertyExists.java
@@ -0,0 +1,31 @@
+package lavalink.client;
+
+import org.junit.jupiter.api.extension.ConditionEvaluationResult;
+import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.platform.commons.support.AnnotationSupport;
+
+import java.util.Optional;
+
+/**
+ * Created by napster on 06.03.18.
+ * <p>
+ * Checks whether the required system properties have been set
+ */
+public class RequireSystemPropertyExists implements ExecutionCondition {
+
+    @Override
+    public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
+        Optional<RequireSystemProperty> annotation = AnnotationSupport.findAnnotation(context.getElement(), RequireSystemProperty.class);
+        if (annotation.isPresent()) {
+            for (String propertyKey : annotation.get().value()) {
+                String propertyValue = System.getProperty(propertyKey);
+                if (propertyValue == null || propertyValue.isEmpty()) {
+                    return ConditionEvaluationResult.disabled(String.format("System property '%s' not set. Skipping test.", propertyKey));
+                }
+            }
+            return ConditionEvaluationResult.enabled("All required system properties present. Continuing test.");
+        }
+        return ConditionEvaluationResult.enabled("No RequireSystemProperty annotation found. Continuing test.");
+    }
+}
diff --git a/LavalinkServer/build.gradle b/LavalinkServer/build.gradle
@@ -9,10 +9,9 @@ ext {
     moduleName = 'Lavalink-Server'
 }
 
-jar {
+bootJar {
     archiveName = "Lavalink.jar"
 }
-publishToMavenLocal.dependsOn 'bootRepackage'
 
 bootRun {
     //compiling tests during bootRun increases the likelyhood of catching broken tests locally instead of on the CI
diff --git a/LavalinkServer/src/main/java/lavalink/server/Launcher.java b/LavalinkServer/src/main/java/lavalink/server/Launcher.java
@@ -35,6 +35,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -112,7 +113,7 @@ private void turnOffSentry() {
 
     public static void main(String[] args) {
         SpringApplication sa = new SpringApplication(Launcher.class);
-        sa.setWebEnvironment(true);
+        sa.setWebApplicationType(WebApplicationType.SERVLET);
         sa.run(args);
 
         String os = System.getProperty("os.name");
diff --git a/build.gradle b/build.gradle
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties

Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,9 @@ ext {`
`9`	`9`	`moduleName = 'Lavalink-Server'`
`10`	`10`	`}`
`11`	`11`
`12`		`-jar {`
	`12`	`+bootJar {`
`13`	`13`	`archiveName = "Lavalink.jar"`
`14`	`14`	`}`
`15`		`-publishToMavenLocal.dependsOn 'bootRepackage'`
`16`	`15`
`17`	`16`	`bootRun {`
`18`	`17`	`//compiling tests during bootRun increases the likelyhood of catching broken tests locally instead of on the CI`