TargetedMSSampleManagerIntegrationTest update to check for LKSM and LIMS product configuration cases (#2478)

- Move ProductKey and setProductConfiguration helpers to BaseWebDriverTest from SMBaseTest

Author: cnathe

src/org/labkey/test/LabKeySiteWrapper.java

@@ -49,6 +49,7 @@
 import org.labkey.test.components.core.ProjectMenu;
 import org.labkey.test.components.core.login.SetPasswordForm;
 import org.labkey.test.components.dumbster.EmailRecordTable;
+import org.labkey.test.components.html.RadioButton;
 import org.labkey.test.components.html.SiteNavBar;
 import org.labkey.test.components.ui.navigation.UserMenu;
 import org.labkey.test.pages.core.admin.CustomizeSitePage;
@@ -112,6 +113,15 @@ public abstract class LabKeySiteWrapper extends WebDriverWrapper
     private static final String CLIENT_SIDE_ERROR = "Client exception detected";
     public final APIUserHelper _userHelper = new APIUserHelper(this);
 
+    public enum ProductKey
+    {
+        sampleManagerStarter,
+        sampleManagerProfessional,
+        labkeyLims,
+        limsStarter,
+        limsEnterprise,
+    }
+
     public boolean isGuestModeTest()
     {
         return false;
@@ -1693,4 +1703,51 @@ public String getConversionErrorMessage(Object value, String fieldName, Class<?>
 
         return "Could not convert value '" + value + "' (" + value.getClass().getSimpleName() + ") for " + fieldType + " field '" + fieldName + "'" ;
     }
+
+    private ProductKey getProductConfiguration() throws IOException, CommandException
+    {
+        SimpleGetCommand command = new SimpleGetCommand("admin", "productFeature");
+        var resp = command.execute(createDefaultConnection(), "/");
+        String keyString = resp.getProperty("productKey");
+        if (keyString == null)
+            return null;
+
+        return ProductKey.valueOf(keyString);
+    }
+
+    protected ProductKey setProductConfigurationViaApi(@Nullable ProductKey productKey) throws IOException, CommandException
+    {
+        ProductKey existing = getProductConfiguration();
+        log("Setting product key to " + (productKey == null ? "null" : productKey));
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("productKey", productKey == null ? null : productKey.toString());
+
+        SimplePostCommand command = new SimplePostCommand("admin", "productfeature");
+        command.setParameters(parameters);
+        var resp = command.execute(createDefaultConnection(), "/");
+        if (resp.getStatusCode() == 200)
+            log("Successfully updated product key.");
+        else
+            throw new CommandException("Failed to set product key.");
+        return existing;
+    }
+
+    /**
+     * Goes to the Admin / Product Configuration page and selects the designated product. Will navigate back to current URL.
+     *
+     */
+    protected void setProductConfiguration(ProductKey productKey)
+    {
+        if (productKey == null)
+            return;
+
+        String currentUrl = getCurrentRelativeURL();
+
+        goToAdminConsole();
+        clickAndWait(Locator.linkWithText("product configuration"));
+        RadioButton radioButton = new RadioButton.RadioButtonFinder().withValue(productKey.name()).find(getDriver());
+        radioButton.check();
+
+        beginAt(currentUrl);
+    }
 }

src/org/labkey/test/WebDriverWrapper.java

@@ -769,20 +769,11 @@ public List<String> getFormAddresses()
         return (List<String>) executeScript(js);
     }
 
-    public String getCurrentRelativeURL()
-    {
-        return getCurrentRelativeURL(true);
-    }
-
     /**
      * Get the relative URL for the current page. The host, port, and context path are removed.
-     * Trailing '?' will be removed (optionally) to make comparisons more consistent when enabling the 'noQuestionMarkUrl' experimental feature.
-     * Leaving the trailing question mark can be useful when comparing to a URL generated by 'URLBuilder' because it
-     * knows about the experimental feature.
-     * @param stripTrailingQuestionMark false to leave it if it exists.
      * @return The relative URL or 'null' if the browser is not currently showing the server under test.
      */
-    public String getCurrentRelativeURL(boolean stripTrailingQuestionMark)
+    public String getCurrentRelativeURL()
     {
         URL url = getURL();
         String urlString = getDriver().getCurrentUrl();
@@ -798,18 +789,6 @@ public String getCurrentRelativeURL(boolean stripTrailingQuestionMark)
             TestLogger.warn("Expected URL to begin with " + baseURL + ", but found " + urlString);
             return null;
         }
-        if (stripTrailingQuestionMark)
-        {
-            // Strip '?' if no query
-            if (urlString.contains("#"))
-            {
-                urlString = urlString.replace("?#", "#");
-            }
-            else
-            {
-                urlString = StringUtils.stripEnd(urlString, "?");
-            }
-        }
         return urlString.substring(baseURL.length());
     }
 

src/org/labkey/test/tests/list/ListTest.java

@@ -2069,7 +2069,7 @@ public void customizeURLTest()
             assertElementPresent(inputWithValue("key","1"));
             assertElementPresent(inputWithValue("table","C"));
             assertElementPresent(inputWithValue("title","one C"));
-            assertTrue(getCurrentRelativeURL(false).contains(WebTestHelper.buildRelativeUrl("junit", PROJECT_VERIFY, "echoForm")));
+            assertTrue(getCurrentRelativeURL().contains(WebTestHelper.buildRelativeUrl("junit", PROJECT_VERIFY, "echoForm")));
         }
         popLocation();
     }