Skip to content

Commit

Permalink
LPS-75087 Moves tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@ealonso @brianchandotcom
ealonso authored and brianchandotcom committed Oct 7, 2017
1 parent 28a9a30 commit 2dcb43a
Show file tree
Hide file tree
Showing 23 changed files with 49 additions and 31 deletions.
2 changes: 1 addition & 1 deletion ...ppolicy/BaseMembershipPolicyTestCase.java → .../policy/BaseMembershipPolicyTestCase.java
View file
Expand Up @@ -12,7 +12,7 @@
* details.
*/

package com.liferay.portal.security.membershippolicy;
package com.liferay.portal.security.membership.policy;

import com.liferay.portal.kernel.model.Group;
import com.liferay.portal.kernel.model.User;
Expand Down
5 changes: 3 additions & 2 deletions ...OrganizationMembershipPolicyTestCase.java → ...OrganizationMembershipPolicyTestCase.java
View file
Expand Up @@ -12,7 +12,7 @@
* details.
*/

package com.liferay.portal.security.membershippolicy;
package com.liferay.portal.security.membership.policy.organization;

import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.model.Organization;
Expand All @@ -23,7 +23,8 @@
import com.liferay.portal.kernel.test.rule.DeleteAfterTestRun;
import com.liferay.portal.kernel.test.util.OrganizationTestUtil;
import com.liferay.portal.kernel.test.util.RoleTestUtil;
import com.liferay.portal.security.membershippolicy.samples.TestOrganizationMembershipPolicy;
import com.liferay.portal.security.membership.policy.BaseMembershipPolicyTestCase;
import com.liferay.portal.security.membership.policy.organization.samples.TestOrganizationMembershipPolicy;
import com.liferay.registry.Registry;
import com.liferay.registry.RegistryUtil;
import com.liferay.registry.ServiceRegistration;
Expand Down
4 changes: 2 additions & 2 deletions ...les/TestOrganizationMembershipPolicy.java → ...les/TestOrganizationMembershipPolicy.java
View file
Expand Up @@ -12,7 +12,7 @@
* details.
*/

package com.liferay.portal.security.membershippolicy.samples;
package com.liferay.portal.security.membership.policy.organization.samples;

import com.liferay.asset.kernel.model.AssetCategory;
import com.liferay.asset.kernel.model.AssetTag;
Expand All @@ -23,7 +23,7 @@
import com.liferay.portal.kernel.security.membershippolicy.BaseOrganizationMembershipPolicy;
import com.liferay.portal.kernel.security.membershippolicy.MembershipPolicyException;
import com.liferay.portal.kernel.util.ArrayUtil;
import com.liferay.portal.security.membershippolicy.BaseOrganizationMembershipPolicyTestCase;
import com.liferay.portal.security.membership.policy.organization.BaseOrganizationMembershipPolicyTestCase;

import java.io.Serializable;

Expand Down
3 changes: 2 additions & 1 deletion ...rganizationMembershipPolicyBasicTest.java → ...rganizationMembershipPolicyBasicTest.java
View file
Expand Up @@ -12,10 +12,11 @@
* details.
*/

package com.liferay.portal.security.membershippolicy;
package com.liferay.portal.security.membership.policy.organization.test;

import com.liferay.portal.kernel.security.membershippolicy.OrganizationMembershipPolicyUtil;
import com.liferay.portal.kernel.test.rule.AggregateTestRule;
import com.liferay.portal.security.membership.policy.organization.BaseOrganizationMembershipPolicyTestCase;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;

import org.junit.Assert;
Expand Down
3 changes: 2 additions & 1 deletion ...ationMembershipPolicyMembershipsTest.java → ...ationMembershipPolicyMembershipsTest.java
View file
Expand Up @@ -12,7 +12,7 @@
* details.
*/

package com.liferay.portal.security.membershippolicy;
package com.liferay.portal.security.membership.policy.organization.test;

import com.liferay.expando.kernel.service.ExpandoTableLocalServiceUtil;
import com.liferay.portal.kernel.model.Organization;
Expand All @@ -26,6 +26,7 @@
import com.liferay.portal.kernel.test.util.ServiceContextTestUtil;
import com.liferay.portal.kernel.test.util.TestPropsValues;
import com.liferay.portal.kernel.util.ArrayUtil;
import com.liferay.portal.security.membership.policy.organization.BaseOrganizationMembershipPolicyTestCase;
import com.liferay.portal.security.membershippolicy.util.test.MembershipPolicyTestUtil;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;

