From 24a7d5ad56d7c443b23fe5015d16db18fe856b9d Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 8 Apr 2019 01:42:17 -0700 Subject: [PATCH] Added more tests. --- .../java/net/thauvin/erik/mobibot/modules/Joke.java | 10 ++++------ .../net/thauvin/erik/mobibot/modules/JokeTest.java | 3 ++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java index fd0edb3..7157814 100644 --- a/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java +++ b/src/main/java/net/thauvin/erik/mobibot/modules/Joke.java @@ -88,13 +88,11 @@ public final class Joke extends AbstractModule { final JSONObject json = new JSONObject(sb.toString()); return new PublicMessage( - Colors.CYAN - + json.getJSONObject("value").get("joke").toString().replaceAll("\\'", "'") - .replaceAll("\\\"", "\"") - + Colors.NORMAL); + json.getJSONObject("value").get("joke").toString().replaceAll("\\'", "'") + .replaceAll("\\\"", "\"")); } } catch (Exception e) { - throw new ModuleException("An error has occurred retrieving a random joke.", e); + throw new ModuleException("randomJoke()", "An error has occurred retrieving a random joke.", e); } } @@ -120,7 +118,7 @@ public final class Joke extends AbstractModule { */ private void run(final Mobibot bot, final String sender) { try { - randomJoke(); + bot.send(bot.getChannel(), Colors.CYAN + randomJoke().getMessage() + Colors.NORMAL); } catch (ModuleException e) { bot.getLogger().warn(e.getDebugMessage(), e); bot.send(sender, e.getMessage()); diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.java index d5c1130..90fbd4d 100644 --- a/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.java +++ b/src/test/java/net/thauvin/erik/mobibot/modules/JokeTest.java @@ -50,6 +50,7 @@ public class JokeTest { @Test public void testRamdomJoke() throws ModuleException { - assertThat(Joke.randomJoke().getMessage().length() > 0).as("randomJoke()").isTrue(); + assertThat(Joke.randomJoke().getMessage().length() > 0).as("randomJoke() > 0").isTrue(); + assertThat(Joke.randomJoke().getMessage()).as("randomJoke()").contains("Chuck"); } }