LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

CCM NG: Fixed test failures in AssetRepositoryTest 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@6001 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 48a9eb3e87
pull/2/head
jensp 2019-05-03 17:15:37 +00:00
parent 15f106342e
commit 8e9639be7d
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ccm-cms/src/test/java/org/librecms/contentsection/AssetRepositoryTest.java
View File

@ -71,8 +71,18 @@ import static org.junit.Assert.*;
@RunWith(Arquillian.class) @RunWith(Arquillian.class)
@PersistenceTest @PersistenceTest
@Transactional(TransactionMode.COMMIT) @Transactional(TransactionMode.COMMIT)
@CreateSchema({"create_ccm_cms_schema.sql"}) @CreateSchema(
@CleanupUsingScript({"cleanup.sql"}) {
"001_create_schema.sql",
"002_create_ccm_cms_tables.sql",
"003_init_hibernate_sequence.sql"
}
)
@CleanupUsingScript(
{
"999_cleanup.sql"
}
)
public class AssetRepositoryTest { public class AssetRepositoryTest {
@Inject @Inject
@ -142,6 +152,7 @@ public class AssetRepositoryTest {
.addClass( .addClass(
com.arsdigita.ui.admin.applications.DefaultApplicationSettingsPane.class) com.arsdigita.ui.admin.applications.DefaultApplicationSettingsPane.class)
.addClass(org.librecms.dispatcher.ItemResolver.class) .addClass(org.librecms.dispatcher.ItemResolver.class)
.addClass(org.libreccm.imexport.Exportable.class)
.addPackage(com.arsdigita.util.Lockable.class.getPackage()) .addPackage(com.arsdigita.util.Lockable.class.getPackage())
.addPackage(com.arsdigita.web.BaseServlet.class.getPackage()) .addPackage(com.arsdigita.web.BaseServlet.class.getPackage())
.addPackage(org.librecms.Cms.class.getPackage()) .addPackage(org.librecms.Cms.class.getPackage())
@ -206,7 +217,7 @@ public class AssetRepositoryTest {
public void deleteUnusedAsset() { public void deleteUnusedAsset() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Asset asset = assetRepo.findById(-800L).get(); final Asset asset = assetRepo.findById(800L).get();
assetRepo.delete(asset); assetRepo.delete(asset);
}); });
@ -216,6 +227,7 @@ public class AssetRepositoryTest {
* Verifies that an {@link Asset} which is associated to at least one * Verifies that an {@link Asset} which is associated to at least one
* {@link ContentItem} can't be deleted by using * {@link ContentItem} can't be deleted by using
* {@link AssetRepository#delete(org.librecms.assets.Asset)}. * {@link AssetRepository#delete(org.librecms.assets.Asset)}.
*
* @throws java.lang.Throwable * @throws java.lang.Throwable
*/ */
@Test(expected = AssetInUseException.class) @Test(expected = AssetInUseException.class)
@ -230,7 +242,7 @@ public class AssetRepositoryTest {
try { try {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Asset asset = assetRepo.findById(-700L).get(); final Asset asset = assetRepo.findById(700L).get();
assetRepo.delete(asset); assetRepo.delete(asset);
return null; return null;
@ -372,8 +384,8 @@ public class AssetRepositoryTest {
"datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml") "datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml")
public void findAssetsByFolder() { public void findAssetsByFolder() {
final Folder media = folderRepo.findById(-400L).get(); final Folder media = folderRepo.findById(400L).get();
final Folder data = folderRepo.findById(-500L).get(); final Folder data = folderRepo.findById(500L).get();
final List<Asset> mediaAssets = shiro final List<Asset> mediaAssets = shiro
.getSystemUser() .getSystemUser()
@ -397,8 +409,8 @@ public class AssetRepositoryTest {
"datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml") "datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml")
public void countAssetsInFolder() { public void countAssetsInFolder() {
final Folder media = folderRepo.findById(-400L).get(); final Folder media = folderRepo.findById(400L).get();
final Folder data = folderRepo.findById(-500L).get(); final Folder data = folderRepo.findById(500L).get();
final Subject systemUser = shiro.getSystemUser(); final Subject systemUser = shiro.getSystemUser();
@ -422,7 +434,7 @@ public class AssetRepositoryTest {
final Folder media = shiro final Folder media = shiro
.getSystemUser() .getSystemUser()
.execute(() -> folderRepo.findById(-400L).get()); .execute(() -> folderRepo.findById(400L).get());
final List<Asset> result1 = shiro final List<Asset> result1 = shiro
.getSystemUser() .getSystemUser()
@ -448,7 +460,7 @@ public class AssetRepositoryTest {
"datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml") "datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml")
public void countFilterAssetByFolderAndTitle() { public void countFilterAssetByFolderAndTitle() {
final Folder media = folderRepo.findById(-400L).get(); final Folder media = folderRepo.findById(400L).get();
final Subject systemUser = shiro.getSystemUser(); final Subject systemUser = shiro.getSystemUser();
@ -475,7 +487,7 @@ public class AssetRepositoryTest {
"datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml") "datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml")
public void filterAssetsByFolderAndType() { public void filterAssetsByFolderAndType() {
final Folder media = folderRepo.findById(-400L).get(); final Folder media = folderRepo.findById(400L).get();
final Subject systemUser = shiro.getSystemUser(); final Subject systemUser = shiro.getSystemUser();
@ -514,7 +526,7 @@ public class AssetRepositoryTest {
@UsingDataSet( @UsingDataSet(
"datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml") "datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml")
public void countFilterAssetsByFolderAndType() { public void countFilterAssetsByFolderAndType() {
final Folder media = folderRepo.findById(-400L).get(); final Folder media = folderRepo.findById(400L).get();
final Subject systemUser = shiro.getSystemUser(); final Subject systemUser = shiro.getSystemUser();
@ -547,7 +559,7 @@ public class AssetRepositoryTest {
@UsingDataSet( @UsingDataSet(
"datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml") "datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml")
public void filterAssetsByFolderAndTypeAndTitle() { public void filterAssetsByFolderAndTypeAndTitle() {
final Folder media = folderRepo.findById(-400L).get(); final Folder media = folderRepo.findById(400L).get();
final List<Asset> result1 = shiro final List<Asset> result1 = shiro
.getSystemUser() .getSystemUser()
@ -575,7 +587,7 @@ public class AssetRepositoryTest {
@UsingDataSet( @UsingDataSet(
"datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml") "datasets/org/librecms/contentsection/AssetRepositoryTest/data.xml")
public void countFilterAssetsByFolderAndTypeAndTitle() { public void countFilterAssetsByFolderAndTypeAndTitle() {
final Folder media = folderRepo.findById(-400L).get(); final Folder media = folderRepo.findById(400L).get();
final Subject systemUser = shiro.getSystemUser(); final Subject systemUser = shiro.getSystemUser();