Expand Down
3 changes: 2 additions & 1 deletion ...rganizationMembershipPolicyRolesTest.java → ...rganizationMembershipPolicyRolesTest.java
View file
Expand Up @@ -12,7 +12,7 @@
* details.
*/

package com.liferay.portal.security.membershippolicy;
package com.liferay.portal.security.membership.policy.organization.test;

import com.liferay.expando.kernel.service.ExpandoTableLocalServiceUtil;
import com.liferay.portal.kernel.model.Role;
Expand All @@ -29,6 +29,7 @@
import com.liferay.portal.kernel.test.rule.AggregateTestRule;
import com.liferay.portal.kernel.test.util.RandomTestUtil;
import com.liferay.portal.kernel.test.util.TestPropsValues;
import com.liferay.portal.security.membership.policy.organization.BaseOrganizationMembershipPolicyTestCase;
import com.liferay.portal.security.membershippolicy.util.test.MembershipPolicyTestUtil;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;

Expand Down
3 changes: 2 additions & 1 deletion ...zationMembershipPolicyRowCheckerTest.java → ...zationMembershipPolicyRowCheckerTest.java
View file
Expand Up @@ -12,7 +12,7 @@
* details.
*/

package com.liferay.portal.security.membershippolicy;
package com.liferay.portal.security.membership.policy.organization.test;

import com.liferay.portal.kernel.model.Organization;
import com.liferay.portal.kernel.model.Role;
Expand All @@ -22,6 +22,7 @@
import com.liferay.portal.kernel.service.UserGroupRoleLocalServiceUtil;
import com.liferay.portal.kernel.test.rule.AggregateTestRule;
import com.liferay.portal.kernel.test.util.UserTestUtil;
import com.liferay.portal.security.membership.policy.organization.BaseOrganizationMembershipPolicyTestCase;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portlet.sites.search.OrganizationRoleUserChecker;
import com.liferay.portlet.usersadmin.search.UserOrganizationChecker;
Expand Down
5 changes: 3 additions & 2 deletions ...icy/BaseRoleMembershipPolicyTestCase.java → ...ole/BaseRoleMembershipPolicyTestCase.java
View file
Expand Up @@ -12,11 +12,12 @@
* details.
*/

package com.liferay.portal.security.membershippolicy;
package com.liferay.portal.security.membership.policy.role;

import com.liferay.portal.kernel.security.membershippolicy.RoleMembershipPolicy;
import com.liferay.portal.kernel.test.util.RoleTestUtil;
import com.liferay.portal.security.membershippolicy.samples.TestRoleMembershipPolicy;
import com.liferay.portal.security.membership.policy.BaseMembershipPolicyTestCase;
import com.liferay.portal.security.membership.policy.role.samples.TestRoleMembershipPolicy;
import com.liferay.registry.Registry;
import com.liferay.registry.RegistryUtil;
import com.liferay.registry.ServiceRegistration;
Expand Down
4 changes: 2 additions & 2 deletions ...icy/samples/TestRoleMembershipPolicy.java → ...ole/samples/TestRoleMembershipPolicy.java
View file
Expand Up @@ -12,14 +12,14 @@
* details.
*/

package com.liferay.portal.security.membershippolicy.samples;
package com.liferay.portal.security.membership.policy.role.samples;

import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.model.Role;
import com.liferay.portal.kernel.security.membershippolicy.BaseRoleMembershipPolicy;
import com.liferay.portal.kernel.security.membershippolicy.MembershipPolicyException;
import com.liferay.portal.kernel.util.ArrayUtil;
import com.liferay.portal.security.membershippolicy.BaseRoleMembershipPolicyTestCase;
import com.liferay.portal.security.membership.policy.role.BaseRoleMembershipPolicyTestCase;

import java.io.Serializable;

Expand Down
3 changes: 2 additions & 1 deletion ...policy/RoleMembershipPolicyBasicTest.java → ...e/test/RoleMembershipPolicyBasicTest.java
View file
Expand Up @@ -12,10 +12,11 @@
* details.
*/

