Merge pull request #26 from SlicingDice/bugfix/change-api-key

replace api key by new one

Author: joaosimbiose

src/main/java/com/slicingdice/jslicer/utils/URLResources.java

@@ -35,7 +35,7 @@ public enum URLResources {
     QUERY_DATA_EXTRACTION_RESULT("/data_extraction/result/"),
     QUERY_DATA_EXTRACTION_SCORE("/data_extraction/score/"),
     DATABASE("/database/"),
-    QUERY_SQL("/query/sql/");
+    QUERY_SQL("/sql/");
 
     public final String url;
 

src/test/java/com/slicingdice/jslicer/RunQueryTests.java

@@ -6,13 +6,22 @@
 public class RunQueryTests {
     // Your demo api key, to get a valid demo API key you can use:
     // http://panel.slicingdice.com/docs/#api-details-api-connection-api-keys-demo-key
-    private static final String DEMO_API_KEY = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJfX3NhbHQiOiIxN" +
-            "TE4NjA3ODQ0NDAzIiwicGVybWlzc2lvbl9sZXZlbCI6MywicHJvamVjdF9pZCI6NDY5NjYsImNsaWVudF9pZ" +
-            "CI6OTUxfQ.S6LCWQDcLS1DEFy3lsqk2jTGIe5rJ5fsQIvWuuFBdkw";
+    private static final String DEMO_API_KEY = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJfX3NhbHQiOiJkZW1vNzAzM20iLCJwZXJtaXNzaW9uX2xldmVsIjozLCJwcm9qZWN0X2lkIjoyNzAzMywiY2xpZW50X2lkIjoxMH0.8lLB7vDAj8SecpHUsgCyZm4yRoizqggKPRm4Q9BfEu8";
+
+    private static String getDemoKey() {
+        String demoApiKey = System.getenv("SD_API_KEY");
+
+        if (demoApiKey == null) {
+            demoApiKey = DEMO_API_KEY;
+        }
+
+        return demoApiKey;
+    }
 
     public static void main(final String[] args) throws ExecutionException, InterruptedException {
         // the query types to use on tests
         final ArrayList<String> queryTypes = new ArrayList<String>() {{
+            add("sql");
             add("count_entity");
             add("count_event");
             add("top_values");
@@ -22,7 +31,7 @@ public static void main(final String[] args) throws ExecutionException, Interrup
         }};
 
         // Testing class with demo API key
-        final SlicingDiceTester sdTester = new SlicingDiceTester(DEMO_API_KEY, true);
+        final SlicingDiceTester sdTester = new SlicingDiceTester(getDemoKey(), true);
 
         Runtime.getRuntime().addShutdownHook(new Thread()
         {

src/test/java/com/slicingdice/jslicer/SlicingDiceTester.java

@@ -41,6 +41,8 @@ public class SlicingDiceTester {
 
     private boolean perTestInsertion;
 
+    private boolean insertSqlData;
+
     public SlicingDiceTester(final String apiKey) {
         this.client = new SlicingDice(apiKey);
         this.loadConfigTest();
@@ -53,7 +55,7 @@ public SlicingDiceTester(final String apiKey, final boolean verbose) {
     }
 
     private void loadConfigTest() {
-        this.sleepTime = 5;
+        this.sleepTime = 10;
         this.path = "src/test/java/com/slicingdice/jslicer/examples/";
         this.fileExtension = ".json";
         this.numberOfSuccesses = 0;
@@ -71,7 +73,7 @@ public void runTests(final String queryType) throws ExecutionException, Interrup
         final int numberOfTests = testData.length();
 
         this.perTestInsertion = testData.getJSONObject(0).has("insert");
-        if (!this.perTestInsertion) {
+        if (!this.perTestInsertion && this.insertSqlData) {
             final JSONArray insertionData = this.loadInsertionData(queryType);
             for (final Object insertCommand : insertionData) {
                 this.client.insert((JSONObject) insertCommand).get();
@@ -190,13 +192,13 @@ private void createColumns(final JSONObject columnObject) {
      * @param column the column to put timestamp
      */
     private void addTimestampToColumnName(final JSONObject column) {
-        final String oldName = "\"" + column.getString("api-name");
+        final String oldName = "\"" + column.getString("api-name") + "\"";
 
         final String timestamp = this.getTimestamp();
         column.put("name", column.get("name") + timestamp);
         column.put("api-name", column.get("api-name") + timestamp);
 
-        final String newName = "\"" + column.getString("api-name");
+        final String newName = "\"" + column.getString("api-name") + "\"";
         this.columnTranslation.put(oldName, newName);
     }
 
@@ -365,8 +367,13 @@ private void compareResult(final JSONObject expectedObject, final String queryTy
 
                 System.out.println(String.format("\tExpected: \"%1$s\": %2$s", keyStr,
                         expected.getJSONObject(keyStr).toString()));
-                System.out.println(String.format("\tResult: \"%1$s\": %2$s", keyStr,
-                        result.getJSONObject(keyStr).toString()));
+                try {
+                    System.out.println(String.format("\tResult: \"%1$s\": %2$s", keyStr,
+                            result.getJSONObject(keyStr).toString()));
+                } catch (final Exception e) {
+                    System.out.println(String.format("\tResult: \"%1$s\": %2$s", keyStr,
+                            e.getMessage()));
+                }
                 System.out.println("\tStatus: Failed\n");
                 return;
             } else {
@@ -403,7 +410,7 @@ private boolean testSecondTime(final JSONObject expectedObject, final String que
                 System.out.println("\tStatus: Passed\n");
                 return true;
             }
-        } catch (ExecutionException | InterruptedException e) {
+        } catch (final Exception e) {
             e.printStackTrace();
         }
 
@@ -497,7 +504,7 @@ private boolean compareJsonValue(final Object valueExpected, final Object valueG
                 }
                 return true;
             }
-        } catch (final ClassCastException e) {
+        } catch (final Exception e) {
             return false;
         }