LPS-144246 Fix test: SessionClicks reads portal properties as constants at class initialization, so the test cases must run in new env.

Author: dantewang

portal-impl/test/unit/com/liferay/portal/kernel/util/SessionClicksTest.java

@@ -17,9 +17,10 @@
 import com.liferay.portal.kernel.portlet.PortalPreferences;
 import com.liferay.portal.kernel.portlet.PortletPreferencesFactory;
 import com.liferay.portal.kernel.portlet.PortletPreferencesFactoryUtil;
+import com.liferay.portal.kernel.test.rule.NewEnv;
+import com.liferay.portal.kernel.test.util.PropsTestUtil;
 import com.liferay.portal.kernel.test.util.RandomTestUtil;
 import com.liferay.portal.test.rule.LiferayUnitTestRule;
-import com.liferay.portal.test.rule.PortalProps;
 import com.liferay.portlet.PortalPreferencesImpl;
 
 import java.util.List;
@@ -38,18 +39,25 @@
 /**
  * @author Dante Wang
  */
+@NewEnv(type = NewEnv.Type.CLASSLOADER)
 public class SessionClicksTest {
 
 	@ClassRule
 	@Rule
 	public static final LiferayUnitTestRule liferayUnitTestRule =
 		LiferayUnitTestRule.INSTANCE;
 
-	@PortalProps(
-		properties = PropsKeys.SESSION_CLICKS_MAX_ALLOWED_VALUES + "=" + _MAX_ALLOWED_VALUES
-	)
 	@Test
 	public void testPutMaxAllowedValues() {
+		PropsTestUtil.setProps(
+			HashMapBuilder.<String, Object>put(
+				PropsKeys.SESSION_CLICKS_MAX_ALLOWED_VALUES,
+				String.valueOf(_MAX_ALLOWED_VALUES)
+			).put(
+				PropsKeys.SESSION_CLICKS_MAX_SIZE_TERMS,
+				String.valueOf(Integer.MAX_VALUE)
+			).build());
+
 		PortalPreferences portalPreferences = new PortalPreferencesImpl();
 
 		PortletPreferencesFactoryUtil portletPreferencesFactoryUtil =
@@ -106,11 +114,17 @@ public void testPutMaxAllowedValues() {
 			attributeNames.size());
 	}
 
-	@PortalProps(
-		properties = PropsKeys.SESSION_CLICKS_MAX_SIZE_TERMS + "=" + _MAX_SIZE_TERMS
-	)
 	@Test
 	public void testPutMaxSizeTerms() {
+		PropsTestUtil.setProps(
+			HashMapBuilder.<String, Object>put(
+				PropsKeys.SESSION_CLICKS_MAX_ALLOWED_VALUES,
+				String.valueOf(Integer.MAX_VALUE)
+			).put(
+				PropsKeys.SESSION_CLICKS_MAX_SIZE_TERMS,
+				String.valueOf(_MAX_SIZE_TERMS)
+			).build());
+
 		HttpSession httpSession = new MockHttpSession();
 
 		String key = RandomTestUtil.randomString(_MAX_SIZE_TERMS - 1);