feat(new-rocket-api): Let integration tests respect RocketChat versio…

…n (see #JENKINS-40595 and #JENKINS-40673)
jenkinsci · Dec 27, 2016 · aa9614f · aa9614f
1 parent 0cd495d
commit aa9614f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/main/java/jenkins/plugins/rocketchatnotifier/rocket/LegacyRocketChatClient.java b/src/main/java/jenkins/plugins/rocketchatnotifier/rocket/LegacyRocketChatClient.java
@@ -14,10 +14,7 @@
 import sun.security.validator.ValidatorException;
 
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Created by mreinhardt on 26.12.16.
@@ -163,6 +160,6 @@ public User getUser(String userId) throws IOException {
 
   @Override
   public Room[] getChannels() throws IOException {
-    return new Room[0];
+   return this.getPublicRooms().toArray(new Room[0]);
   }
 }
diff --git a/src/test/java/jenkins/plugins/rocketchatnotifier/rocket/RocketChatClientIT.java b/src/test/java/jenkins/plugins/rocketchatnotifier/rocket/RocketChatClientIT.java
@@ -16,7 +16,13 @@ public class RocketChatClientIT {
 
   @Before
   public void setup() throws Exception {
-    this.client = new RocketChatClientImpl("http://localhost:4443/api/", "admin", "supersecret"); // TODO read from env
+    String rocketVersionString = System.getProperty("rocket.version", "0.48.2");
+    int rocketVersion = Integer.parseInt(rocketVersionString.split("\\.")[1]);
+    if (rocketVersion >= 48) {
+      this.client = new RocketChatClientImpl("http://localhost:4443/api/", "admin", "supersecret"); // TODO read from env
+    } else {
+      this.client = new LegacyRocketChatClient("http://localhost:4443/api/", "admin", "supersecret");
+    }
   }
 
   @Test