Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LPS-72687 Create and delete data on every test #49569

Closed
wants to merge 5 commits into from
Closed

LPS-72687 Create and delete data on every test #49569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b3a5e24
LPS-72687 Moves tests
ealonso Jun 8, 2017
b7dca31
LPS-72687 Adds @RunWith(Arquillian.class)
ealonso Jun 8, 2017
71b5b10
LPS-72687 We need to add exceptions because document-library-service …
ealonso Jun 8, 2017
a41fb31
LPS-72687 setp up permission checker thread local and setp principal …
ealonso Jun 8, 2017
fabe563
LPS-72687 Create and delete data on every test
ealonso Jun 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions modules/apps/collaboration/document-library/checkstyle-suppressions.xml
View file
Open in desktop
Expand Up @@ -2,6 +2,8 @@
<!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN" "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">

<suppressions>
<suppress checks="PersistenceCall" files="modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFileEntryTypeFinderTest\.java" />
<suppress checks="PersistenceCall" files="modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/service/test/DLFolderFinderTest\.java" />
<suppress checks="Subname" files="modules/apps/collaboration/document-library/document-library-repository-cmis-impl/src/main/java/com/liferay/document/library/repository/cmis/internal/CMISRepository\.java" />
<suppress checks="TestClass" files="modules/apps/collaboration/document-library/document-library-test/src/testIntegration/java/com/liferay/document/library/webdav/test/BaseWebDAVTestCase\.java" />
</suppressions>
188 changes: 94 additions & 94 deletions ...ce/persistence/DLFileEntryFinderTest.java → ...y/service/test/DLFileEntryFinderTest.java
View file
Open in desktop
Expand Up @@ -12,8 +12,9 @@
* details.
*/

package com.liferay.portlet.documentlibrary.service.persistence;
package com.liferay.document.library.service.test;

import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian;
import com.liferay.asset.kernel.service.AssetEntryLocalServiceUtil;
import com.liferay.document.library.kernel.model.DLFileEntry;
import com.liferay.document.library.kernel.model.DLFileEntryTypeConstants;
Expand All @@ -25,17 +26,15 @@
import com.liferay.document.library.kernel.service.DLFileVersionLocalServiceUtil;
import com.liferay.document.library.kernel.service.DLTrashServiceUtil;
import com.liferay.portal.kernel.dao.orm.QueryDefinition;
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.model.Group;
import com.liferay.portal.kernel.model.Repository;
import com.liferay.portal.kernel.model.User;
import com.liferay.portal.kernel.repository.model.FileEntry;
import com.liferay.portal.kernel.repository.model.Folder;
import com.liferay.portal.kernel.service.GroupLocalServiceUtil;
import com.liferay.portal.kernel.service.RepositoryLocalServiceUtil;
import com.liferay.portal.kernel.service.ServiceContext;
import com.liferay.portal.kernel.service.UserLocalServiceUtil;
import com.liferay.portal.kernel.test.rule.AggregateTestRule;
import com.liferay.portal.kernel.test.rule.DeleteAfterTestRun;
import com.liferay.portal.kernel.test.rule.Sync;
import com.liferay.portal.kernel.test.rule.SynchronousDestinationTestRule;
import com.liferay.portal.kernel.test.util.GroupTestUtil;
Expand All @@ -54,22 +53,24 @@
import com.liferay.portal.spring.hibernate.LastSessionRecorderUtil;
import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerTestRule;
import com.liferay.portlet.documentlibrary.util.test.DLAppTestUtil;

import java.util.ArrayList;
import java.util.List;

import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;

