2424import static org .apache .commons .lang3 .StringUtils .trimToNull ;
2525
2626/**
27- * Base test class for tests that setup data and configure a server then verify the persistence or modification of those
28- * data and configurations after upgrading to a newer version of LabKey.<br>
29- * The {@code EariestVersion } and {@code LatestVersion} annotations can be used to skip particular tests when they are
27+ * Base test class for tests that set up data and configure a server, then verify the persistence or modification of
28+ * those data and configurations after upgrading to a newer version of LabKey.<br>
29+ * The {@link EarliestVersion } and {@link LatestVersion} annotations can be used to skip particular tests when they are
3030 * not relevant to the version of LabKey being upgraded from (specified in the {@code webtest.upgradePreviousVersion}
3131 * system property).<br>
3232 * The setup steps will be skipped if the {@code webtest.upgradeSetup} system property is set to {@code false}.
@@ -77,7 +77,8 @@ public List<String> getAssociatedModules()
7777 */
7878 @ Retention (RetentionPolicy .RUNTIME )
7979 @ Target ({ElementType .METHOD })
80- protected @interface EariestVersion {
80+ protected @interface EarliestVersion
81+ {
8182 String value ();
8283 }
8384
@@ -98,12 +99,12 @@ private static class UpgradeVersionCheck implements TestRule
9899 @ Override
99100 public @ NotNull Statement apply (Statement base , Description description )
100101 {
101- String eariestVersion = Optional .ofNullable (description .getAnnotation (EariestVersion .class ))
102- .map (EariestVersion ::value ).orElse (null );
102+ String earliestVersion = Optional .ofNullable (description .getAnnotation (EarliestVersion .class ))
103+ .map (EarliestVersion ::value ).orElse (null );
103104 String latestVersion = Optional .ofNullable (description .getAnnotation (LatestVersion .class ))
104105 .map (LatestVersion ::value ).orElse (null );
105106
106- if (isUpgradeSetupPhase || previousVersion == null || (eariestVersion == null && latestVersion == null ))
107+ if (isUpgradeSetupPhase || previousVersion == null || (earliestVersion == null && latestVersion == null ))
107108 {
108109 return base ; // Run the test normally
109110 }
@@ -114,7 +115,7 @@ private static class UpgradeVersionCheck implements TestRule
114115 public void evaluate () throws Throwable
115116 {
116117 Assume .assumeTrue ("Test doesn't support upgrading from version: " + previousVersion ,
117- VersionRange .versionRange (eariestVersion , latestVersion ).contains (previousVersion )
118+ VersionRange .versionRange (earliestVersion , latestVersion ).contains (previousVersion )
118119 );
119120 base .evaluate ();
120121 }
0 commit comments