package com.liferay.portal.security.membershippolicy;
package com.liferay.portal.security.membership.policy.role.test;

import com.liferay.portal.kernel.security.membershippolicy.RoleMembershipPolicyUtil;
import com.liferay.portal.kernel.test.rule.AggregateTestRule;
import com.liferay.portal.security.membership.policy.role.BaseRoleMembershipPolicyTestCase;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;

import org.junit.Assert;
Expand Down
3 changes: 2 additions & 1 deletion ...policy/RoleMembershipPolicyRolesTest.java → ...e/test/RoleMembershipPolicyRolesTest.java
View file
Expand Up @@ -12,7 +12,7 @@
* details.
*/

package com.liferay.portal.security.membershippolicy;
package com.liferay.portal.security.membership.policy.role.test;

import com.liferay.expando.kernel.service.ExpandoTableLocalServiceUtil;
import com.liferay.portal.kernel.model.Role;
Expand All @@ -28,6 +28,7 @@
import com.liferay.portal.kernel.test.rule.AggregateTestRule;
import com.liferay.portal.kernel.test.util.RandomTestUtil;
import com.liferay.portal.kernel.test.util.TestPropsValues;
import com.liferay.portal.security.membership.policy.role.BaseRoleMembershipPolicyTestCase;
import com.liferay.portal.security.membershippolicy.util.test.MembershipPolicyTestUtil;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;

Expand Down
3 changes: 2 additions & 1 deletion ...y/RoleMembershipPolicyRowCheckerTest.java → ...t/RoleMembershipPolicyRowCheckerTest.java
View file
Expand Up @@ -12,13 +12,14 @@
* details.
*/

package com.liferay.portal.security.membershippolicy;
package com.liferay.portal.security.membership.policy.role.test;

import com.liferay.portal.kernel.model.Role;
import com.liferay.portal.kernel.model.User;
import com.liferay.portal.kernel.service.RoleLocalServiceUtil;
import com.liferay.portal.kernel.test.rule.AggregateTestRule;
import com.liferay.portal.kernel.test.util.UserTestUtil;
import com.liferay.portal.security.membership.policy.role.BaseRoleMembershipPolicyTestCase;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portlet.rolesadmin.search.SetUserRoleChecker;
import com.liferay.portlet.rolesadmin.search.UnsetUserRoleChecker;
Expand Down
5 changes: 3 additions & 2 deletions ...icy/BaseSiteMembershipPolicyTestCase.java → ...ite/BaseSiteMembershipPolicyTestCase.java
View file
Expand Up @@ -12,13 +12,14 @@
* details.
*/

package com.liferay.portal.security.membershippolicy;
package com.liferay.portal.security.membership.policy.site;

import com.liferay.portal.kernel.model.Group;
import com.liferay.portal.kernel.security.membershippolicy.SiteMembershipPolicy;
import com.liferay.portal.kernel.test.util.GroupTestUtil;
import com.liferay.portal.kernel.test.util.RoleTestUtil;
import com.liferay.portal.security.membershippolicy.samples.TestSiteMembershipPolicy;
import com.liferay.portal.security.membership.policy.BaseMembershipPolicyTestCase;
import com.liferay.portal.security.membership.policy.site.samples.TestSiteMembershipPolicy;
import com.liferay.registry.Registry;
import com.liferay.registry.RegistryUtil;
import com.liferay.registry.ServiceRegistration;
Expand Down
4 changes: 2 additions & 2 deletions ...icy/samples/TestSiteMembershipPolicy.java → ...ite/samples/TestSiteMembershipPolicy.java
View file
Expand Up @@ -12,7 +12,7 @@
* details.
*/

package com.liferay.portal.security.membershippolicy.samples;
package com.liferay.portal.security.membership.policy.site.samples;

import com.liferay.asset.kernel.model.AssetCategory;
import com.liferay.asset.kernel.model.AssetTag;
Expand All @@ -24,7 +24,7 @@
import com.liferay.portal.kernel.security.membershippolicy.MembershipPolicyException;
import com.liferay.portal.kernel.util.ArrayUtil;
import com.liferay.portal.kernel.util.UnicodeProperties;
import com.liferay.portal.security.membershippolicy.BaseSiteMembershipPolicyTestCase;
import com.liferay.portal.security.membership.policy.site.BaseSiteMembershipPolicyTestCase;

