Change-Id: I2eed6d907be299ebca3e69d7f492aff6f1244fe4tags/7.5.0.rc1
@@ -243,7 +243,9 @@ public final class CvalChecker { | |||
String msg = ""; | |||
int majorVers = computeMajorVersion(version); | |||
if (info != null && info.getMessage() != null) { | |||
if (info != null && !info.isValidVersion(majorVers)) { | |||
msg = getErrorMessage("invalid", title, majorVers); | |||
} else if (info != null && info.getMessage() != null) { | |||
msg = info.getMessage().replace("\\n", "\n"); | |||
} else if (info != null && info.isLicenseExpired()) { | |||
String type = "evaluation".equals(info.getType()) ? "Evaluation license" |
@@ -26,6 +26,7 @@ import static com.vaadin.tools.CvalChecker.deleteCache; | |||
import static com.vaadin.tools.CvalChecker.parseJson; | |||
import static org.junit.Assert.assertEquals; | |||
import static org.junit.Assert.assertNull; | |||
import static org.junit.Assert.assertTrue; | |||
import java.io.ByteArrayOutputStream; | |||
import java.io.File; | |||
@@ -198,6 +199,7 @@ public class CvalCheckerTest { | |||
Assert.fail(); | |||
} catch (InvalidCvalException expected) { | |||
assertEquals(productNameCval, expected.name); | |||
assertTrue(expected.getMessage().contains("is not valid")); | |||
} | |||
Assert.assertFalse(cacheExists(productNameCval)); | |||