/**
* @author Zsolt Berentey
*/
@RunWith(Arquillian.class)
@Sync
public class DLFileEntryFinderTest {

Expand All @@ -78,10 +79,11 @@ public class DLFileEntryFinderTest {
public static final AggregateTestRule aggregateTestRule =
new AggregateTestRule(
new LiferayIntegrationTestRule(),
SynchronousDestinationTestRule.INSTANCE);
SynchronousDestinationTestRule.INSTANCE,
PermissionCheckerTestRule.INSTANCE);

@BeforeClass
public static void setUpClass() throws Exception {
@Before
public void setUp() throws Exception {
_user = UserTestUtil.addUser();

long classNameId = PortalUtil.getClassNameId(
Expand Down Expand Up @@ -110,13 +112,6 @@ public static void setUpClass() throws Exception {
_newRepositoryFolder = (Folder)objects[0];
}

@AfterClass
public static void tearDownClass() throws PortalException {
GroupLocalServiceUtil.deleteGroup(_group);

UserLocalServiceUtil.deleteUser(_user);
}

@Test
public void testCountByExtraSettings() throws Exception {
Assert.assertEquals(
Expand Down Expand Up @@ -1224,7 +1219,7 @@ public void testFindByNoAssets() throws Exception {
Assert.assertEquals("FE1.txt", dlFileEntry.getTitle());
}

protected static FileEntry addFileEntry(
protected FileEntry addFileEntry(
long userId, long repositoryId, long folderId, String fileName,
String titleSuffix, String contentType, long fileEntryTypeId)
throws Exception {
Expand All @@ -1241,77 +1236,6 @@ protected static FileEntry addFileEntry(
(byte[])null, serviceContext);
}

protected static Object[] setUp(
long repositoryId, String titleSuffix,
ServiceContext serviceContext)
throws Exception {

Folder folder = DLAppLocalServiceUtil.addFolder(
TestPropsValues.getUserId(), repositoryId,
DLFolderConstants.DEFAULT_PARENT_FOLDER_ID, "Folder A",
StringPool.BLANK, serviceContext);

DLAppLocalServiceUtil.addFolder(
TestPropsValues.getUserId(), repositoryId, folder.getFolderId(),
"Folder B", StringPool.BLANK, serviceContext);

Folder folderC = DLAppLocalServiceUtil.addFolder(
TestPropsValues.getUserId(), repositoryId, folder.getFolderId(),
"Folder C", StringPool.BLANK, serviceContext);

DLTrashServiceUtil.moveFolderToTrash(folderC.getFolderId());

FileEntry fileEntry = addFileEntry(
_user.getUserId(), repositoryId, folder.getFolderId(), "FE1.txt",
titleSuffix, ContentTypes.TEXT_PLAIN,
DLFileEntryTypeConstants.FILE_ENTRY_TYPE_ID_BASIC_DOCUMENT);

LiferayFileEntry liferayFileEntry = (LiferayFileEntry)fileEntry;

DLFileEntry dlFileEntry = liferayFileEntry.getDLFileEntry();

dlFileEntry.setExtraSettings("hello=world");
dlFileEntry.setSmallImageId(_SMALL_IMAGE_ID);

dlFileEntry = DLFileEntryLocalServiceUtil.updateDLFileEntry(
dlFileEntry);

DLFileVersion dlFileVersion = dlFileEntry.getFileVersion();

addFileEntry(
TestPropsValues.getUserId(), repositoryId, folder.getFolderId(),
"FE2.pdf", titleSuffix, ContentTypes.APPLICATION_PDF,
DLFileEntryTypeConstants.FILE_ENTRY_TYPE_ID_ALL);

fileEntry = addFileEntry(
TestPropsValues.getUserId(), repositoryId, folder.getFolderId(),
"FE3.txt", titleSuffix, ContentTypes.TEXT_PLAIN,
DLFileEntryTypeConstants.FILE_ENTRY_TYPE_ID_ALL);

fileEntry = DLAppServiceUtil.updateFileEntry(
fileEntry.getFileEntryId(), "FE3.txt", ContentTypes.TEXT_PLAIN,
"FE3.txt".concat(titleSuffix), StringPool.BLANK, StringPool.BLANK,
false,
RandomTestUtil.randomBytes(TikaSafeRandomizerBumper.INSTANCE),
serviceContext);

dlFileEntry = ((LiferayFileEntry)fileEntry).getDLFileEntry();

dlFileEntry.setDescription("FE3.txt");

DLFileEntryLocalServiceUtil.updateDLFileEntry(dlFileEntry);

DLFileVersion dlFileVersion3 = dlFileEntry.getFileVersion();

dlFileVersion3.setExtraSettings("hello=world");

DLFileVersionLocalServiceUtil.updateDLFileVersion(dlFileVersion3);

DLTrashServiceUtil.moveFileEntryToTrash(fileEntry.getFileEntryId());

return new Object[] {folder, dlFileVersion};
}

protected int doCountBy_G_U_F_M(
long userId, String mimeType,
QueryDefinition<DLFileEntry> queryDefinition)
Expand Down Expand Up @@ -1500,13 +1424,89 @@ protected List<DLFileEntry> doFindBy_G_U_R_F_M_NewRepository(
userId, repositoryIds, folderIds, mimeType, queryDefinition);
}

protected Object[] setUp(
long repositoryId, String titleSuffix,
ServiceContext serviceContext)
throws Exception {

Folder folder = DLAppLocalServiceUtil.addFolder(
TestPropsValues.getUserId(), repositoryId,
DLFolderConstants.DEFAULT_PARENT_FOLDER_ID, "Folder A",
StringPool.BLANK, serviceContext);

DLAppLocalServiceUtil.addFolder(
TestPropsValues.getUserId(), repositoryId, folder.getFolderId(),
"Folder B", StringPool.BLANK, serviceContext);

Folder folderC = DLAppLocalServiceUtil.addFolder(
TestPropsValues.getUserId(), repositoryId, folder.getFolderId(),
"Folder C", StringPool.BLANK, serviceContext);

DLTrashServiceUtil.moveFolderToTrash(folderC.getFolderId());

FileEntry fileEntry = addFileEntry(
_user.getUserId(), repositoryId, folder.getFolderId(), "FE1.txt",
titleSuffix, ContentTypes.TEXT_PLAIN,
DLFileEntryTypeConstants.FILE_ENTRY_TYPE_ID_BASIC_DOCUMENT);

LiferayFileEntry liferayFileEntry = (LiferayFileEntry)fileEntry;

DLFileEntry dlFileEntry = liferayFileEntry.getDLFileEntry();

dlFileEntry.setExtraSettings("hello=world");
dlFileEntry.setSmallImageId(_SMALL_IMAGE_ID);

dlFileEntry = DLFileEntryLocalServiceUtil.updateDLFileEntry(
dlFileEntry);

DLFileVersion dlFileVersion = dlFileEntry.getFileVersion();

addFileEntry(
TestPropsValues.getUserId(), repositoryId, folder.getFolderId(),
"FE2.pdf", titleSuffix, ContentTypes.APPLICATION_PDF,
DLFileEntryTypeConstants.FILE_ENTRY_TYPE_ID_ALL);

fileEntry = addFileEntry(
TestPropsValues.getUserId(), repositoryId, folder.getFolderId(),
"FE3.txt", titleSuffix, ContentTypes.TEXT_PLAIN,
DLFileEntryTypeConstants.FILE_ENTRY_TYPE_ID_ALL);

fileEntry = DLAppServiceUtil.updateFileEntry(
fileEntry.getFileEntryId(), "FE3.txt", ContentTypes.TEXT_PLAIN,
"FE3.txt".concat(titleSuffix), StringPool.BLANK, StringPool.BLANK,
false,
RandomTestUtil.randomBytes(TikaSafeRandomizerBumper.INSTANCE),
serviceContext);

dlFileEntry = ((LiferayFileEntry)fileEntry).getDLFileEntry();

dlFileEntry.setDescription("FE3.txt");

DLFileEntryLocalServiceUtil.updateDLFileEntry(dlFileEntry);

DLFileVersion dlFileVersion3 = dlFileEntry.getFileVersion();

dlFileVersion3.setExtraSettings("hello=world");

DLFileVersionLocalServiceUtil.updateDLFileVersion(dlFileVersion3);

DLTrashServiceUtil.moveFileEntryToTrash(fileEntry.getFileEntryId());

return new Object[] {folder, dlFileVersion};
}

private static final long _SMALL_IMAGE_ID = 1234L;

private static DLFileVersion _defaultRepositoryDLFileVersion;
private static Folder _defaultRepositoryFolder;
private static Group _group;
private static Folder _newRepositoryFolder;
private static Repository _repository;
private static User _user;
private DLFileVersion _defaultRepositoryDLFileVersion;
private Folder _defaultRepositoryFolder;

@DeleteAfterTestRun
private Group _group;

private Folder _newRepositoryFolder;
private Repository _repository;

@DeleteAfterTestRun
private User _user;

}
9 changes: 7 additions & 2 deletions ...ersistence/DLFileEntryTypeFinderTest.java → ...rvice/test/DLFileEntryTypeFinderTest.java
View file
Open in desktop
Expand Up @@ -12,8 +12,9 @@
* details.
*/

package com.liferay.portlet.documentlibrary.service.persistence;
package com.liferay.document.library.service.test;

import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian;
import com.liferay.document.library.kernel.model.DLFileEntryMetadata;
import com.liferay.document.library.kernel.model.DLFileEntryType;
import com.liferay.document.library.kernel.service.DLFileEntryTypeLocalServiceUtil;
Expand All @@ -35,6 +36,7 @@
import com.liferay.portal.kernel.test.util.UserTestUtil;
import com.liferay.portal.kernel.util.StringPool;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerTestRule;
import com.liferay.portal.test.rule.TransactionalTestRule;
import com.liferay.portlet.dynamicdatamapping.util.test.DDMStructureTestUtil;

Expand All @@ -45,17 +47,20 @@
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;

/**
* @author Roberto Díaz
*/
@RunWith(Arquillian.class)
public class DLFileEntryTypeFinderTest {

@ClassRule
@Rule
public static final AggregateTestRule aggregateTestRule =
new AggregateTestRule(
new LiferayIntegrationTestRule(), TransactionalTestRule.INSTANCE);
new LiferayIntegrationTestRule(), TransactionalTestRule.INSTANCE,
PermissionCheckerTestRule.INSTANCE);

@Before
public void setUp() throws Exception {
Expand Down
8 changes: 6 additions & 2 deletions ...rvice/persistence/DLFolderFinderTest.java → ...rary/service/test/DLFolderFinderTest.java
View file
Open in desktop
Expand Up @@ -12,8 +12,9 @@
* details.
*/

package com.liferay.portlet.documentlibrary.service.persistence;
package com.liferay.document.library.service.test;

import com.liferay.arquillian.extension.junit.bridge.junit.Arquillian;
import com.liferay.document.library.kernel.model.DLFileEntry;
import com.liferay.document.library.kernel.model.DLFileShortcut;
import com.liferay.document.library.kernel.model.DLFolder;
Expand Down Expand Up @@ -45,6 +46,7 @@
import com.liferay.portal.repository.portletrepository.PortletRepository;
import com.liferay.portal.test.randomizerbumpers.TikaSafeRandomizerBumper;
import com.liferay.portal.test.rule.LiferayIntegrationTestRule;
import com.liferay.portal.test.rule.PermissionCheckerTestRule;
import com.liferay.portal.test.rule.TransactionalTestRule;

import java.util.List;
Expand All @@ -54,10 +56,12 @@
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;

/**
* @author Zsolt Berentey
*/
@RunWith(Arquillian.class)
@Sync
public class DLFolderFinderTest {

Expand All @@ -67,7 +71,7 @@ public class DLFolderFinderTest {
new AggregateTestRule(
new LiferayIntegrationTestRule(),
SynchronousDestinationTestRule.INSTANCE,
TransactionalTestRule.INSTANCE);
TransactionalTestRule.INSTANCE, PermissionCheckerTestRule.INSTANCE);

@Before
public void setUp() throws Exception {
Expand Down