import java.io.Serializable;

Expand Down
3 changes: 2 additions & 1 deletion ...policy/SiteMembershipPolicyBasicTest.java → ...e/test/SiteMembershipPolicyBasicTest.java
View file
Expand Up @@ -12,10 +12,11 @@
* details.
*/

package com.liferay.portal.security.membershippolicy;
package com.liferay.portal.security.membership.policy.site.test;

import com.liferay.portal.kernel.security.membershippolicy.SiteMembershipPolicyUtil;
import com.liferay.portal.kernel.test.rule.AggregateTestRule;
import com.liferay.portal.security.membership.policy.site.BaseSiteMembershipPolicyTestCase;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;

import org.junit.Assert;
Expand Down
3 changes: 2 additions & 1 deletion .../SiteMembershipPolicyMembershipsTest.java → .../SiteMembershipPolicyMembershipsTest.java
View file
Expand Up @@ -12,7 +12,7 @@
* details.
*/

package com.liferay.portal.security.membershippolicy;
package com.liferay.portal.security.membership.policy.site.test;

import com.liferay.expando.kernel.service.ExpandoTableLocalServiceUtil;
import com.liferay.portal.kernel.model.Group;
Expand All @@ -29,6 +29,7 @@
import com.liferay.portal.kernel.util.ArrayUtil;
import com.liferay.portal.kernel.util.LocaleUtil;
import com.liferay.portal.kernel.util.UnicodeProperties;
import com.liferay.portal.security.membership.policy.site.BaseSiteMembershipPolicyTestCase;
import com.liferay.portal.security.membershippolicy.util.test.MembershipPolicyTestUtil;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;

Expand Down
3 changes: 2 additions & 1 deletion ...policy/SiteMembershipPolicyRolesTest.java → ...e/test/SiteMembershipPolicyRolesTest.java
View file
Expand Up @@ -12,7 +12,7 @@
* details.
*/

package com.liferay.portal.security.membershippolicy;
package com.liferay.portal.security.membership.policy.site.test;

import com.liferay.expando.kernel.service.ExpandoTableLocalServiceUtil;
import com.liferay.portal.kernel.model.Role;
Expand All @@ -29,6 +29,7 @@
import com.liferay.portal.kernel.test.rule.AggregateTestRule;
import com.liferay.portal.kernel.test.util.RandomTestUtil;
import com.liferay.portal.kernel.test.util.TestPropsValues;
import com.liferay.portal.security.membership.policy.site.BaseSiteMembershipPolicyTestCase;
import com.liferay.portal.security.membershippolicy.util.test.MembershipPolicyTestUtil;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;

Expand Down
3 changes: 2 additions & 1 deletion ...y/SiteMembershipPolicyRowCheckerTest.java → ...t/SiteMembershipPolicyRowCheckerTest.java
View file
Expand Up @@ -12,7 +12,7 @@
* details.
*/

package com.liferay.portal.security.membershippolicy;
package com.liferay.portal.security.membership.policy.site.test;

import com.liferay.portal.kernel.model.Group;
import com.liferay.portal.kernel.model.Role;
Expand All @@ -22,6 +22,7 @@
import com.liferay.portal.kernel.service.UserGroupRoleLocalServiceUtil;
import com.liferay.portal.kernel.test.rule.AggregateTestRule;
import com.liferay.portal.kernel.test.util.UserTestUtil;
import com.liferay.portal.security.membership.policy.site.BaseSiteMembershipPolicyTestCase;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portlet.sites.search.UserGroupRoleRoleChecker;
import com.liferay.portlet.sites.search.UserGroupRoleUserChecker;
Expand Down
5 changes: 3 additions & 2 deletions ...aseUserGroupMembershipPolicyTestCase.java → ...aseUserGroupMembershipPolicyTestCase.java
View file
Expand Up @@ -12,13 +12,14 @@
* details.
*/

package com.liferay.portal.security.membershippolicy;
package com.liferay.portal.security.membership.policy.usergroup;

