feature: convert test app to kotlin (#331)

* convert test app to kotlin

* working copy

* example after event

* make sure to add callback

* take out that silly test

* update for release

* fix logging

* let job scheduler do throttle of datafile time instead of us

* update gradle

* upgrading gradle

* update more memory for travis

* add gradle properties file for travis

* fix data loader test

Author: thomaszurkan-optimizely

android-sdk/build.gradle

@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2016, Optimizely, Inc. and contributors                        *
+ * Copyright 2016-2020, Optimizely, Inc. and contributors                        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -15,6 +15,8 @@
  ***************************************************************************/
 
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 apply plugin: 'maven'
 apply plugin: 'maven-publish'
 
@@ -86,6 +88,7 @@ dependencies {
     androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
     androidTestImplementation "com.google.code.gson:gson:$gson_ver"
     androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 uploadArchives {
@@ -140,3 +143,4 @@ android.libraryVariants.all { variant ->
     }
     project.artifacts.add("archives", tasks["${variant.name}SourcesJar"]);
 }
+

android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyManager.java

@@ -888,10 +888,10 @@ public OptimizelyManager build(Context context) {
 
             if (datafileDownloadInterval > 0) {
                 // JobScheduler API doesn't allow intervals less than 15 minutes
-                if (datafileDownloadInterval < 900) {
-                    datafileDownloadInterval = 900;
-                    logger.warn("Minimum datafile polling interval is 15 minutes. Defaulting to 15 minutes.");
-                }
+//                if (datafileDownloadInterval < 900) {
+//                    datafileDownloadInterval = 900;
+//                    logger.warn("Minimum datafile polling interval is 15 minutes. Defaulting to 15 minutes.");
+//                }
             }
 
             if (datafileConfig == null) {

android-sdk/src/test/java/com/optimizely/ab/android/sdk/OptimizelyManagerBuilderTest.java

@@ -53,16 +53,16 @@ public class OptimizelyManagerBuilderTest {
      * Verify that building the {@link OptimizelyManager} with a polling interval less than 60
      * seconds defaults to 60 seconds.
      */
-    @Test
-    public void testBuildWithInvalidPollingInterval() {
-        Context appContext = mock(Context.class);
-        when(appContext.getApplicationContext()).thenReturn(appContext);
-        OptimizelyManager manager = OptimizelyManager.builder("1")
-                .withDatafileDownloadInterval(5L)
-                .build(appContext);
-
-        assertEquals(900L, manager.getDatafileDownloadInterval().longValue());
-    }
+//    @Test
+//    public void testBuildWithInvalidPollingInterval() {
+//        Context appContext = mock(Context.class);
+//        when(appContext.getApplicationContext()).thenReturn(appContext);
+//        OptimizelyManager manager = OptimizelyManager.builder("1")
+//                .withDatafileDownloadInterval(5L)
+//                .build(appContext);
+//
+//        assertEquals(900L, manager.getDatafileDownloadInterval().longValue());
+//    }
 
     /**
      * Verify that building the {@link OptimizelyManager} with a polling interval greater than 60

android-sdk/src/test/java/com/optimizely/ab/android/sdk/OptimizelyManagerIntervalTest.java

@@ -117,23 +117,6 @@ public void testBuildWithDatafileDownloadIntervalDeprecated() throws Exception {
                 any(NotificationCenter.class));
     }
 
-    @Test
-    public void testBuildWithInvalidDatafileDownloadInterval() {
-        Context appContext = mock(Context.class);
-        Logger logger = mock(Logger.class);
-        when(appContext.getApplicationContext()).thenReturn(appContext);
-
-        long tooSmallNumber = 60;
-        OptimizelyManager manager = OptimizelyManager.builder("1")
-                .withLogger(logger)
-                .withDatafileDownloadInterval(tooSmallNumber, TimeUnit.SECONDS)
-                .build(appContext);
-
-        verify(logger).warn("Minimum datafile polling interval is 15 minutes. Defaulting to 15 minutes.");
-    }
-
-    // EventDispatchInterval
-
     @Test
     public void testBuildWithEventDispatchInterval() throws Exception {
         whenNew(OptimizelyManager.class).withAnyArguments().thenReturn(mock(OptimizelyManager.class));

build.gradle

@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2016-2017, Optimizely, Inc. and contributors                   *
+ * Copyright 2016-2020, Optimizely, Inc. and contributors                   *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -17,6 +17,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.3.72'
     def bintray_user = System.getenv('BINTRAY_USER')
     def bintray_api_key = System.getenv('BINTRAY_API_KEY')
     def version_name = System.getenv('TRAVIS_TAG')
@@ -34,7 +35,8 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -45,6 +47,7 @@ allprojects {
     repositories {
         jcenter()
         google()
+        mavenCentral()
         // Uncomment the next line to use maven locally
         //mavenLocal()
     }

datafile-handler/build.gradle

@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2016, Optimizely, Inc. and contributors                        *
+ * Copyright 2016-2020, Optimizely, Inc. and contributors                        *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -15,6 +15,8 @@
  ***************************************************************************/
 
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 apply plugin: 'maven'
 apply plugin: 'maven-publish'
 
@@ -72,6 +74,7 @@ dependencies {
     androidTestImplementation "com.crittercism.dexmaker:dexmaker-mockito:$dexmaker_ver"
     androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
     androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 uploadArchives {
@@ -127,3 +130,4 @@ android.libraryVariants.all { variant ->
     project.artifacts.add("archives", tasks["${variant.name}SourcesJar"]);
 }
 
+

datafile-handler/src/androidTest/java/com/optimizely/ab/android/datafile_handler/DatafileLoaderTest.java

@@ -242,15 +242,15 @@ public void debugLoggedMultiThreaded() throws IOException {
         when(cache.load(datafileCache.getFileName())).thenReturn("{}");
         when(cache.save(datafileCache.getFileName(), "{}")).thenReturn(true);
 
+        datafileLoader.getDatafile("debugLoggedMultiThreaded", datafileLoadedListener);
+
         Runnable r = () -> datafileLoader.getDatafile("debugLoggedMultiThreaded", datafileLoadedListener);
 
         new Thread(r).start();
         new Thread(r).start();
         new Thread(r).start();
         new Thread(r).start();
 
-        datafileLoader.getDatafile("debugLoggedMultiThreaded", datafileLoadedListener);
-
         try {
             executor.awaitTermination(5, TimeUnit.SECONDS);
         } catch (InterruptedException e) {

event-handler/build.gradle

@@ -15,6 +15,8 @@
  ***************************************************************************/
 
 apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 apply plugin: 'maven'
 apply plugin: 'maven-publish'
 
@@ -73,6 +75,7 @@ dependencies {
     androidTestImplementation "com.crittercism.dexmaker:dexmaker-mockito:$dexmaker_ver"
     androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
     androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 
 uploadArchives {
@@ -128,3 +131,4 @@ android.libraryVariants.all { variant ->
     project.artifacts.add("archives", tasks["${variant.name}SourcesJar"]);
 }
 
+

gradle.properties

@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx1g

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Mon Feb 11 13:52:51 PST 2019
+#Tue Jul 07 16:56:21 EDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+org.gradle.jvmargs=-Xmx1g