diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
index 7250408..17c3ba9 100644
--- a/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
+++ b/src/main/java/net/thauvin/erik/mobibot/modules/Calc.java
@@ -58,28 +58,34 @@ public class Calc extends AbstractModule {
commands.add(CALC_CMD);
}
+ /**
+ * Calculate.
+ *
+ * @param query The query.
+ * @return The calculation result.
+ */
+ public static String calc(final String query) {
+ final DecimalFormat decimalFormat = new DecimalFormat("#.##");
+
+ try {
+ final Expression calc = new ExpressionBuilder(query).build();
+ return query.replaceAll(" ", "") + " = " + decimalFormat.format(calc.evaluate());
+ } catch (Exception e) {
+ return "No idea. This is the kind of math I don't get.";
+ }
+ }
+
/**
* {@inheritDoc}
*/
@Override
public void commandResponse(final Mobibot bot, final String sender, final String args, final boolean isPrivate) {
if (Utils.isValidString(args)) {
- final DecimalFormat decimalFormat = new DecimalFormat("#.##");
+ bot.send(bot.getChannel(), calc(args));
- try {
- final Expression calc = new ExpressionBuilder(args).build();
- bot.send(bot.getChannel(), args.replaceAll(" ", "") + " = " + decimalFormat.format(calc.evaluate()));
- } catch (Exception e) {
- if (bot.getLogger().isDebugEnabled()) {
- bot.getLogger().debug("Unable to calculate: " + args, e);
- }
-
- bot.send(bot.getChannel(), "No idea. This is the kind of math I don't get.");
- }
} else {
helpResponse(bot, sender, args, isPrivate);
}
-
}
/**
diff --git a/src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.java b/src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.java
new file mode 100644
index 0000000..e8726c2
--- /dev/null
+++ b/src/test/java/net/thauvin/erik/mobibot/modules/CalcTest.java
@@ -0,0 +1,53 @@
+/*
+ * CalcTest.java
+ *
+ * Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of this project nor the names of its contributors may be
+ * used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.thauvin.erik.mobibot.modules;
+
+import org.testng.annotations.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * The CalcTest
class.
+ *
+ * @author Erik C. Thauvin
+ * @created 2019-04-07
+ * @since 1.0
+ */
+public class CalcTest {
+ @Test
+ public void testCalc() {
+ assertThat(Calc.calc("1 + 1")).as("calc(1+1)").isEqualTo("1+1 = 2");
+ assertThat(Calc.calc("1 -3")).as("calc(1 -3)").isEqualTo("1-3 = -2");
+ assertThat(Calc.calc("pi+π+e+φ")).as("calc(pi+π+e+φ)").isEqualTo("pi+π+e+φ = 10.62");
+ assertThat(Calc.calc("one + one")).as("calc(one + one)").startsWith("No idea.");
+ }
+}