Merge branch 'main' into 2898/build-once-test-all

mockito · Jun 6, 2023 · e5f4c44 · e5f4c44
2 parents eb3681f + be98090
commit e5f4c44
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.diffplug.spotless' version '6.18.0'
+    id 'com.diffplug.spotless' version '6.19.0'
     id 'eclipse'
     id 'com.github.ben-manes.versions' version '0.46.0'
     id 'biz.aQute.bnd.builder' version '6.4.0'

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -4,7 +4,7 @@ ext {
 
 def versions = [:]
 
-versions.bytebuddy = '1.14.4'
+versions.bytebuddy = '1.14.5'
 versions.junitJupiter = '5.9.3'
 versions.errorprone = '2.19.1'
 
@@ -24,7 +24,7 @@ libraries.bytebuddyandroid = "net.bytebuddy:byte-buddy-android:${versions.bytebu
 libraries.errorprone = "com.google.errorprone:error_prone_core:${versions.errorprone}"
 libraries.errorproneTestApi = "com.google.errorprone:error_prone_test_helpers:${versions.errorprone}"
 
-libraries.autoservice = "com.google.auto.service:auto-service:1.0.1"
+libraries.autoservice = "com.google.auto.service:auto-service:1.1.0"
 
 libraries.objenesis = 'org.objenesis:objenesis:3.3'
 

diff --git a/src/main/java/org/mockito/internal/stubbing/DoAnswerStyleStubbing.java b/src/main/java/org/mockito/internal/stubbing/DoAnswerStyleStubbing.java
@@ -25,7 +25,7 @@ void setAnswers(List<Answer<?>> answers, Strictness stubbingStrictness) {
     }
 
     boolean isSet() {
-        return answers.isEmpty();
+        return answers.size() > 0;
     }
 
     void clear() {

diff --git a/src/main/java/org/mockito/internal/stubbing/InvocationContainerImpl.java b/src/main/java/org/mockito/internal/stubbing/InvocationContainerImpl.java
@@ -110,7 +110,7 @@ public void setAnswersForStubbing(List<Answer<?>> answers, Strictness strictness
     }
 
     public boolean hasAnswersForStubbing() {
-        return !doAnswerStyleStubbing.isSet();
+        return doAnswerStyleStubbing.isSet();
     }
 
     public boolean hasInvocationForPotentialStubbing() {