From 4698024bebe453236dd9a093f27de57b8766a05b Mon Sep 17 00:00:00 2001
From: Thomas Zurkan <thomas.zurkan@optimizely.com>
Date: Mon, 7 May 2018 16:04:22 -0700
Subject: [PATCH] getting tests to run in ide

---
 build.gradle                                                  | 4 ++--
 .../java/com/optimizely/ab/bucketing/DecisionService.java     | 4 ++--
 .../test/java/com/optimizely/ab/internal/LogbackVerifier.java | 4 ++--
 gradle.properties                                             | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0d6ebc9f0..605826e37 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,8 +50,8 @@ subprojects {
     apply plugin: 'me.champeau.gradle.jmh'
     apply plugin: 'nebula.optional-base'
 
-    sourceCompatibility = 1.6
-    targetCompatibility = 1.6
+    sourceCompatibility = 1.7
+    targetCompatibility = 1.7
 
     repositories {
         jcenter()
diff --git a/core-api/src/main/java/com/optimizely/ab/bucketing/DecisionService.java b/core-api/src/main/java/com/optimizely/ab/bucketing/DecisionService.java
index 2e8ffa9a1..e75891895 100644
--- a/core-api/src/main/java/com/optimizely/ab/bucketing/DecisionService.java
+++ b/core-api/src/main/java/com/optimizely/ab/bucketing/DecisionService.java
@@ -82,7 +82,7 @@ public DecisionService(@Nonnull Bucketer bucketer,
                                             @Nonnull String userId,
                                             @Nonnull Map<String, String> filteredAttributes) {
 
-        if (!ExperimentUtils.isExperimentActive(experiment)) {
+        if (experiment == null || !ExperimentUtils.isExperimentActive(experiment)) {
             return null;
         }
 
@@ -104,7 +104,7 @@ public DecisionService(@Nonnull Bucketer bucketer,
         if (userProfileService != null) {
             try {
                 Map<String, Object> userProfileMap = userProfileService.lookup(userId);
-                if (userProfileMap == null) {
+                if (userProfileMap == null || userProfileMap.isEmpty()) {
                     logger.info("We were unable to get a user profile map from the UserProfileService.");
                 } else if (UserProfileUtils.isValidUserProfileMap(userProfileMap)) {
                     userProfile = UserProfileUtils.convertMapToUserProfile(userProfileMap);
diff --git a/core-api/src/test/java/com/optimizely/ab/internal/LogbackVerifier.java b/core-api/src/test/java/com/optimizely/ab/internal/LogbackVerifier.java
index 3ce4f39a7..16fd0029c 100644
--- a/core-api/src/test/java/com/optimizely/ab/internal/LogbackVerifier.java
+++ b/core-api/src/test/java/com/optimizely/ab/internal/LogbackVerifier.java
@@ -81,8 +81,8 @@ private void verify() throws Throwable {
         for (final ExpectedLogEvent expectedEvent : expectedEvents) {
             Mockito.verify(appender, expectedEvent.times).doAppend(argThat(new ArgumentMatcher<ILoggingEvent>() {
                 @Override
-                public boolean matches(final Object argument) {
-                    return expectedEvent.matches((ILoggingEvent) argument);
+                public boolean matches(final ILoggingEvent argument) {
+                    return expectedEvent.matches(argument);
                 }
             }));
         }
diff --git a/gradle.properties b/gradle.properties
index f5ac305dc..d1823bdc4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,4 +24,4 @@ findbugsVersion = 3.0.1
 
 # Test Packages
 junitVersion = 4.12
-mockitoVersion = 1.10.19
+mockitoVersion = 2.11.0