Merge pull request #6 from Pricetx/master

JUnit fixes (localhost hardcoded)

Author: ReidWeb

src/test/java/com/ffxivcensus/gatherer/ConsoleTest.java

@@ -44,6 +44,10 @@ public class ConsoleTest {
      * The database to use
      */
     private static String dbName;
+    /**
+     * Hostname of database, e.g. mysql://host.example.com:3306
+     */
+    private static String dbHost;
 
     /**
      * Before running drop the table.
@@ -100,32 +104,33 @@ public void cleanUpStreams() {
     /**
      * Make a run of the console application with the following options.
      * <ul>
-     *     <li>Start ID = 0</li>
-     *     <li>End ID = 100</li>
-     *     <li>Thread limit = 10</li>
-     *     <li>Table Name = tblplayers_test</li>
-     *     <li>Log mounts</li>
-     *     <li>Log minions</li>
-     *     <li>Do not store progress indicators</li>
-     *     <li>User specified DB name.</li>
+     * <li>Start ID = 0</li>
+     * <li>End ID = 100</li>
+     * <li>Thread limit = 10</li>
+     * <li>Table Name = tblplayers_test</li>
+     * <li>Log mounts</li>
+     * <li>Log minions</li>
+     * <li>Do not store progress indicators</li>
+     * <li>User specified DB name.</li>
      * </ul>
+     *
      * @throws Exception
      */
     @Test
     public void testConsole() throws Exception {
 
-        String[] args = {"-s", "0", "-f", "100", "-t", "10","-T","tblplayers_test","-d",dbName,"-bPq"};
+        String[] args = {"-s", "0", "-f", "100", "-t", "10", "-T", "tblplayers_test", "-d", dbName,"-U",dbHost, "-bPq"};
 
         GathererController gc = Console.run(args);
         //Test that options have set attributes correctly
         assertFalse(gc.isStoreProgression()); //b
         assertTrue(gc.isStoreMinions()); //P
         assertTrue(gc.isQuiet()); //q
         assertFalse(gc.isVerbose()); //q
-        assertEquals("tblplayers_test",gc.getTableName());
-        assertEquals(gc.getStartId(),0);
-        assertEquals(gc.getEndId(),100);
-        assertEquals(gc.getThreadLimit(),10);
+        assertEquals("tblplayers_test", gc.getTableName());
+        assertEquals(gc.getStartId(), 0);
+        assertEquals(gc.getEndId(), 100);
+        assertEquals(gc.getThreadLimit(), 10);
 
         assertTrue(outContent.toString().contains("Starting parse of range 0 to 100 using 10 threads"));
         assertTrue(outContent.toString().contains("Run completed, 101 character IDs scanned"));
@@ -136,31 +141,32 @@ public void testConsole() throws Exception {
     /**
      * Make a run of the console application with the following options.
      * <ul>
-     *     <li>Start ID = 100</li>
-     *     <li>End ID = 200</li>
-     *     <li>Thread limit = 32</li>
-     *     <li>Print duds</li>
-     *     <li>User specified db name</li>
-     *     <li>User specified db credentials</li>
-     *     <li>Verbose mode</li>
+     * <li>Start ID = 100</li>
+     * <li>End ID = 200</li>
+     * <li>Thread limit = 32</li>
+     * <li>Print duds</li>
+     * <li>User specified db name</li>
+     * <li>User specified db credentials</li>
+     * <li>Verbose mode</li>
      * </ul>
+     *
      * @throws Exception
      */
     @Test
     public void testConsoleFullOptions() throws Exception {
 
-        String[] args = {"--start=100", "--finish=200", "--threads", "32","-v","-d",dbName,"-U","mysql://localhost:3306","-u",dbUser,"-p",dbPassword};
+        String[] args = {"--start=100", "--finish=200", "--threads", "32", "-v", "-d", dbName, "-U", dbHost, "-u", dbUser, "-p", dbPassword};
         GathererController gc = Console.run(args);
 
-        assertEquals(gc.getStartId(),100);
-        assertEquals(gc.getEndId(),200);
-        assertEquals(gc.getThreadLimit(),32);
+        assertEquals(gc.getStartId(), 100);
+        assertEquals(gc.getEndId(), 200);
+        assertEquals(gc.getThreadLimit(), 32);
         assertTrue(gc.isVerbose());
     }
 
 
     @Test
-    public void TestConsoleHelpDefault() throws Exception{
+    public void TestConsoleHelpDefault() throws Exception {
 
         String strHelp = "usage: java -jar XIVStats-Gatherer-Java.jar [-bmqvxFPS] -s startid -f";
 
@@ -172,7 +178,7 @@ public void TestConsoleHelpDefault() throws Exception{
     }
 
     @Test
-    public void TestConsoleHelpOnFail() throws Exception{
+    public void TestConsoleHelpOnFail() throws Exception {
 
         String strHelp = "usage: java -jar XIVStats-Gatherer-Java.jar [-bmqvxFPS] -s startid -f";
         //Test for a help dialog displayed upon failure
@@ -184,7 +190,7 @@ public void TestConsoleHelpOnFail() throws Exception{
     }
 
     @Test
-    public void TestConsoleHelp() throws Exception{
+    public void TestConsoleHelp() throws Exception {
 
         String strHelp = "usage: java -jar XIVStats-Gatherer-Java.jar [-bmqvxFPS] -s startid -f";
 
@@ -196,36 +202,36 @@ public void TestConsoleHelp() throws Exception{
     }
 
     @Test
-    public void testMain(){
-        String[] args = {"-s","1100", "-f","1400"};
+    public void testMain() {
+        String[] args = {"-s", "1100", "-f", "1400"};
         Console.main(args);
         //Check output
         assertFalse(outContent.toString().contains("does not exist."));
     }
 
     @Test
-    public void testDefault(){
-        String[] args = {"-s","500","-f","600"};
+    public void testDefault() {
+        String[] args = {"-s", "500", "-f", "600"};
         GathererController gc = Console.run(args);
         //Check output
         assertFalse(outContent.toString().contains("does not exist."));
     }
 
     @Test
-    public void testPrintFails(){
-        String[] args = {"-s","700","-f","800","-qF"};
+    public void testPrintFails() {
+        String[] args = {"-s", "700", "-f", "800", "-qF"};
         GathererController gc = Console.run(args);
         //Check output
         assertFalse(outContent.toString().contains("written to database successfully."));
         assertTrue(outContent.toString().contains("does not exist."));
     }
 
     @Test
-    public void testSplitTables(){
-        String[] args = {"-s","900","-f","1000","-x","_test","-S"};
+    public void testSplitTables() {
+        String[] args = {"-s", "900", "-f", "1000", "-x", "_test", "-S"};
         GathererController gc = Console.run(args);
         assertTrue(gc.isSplitTables());
-        assertEquals(gc.getTableSuffix(),"_test");
+        assertEquals(gc.getTableSuffix(), "_test");
     }
 
     //Utility methods
@@ -283,6 +289,7 @@ public static void readConfig() throws ParserConfigurationException, IOException
 
         String url = "jdbc:" + elementJDBC.getElementsByTagName("url").item(0).getTextContent() + "/" + elementJDBC.getElementsByTagName("database").item(0).getTextContent();
         dbUrl = url;
+        dbHost = elementJDBC.getElementsByTagName("url").item(0).getTextContent();
         dbUser = elementJDBC.getElementsByTagName("username").item(0).getTextContent();
         dbPassword = elementJDBC.getElementsByTagName("password").item(0).getTextContent();
         dbName = elementJDBC.getElementsByTagName("database").item(0).getTextContent();