Skip to content

Commit e14473c

Browse files
committed
isSingleToken return false for null and empty strings
1 parent dc1235a commit e14473c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/main/java/org/spdx/utility/compare/LicenseCompareHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@ public static String locateOriginalText(String fullLicenseText, int startToken,
238238
* {@code false} otherwise.
239239
*/
240240
public static boolean isSingleTokenString(@Nullable String text) {
241-
if (text == null || text.isEmpty()) {
242-
return true; // Zero tokens is considered a single token string
241+
if (text == null || text.trim().isEmpty()) {
242+
return false;
243243
}
244244
Matcher m = LicenseTextHelper.TOKEN_SPLIT_PATTERN.matcher(text);
245245
boolean found = false;

src/test/java/org/spdx/utility/compare/LicenseCompareHelperTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -542,10 +542,10 @@ public void testLicenseEqualsNoneLicense() throws InvalidSPDXAnalysisException,
542542
}
543543

544544
public void testisSingleTokenString() {
545-
assertTrue(LicenseCompareHelper.isSingleTokenString(null));
546-
assertTrue(LicenseCompareHelper.isSingleTokenString(""));
547-
assertTrue(LicenseCompareHelper.isSingleTokenString(" "));
548-
assertTrue(LicenseCompareHelper.isSingleTokenString("\n"));
545+
assertFalse(LicenseCompareHelper.isSingleTokenString(null));
546+
assertFalse(LicenseCompareHelper.isSingleTokenString(""));
547+
assertFalse(LicenseCompareHelper.isSingleTokenString(" "));
548+
assertFalse(LicenseCompareHelper.isSingleTokenString("\n"));
549549
assertTrue(LicenseCompareHelper.isSingleTokenString("'"));
550550
assertTrue(LicenseCompareHelper.isSingleTokenString(" '"));
551551
assertTrue(LicenseCompareHelper.isSingleTokenString("' "));

0 commit comments

Comments
 (0)