fix(spdx-utils): Fix offersChoice() for equal OR-operands

If there is a "choice" between "a" or "a", that is not really a choice.

Signed-off-by: Sebastian Schuberth <[email protected]>

utils/spdx/src/main/kotlin/SpdxExpression.kt

@@ -164,7 +164,7 @@ sealed class SpdxExpression {
      * Return true if this expression offers a license choice. This can only be true if this expression contains the
      * [OR operator][SpdxOperator.OR].
      */
-    open fun offersChoice(): Boolean = false
+    fun offersChoice(): Boolean = validChoices().size > 1
 
     /**
      * Apply a license [choice], optionally limited to the given [subExpression], and return an [SpdxExpression] where
@@ -332,12 +332,6 @@ class SpdxCompoundExpression(
             }
         }
 
-    override fun offersChoice(): Boolean =
-        when (operator) {
-            SpdxOperator.OR -> true
-            SpdxOperator.AND -> children.any { it.offersChoice() }
-        }
-
     override fun applyChoice(choice: SpdxExpression, subExpression: SpdxExpression): SpdxExpression {
         if (!subExpression.isSubExpression(choice)) {
             throw InvalidLicenseChoiceException(

utils/spdx/src/test/kotlin/SpdxExpressionChoiceTest.kt

@@ -286,6 +286,10 @@ class SpdxExpressionChoiceTest : WordSpec({
             "a AND b".toSpdx().offersChoice() shouldBe false
             "a AND b AND c".toSpdx().offersChoice() shouldBe false
         }
+
+        "return false if the expression contains the OR operator with equal operands" {
+            "a OR a".toSpdx().offersChoice() shouldBe false
+        }
     }
 
     "validChoices()" should {