Merge pull request #18 from ReallySmallSoftware/fix/querySnapshotLog

Various small fixes

Author: ReallySmallSoftware

src/android/test/uk/co/reallysmall/cordova/plugin/firestore/LimitQueryHandlerTest.java

@@ -0,0 +1,33 @@
+package uk.co.reallysmall.cordova.plugin.firestore;
+
+import com.google.firebase.firestore.Query;
+
+import org.junit.Test;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+public class LimitQueryHandlerTest {
+    LimitQueryHandler limitQueryHandler = new LimitQueryHandler();
+
+    Query query = mock(Query.class);
+
+
+    @Test
+    public void testShouldHandleStringArgument() {
+        limitQueryHandler.handle(query, "10");
+        verify(query).limit(10);
+    }
+
+    @Test
+    public void testShouldHandleIntArgument() {
+        limitQueryHandler.handle(query, 10);
+        verify(query).limit(10);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testShouldThrowIllegalArgumentExceptiononArrayArgument() {
+        limitQueryHandler.handle(query, new String[5]);
+    }
+}
+

src/android/uk/co/reallysmall/cordova/plugin/firestore/FirestoreLog.java

@@ -20,33 +20,35 @@ public static void setLogLevel(String logLevel) {
         _logLevel = Log.WARN;
         break;
       default:
-        FirestoreLog.w(FirestorePlugin.TAG, "New logLevel unknown, leaving previous setting : " + _logLevel);
+        FirestoreLog.e(FirestorePlugin.TAG, "New logLevel unknown, leaving previous setting : " + _logLevel);
         break;
     }
+
+    FirestoreLog.d(FirestorePlugin.TAG, "New logLevel : " + _logLevel);
   }
 
   public static void d(String TAG, String message) {
-    if (_logLevel >= Log.DEBUG) {
+    if (_logLevel <= Log.DEBUG) {
       Log.d(TAG, message);
     }
   }
   public static void w(String TAG, String message) {
-    if (_logLevel >= Log.WARN) {
+    if (_logLevel <= Log.WARN) {
       Log.w(TAG, message);
     }
   }
   public static void w(String TAG, String message, Exception e) {
-    if (_logLevel >= Log.WARN) {
+    if (_logLevel <= Log.WARN) {
       Log.w(TAG, message, e);
     }
   }
   public static void e(String TAG, String message) {
-    if (_logLevel >= Log.ERROR) {
+    if (_logLevel <= Log.ERROR) {
       Log.e(TAG, message);
     }
   }
   public static void e(String TAG, String message, Exception e) {
-    if (_logLevel >= Log.ERROR) {
+    if (_logLevel <= Log.ERROR) {
       Log.e(TAG, message, e);
     }
   }

src/android/uk/co/reallysmall/cordova/plugin/firestore/LimitQueryHandler.java

@@ -6,6 +6,16 @@
 public class LimitQueryHandler implements QueryHandler {
     @Override
     public Query handle(Query query, Object limit) {
-        return query.limit(Long.parseLong((String) limit));
+        System.out.println("Type of limit " + limit.getClass().getName());
+        Long longLimit;
+        if (limit instanceof String) {
+            longLimit = Long.parseLong((String) limit);
+        } else if(limit instanceof Number) {
+            longLimit = ((Number) limit).longValue();
+        } else {
+            throw new IllegalArgumentException("Limit should be instanceof String or Number, got : " + limit.getClass().getName());
+        }
+
+        return query.limit(longLimit);
     }
 }

www/android_ios/document_reference.test.js

@@ -22,7 +22,6 @@ describe('DocumentReference', () => {
   describe('collection', () => {
     it('should return a CollectionReference with proper path', () => {
 
-      console.log('What is document_reference in test', typeof DocumentReference);
       const subCollectionRef = (parentDocRef).collection(subCollection);
       expect(subCollectionRef).toBeInstanceOf(CollectionReference);
       expect(subCollectionRef.path).toBe('root/parent/sub');

www/android_ios/query_snapshot.js

@@ -1,7 +1,6 @@
 var QueryDocumentSnapshot = require('./query_document_snapshot');
 
 function QuerySnapshot(data) {
-  console.log('building query_snapshot', data);
   this._data = data;
 }