import com.liferay.portal.kernel.model.UserGroup;
import com.liferay.portal.kernel.security.membershippolicy.UserGroupMembershipPolicy;
import com.liferay.portal.kernel.test.rule.DeleteAfterTestRun;
import com.liferay.portal.kernel.test.util.UserGroupTestUtil;
import com.liferay.portal.security.membershippolicy.samples.TestUserGroupMembershipPolicy;
import com.liferay.portal.security.membership.policy.BaseMembershipPolicyTestCase;
import com.liferay.portal.security.membership.policy.usergroup.samples.TestUserGroupMembershipPolicy;
import com.liferay.registry.Registry;
import com.liferay.registry.RegistryUtil;
import com.liferay.registry.ServiceRegistration;
Expand Down
4 changes: 2 additions & 2 deletions ...amples/TestUserGroupMembershipPolicy.java → ...amples/TestUserGroupMembershipPolicy.java
View file
Expand Up @@ -12,14 +12,14 @@
* details.
*/

package com.liferay.portal.security.membershippolicy.samples;
package com.liferay.portal.security.membership.policy.usergroup.samples;

import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.model.UserGroup;
import com.liferay.portal.kernel.security.membershippolicy.BaseUserGroupMembershipPolicy;
import com.liferay.portal.kernel.security.membershippolicy.MembershipPolicyException;
import com.liferay.portal.kernel.util.ArrayUtil;
import com.liferay.portal.security.membershippolicy.BaseUserGroupMembershipPolicyTestCase;
import com.liferay.portal.security.membership.policy.usergroup.BaseUserGroupMembershipPolicyTestCase;

import java.io.Serializable;

Expand Down
3 changes: 2 additions & 1 deletion ...y/UserGroupMembershipPolicyBasicTest.java → ...t/UserGroupMembershipPolicyBasicTest.java
View file
Expand Up @@ -12,10 +12,11 @@
* details.
*/

package com.liferay.portal.security.membershippolicy;
package com.liferay.portal.security.membership.policy.usergroup.test;

import com.liferay.portal.kernel.security.membershippolicy.UserGroupMembershipPolicyUtil;
import com.liferay.portal.kernel.test.rule.AggregateTestRule;
import com.liferay.portal.security.membership.policy.usergroup.BaseUserGroupMembershipPolicyTestCase;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;

import org.junit.Assert;
Expand Down
3 changes: 2 additions & 1 deletion ...GroupMembershipPolicyMembershipsTest.java → ...GroupMembershipPolicyMembershipsTest.java
View file
Expand Up @@ -12,7 +12,7 @@
* details.
*/

package com.liferay.portal.security.membershippolicy;
package com.liferay.portal.security.membership.policy.usergroup.test;

import com.liferay.expando.kernel.service.ExpandoTableLocalServiceUtil;
import com.liferay.portal.kernel.model.User;
Expand All @@ -26,6 +26,7 @@
import com.liferay.portal.kernel.test.util.ServiceContextTestUtil;
import com.liferay.portal.kernel.test.util.TestPropsValues;
import com.liferay.portal.kernel.util.ArrayUtil;
import com.liferay.portal.security.membership.policy.usergroup.BaseUserGroupMembershipPolicyTestCase;
import com.liferay.portal.security.membershippolicy.util.test.MembershipPolicyTestUtil;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;

Expand Down
3 changes: 2 additions & 1 deletion ...rGroupMembershipPolicyRowCheckerTest.java → ...rGroupMembershipPolicyRowCheckerTest.java
View file
Expand Up @@ -12,13 +12,14 @@
* details.
*/

package com.liferay.portal.security.membershippolicy;
package com.liferay.portal.security.membership.policy.usergroup.test;

import com.liferay.portal.kernel.model.User;
import com.liferay.portal.kernel.model.UserGroup;
import com.liferay.portal.kernel.service.UserGroupLocalServiceUtil;
import com.liferay.portal.kernel.test.rule.AggregateTestRule;
import com.liferay.portal.kernel.test.util.UserTestUtil;
import com.liferay.portal.security.membership.policy.usergroup.BaseUserGroupMembershipPolicyTestCase;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portlet.usergroupsadmin.search.SetUserUserGroupChecker;
import com.liferay.portlet.usergroupsadmin.search.UnsetUserUserGroupChecker;
Expand Down

0 comments on commit 2dcb43a

Please sign in to comment.