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

CCM NG: Fixed test failures in AssetManagerTest 

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

Former-commit-id: 8e9f8a321e
pull/2/head
jensp 2019-05-03 16:44:55 +00:00
parent 2147405e5f
commit 15f106342e
1 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerTest.java
View File

@ -226,7 +226,7 @@ public class AssetManagerTest {
public void shareAsset() throws MimeTypeParseException { public void shareAsset() throws MimeTypeParseException {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Folder folder = folderRepo.findById(-420L).get(); final Folder folder = folderRepo.findById(420L).get();
assertThat(folder, is(not(nullValue()))); assertThat(folder, is(not(nullValue())));
final FileAsset file = new FileAsset(); final FileAsset file = new FileAsset();
@ -260,7 +260,7 @@ public class AssetManagerTest {
public void shareAssetNull() { public void shareAssetNull() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Folder folder = folderRepo.findById(-420L).get(); final Folder folder = folderRepo.findById(420L).get();
assetManager.shareAsset(null, folder); assetManager.shareAsset(null, folder);
}); });
@ -315,9 +315,9 @@ public class AssetManagerTest {
public void shareAlreadySharedAsset() { public void shareAlreadySharedAsset() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Folder folder = folderRepo.findById(-420L).get(); final Folder folder = folderRepo.findById(420L).get();
final Asset asset = assetRepo.findById(-700L).get(); final Asset asset = assetRepo.findById(700L).get();
assetManager.shareAsset(asset, folder); assetManager.shareAsset(asset, folder);
}); });
@ -360,10 +360,10 @@ public class AssetManagerTest {
public void moveAssetToOtherFolder() { public void moveAssetToOtherFolder() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Asset asset = assetRepo.findById(-900L).get(); final Asset asset = assetRepo.findById(900L).get();
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Folder folder = folderRepo.findById(-410L).get(); final Folder folder = folderRepo.findById(410L).get();
assetManager.move(asset, folder); assetManager.move(asset, folder);
}); });
@ -390,9 +390,9 @@ public class AssetManagerTest {
public void moveAssetToFolderInOtherContentSection() { public void moveAssetToFolderInOtherContentSection() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Asset asset = assetRepo.findById(-900L).get(); final Asset asset = assetRepo.findById(900L).get();
final Folder folder = folderRepo.findById(-1600L).get(); final Folder folder = folderRepo.findById(1600L).get();
assetManager.move(asset, folder); assetManager.move(asset, folder);
}); });
@ -415,7 +415,7 @@ public class AssetManagerTest {
final Asset asset = null; final Asset asset = null;
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Folder folder = folderRepo.findById(-410L).get(); final Folder folder = folderRepo.findById(410L).get();
assetManager.move(asset, folder); assetManager.move(asset, folder);
}); });
@ -437,7 +437,7 @@ public class AssetManagerTest {
public void moveAssetTargetFolderIsNull() { public void moveAssetTargetFolderIsNull() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Asset asset = assetRepo.findById(-900L).get(); final Asset asset = assetRepo.findById(900L).get();
final Folder targetFolder = null; final Folder targetFolder = null;
@ -461,9 +461,9 @@ public class AssetManagerTest {
public void moveAssetTargetFolderIsNotAssetFolder() { public void moveAssetTargetFolderIsNotAssetFolder() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Asset asset = assetRepo.findById(-900L).get(); final Asset asset = assetRepo.findById(900L).get();
final Folder folder = folderRepo.findById(-200L).get(); final Folder folder = folderRepo.findById(200L).get();
assetManager.move(asset, folder); assetManager.move(asset, folder);
}); });
@ -491,9 +491,9 @@ public class AssetManagerTest {
public void copyAssetToOtherFolder() { public void copyAssetToOtherFolder() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Asset asset = assetRepo.findById(-1100L).get(); final Asset asset = assetRepo.findById(1100L).get();
final Folder targetFolder = folderRepo.findById(-400L).get(); final Folder targetFolder = folderRepo.findById(400L).get();
assetManager.copy(asset, targetFolder); assetManager.copy(asset, targetFolder);
}); });
@ -521,9 +521,9 @@ public class AssetManagerTest {
public void copyAssetToSameFolder() { public void copyAssetToSameFolder() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Asset asset = assetRepo.findById(-1100L).get(); final Asset asset = assetRepo.findById(1100L).get();
final Folder targetFolder = folderRepo.findById(-420L).get(); final Folder targetFolder = folderRepo.findById(420L).get();
assetManager.copy(asset, targetFolder); assetManager.copy(asset, targetFolder);
}); });
@ -552,9 +552,9 @@ public class AssetManagerTest {
public void copyAssetToOtherContentSection() { public void copyAssetToOtherContentSection() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Asset asset = assetRepo.findById(-1100L).get(); final Asset asset = assetRepo.findById(1100L).get();
final Folder targetFolder = folderRepo.findById(-1600L).get(); final Folder targetFolder = folderRepo.findById(1600L).get();
assetManager.copy(asset, targetFolder); assetManager.copy(asset, targetFolder);
}); });
@ -578,7 +578,7 @@ public class AssetManagerTest {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Asset asset = null; final Asset asset = null;
final Folder targetFolder = folderRepo.findById(-420L).get(); final Folder targetFolder = folderRepo.findById(420L).get();
assetManager.copy(asset, targetFolder); assetManager.copy(asset, targetFolder);
}); });
@ -600,7 +600,7 @@ public class AssetManagerTest {
public void copyAssetTargetFolderIsNull() { public void copyAssetTargetFolderIsNull() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Asset asset = assetRepo.findById(-1100L).get(); final Asset asset = assetRepo.findById(1100L).get();
final Folder targetFolder = null; final Folder targetFolder = null;
@ -624,9 +624,9 @@ public class AssetManagerTest {
public void copyAssetTargetFolderIsNotAssetFolder() { public void copyAssetTargetFolderIsNotAssetFolder() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Asset asset = assetRepo.findById(-1100L).get(); final Asset asset = assetRepo.findById(1100L).get();
final Folder targetFolder = folderRepo.findById(-200L).get(); final Folder targetFolder = folderRepo.findById(200L).get();
assetManager.copy(asset, targetFolder); assetManager.copy(asset, targetFolder);
}); });
@ -646,11 +646,11 @@ public class AssetManagerTest {
public void verifyIsAssetInUse() { public void verifyIsAssetInUse() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Asset header = assetRepo.findById(-700L).get(); final Asset header = assetRepo.findById(700L).get();
final Asset phb = assetRepo.findById(-800L).get(); final Asset phb = assetRepo.findById(800L).get();
final Asset servicesHeader = assetRepo.findById(-900L).get(); final Asset servicesHeader = assetRepo.findById(900L).get();
final Asset product1Datasheet = assetRepo.findById(-1000L).get(); final Asset product1Datasheet = assetRepo.findById(1000L).get();
final Asset catalog = assetRepo.findById(-1100L).get(); final Asset catalog = assetRepo.findById(1100L).get();
assertThat(assetManager.isAssetInUse(header), is(true)); assertThat(assetManager.isAssetInUse(header), is(true));
assertThat(assetManager.isAssetInUse(phb), is(false)); assertThat(assetManager.isAssetInUse(phb), is(false));
@ -676,11 +676,11 @@ public class AssetManagerTest {
public void verifyGetAssetPathWithoutContentSection() { public void verifyGetAssetPathWithoutContentSection() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Asset header = assetRepo.findById(-700L).get(); final Asset header = assetRepo.findById(700L).get();
final Asset phb = assetRepo.findById(-800L).get(); final Asset phb = assetRepo.findById(800L).get();
final Asset servicesHeader = assetRepo.findById(-900L).get(); final Asset servicesHeader = assetRepo.findById(900L).get();
final Asset product1Datasheet = assetRepo.findById(-1000L).get(); final Asset product1Datasheet = assetRepo.findById(1000L).get();
final Asset catalog = assetRepo.findById(-1100L).get(); final Asset catalog = assetRepo.findById(1100L).get();
assertThat(assetManager.getAssetPath(header), assertThat(assetManager.getAssetPath(header),
is(equalTo("/media/images/header.png"))); is(equalTo("/media/images/header.png")));
@ -709,11 +709,11 @@ public class AssetManagerTest {
public void verifyGetAssetPathWithContentSection() { public void verifyGetAssetPathWithContentSection() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Asset header = assetRepo.findById(-700L).get(); final Asset header = assetRepo.findById(700L).get();
final Asset phb = assetRepo.findById(-800L).get(); final Asset phb = assetRepo.findById(800L).get();
final Asset servicesHeader = assetRepo.findById(-900L).get(); final Asset servicesHeader = assetRepo.findById(900L).get();
final Asset product1Datasheet = assetRepo.findById(-1000L).get(); final Asset product1Datasheet = assetRepo.findById(1000L).get();
final Asset catalog = assetRepo.findById(-1100L).get(); final Asset catalog = assetRepo.findById(1100L).get();
assertThat(assetManager.getAssetPath(header, true), assertThat(assetManager.getAssetPath(header, true),
is(equalTo("info:/media/images/header.png"))); is(equalTo("info:/media/images/header.png")));
@ -742,15 +742,15 @@ public class AssetManagerTest {
public void verifyGetAssetFolder() { public void verifyGetAssetFolder() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Asset header = assetRepo.findById(-700L).get(); final Asset header = assetRepo.findById(700L).get();
final Asset phb = assetRepo.findById(-800L).get(); final Asset phb = assetRepo.findById(800L).get();
final Asset servicesHeader = assetRepo.findById(-900L).get(); final Asset servicesHeader = assetRepo.findById(900L).get();
final Asset product1Datasheet = assetRepo.findById(-1000L).get(); final Asset product1Datasheet = assetRepo.findById(1000L).get();
final Asset catalog = assetRepo.findById(-1100L).get(); final Asset catalog = assetRepo.findById(1100L).get();
final Folder media = folderRepo.findById(-400L).get(); final Folder media = folderRepo.findById(400L).get();
final Folder images = folderRepo.findById(-410L).get(); final Folder images = folderRepo.findById(410L).get();
final Folder downloads = folderRepo.findById(-420L).get(); final Folder downloads = folderRepo.findById(420L).get();
final Optional<Folder> headerFolder = assetManager final Optional<Folder> headerFolder = assetManager
.getAssetFolder(header); .getAssetFolder(header);
@ -790,16 +790,16 @@ public class AssetManagerTest {
public void verifyGetAssetFolders() { public void verifyGetAssetFolders() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Asset header = assetRepo.findById(-700L).get(); final Asset header = assetRepo.findById(700L).get();
final Asset phb = assetRepo.findById(-800L).get(); final Asset phb = assetRepo.findById(800L).get();
final Asset servicesHeader = assetRepo.findById(-900L).get(); final Asset servicesHeader = assetRepo.findById(900L).get();
final Asset product1Datasheet = assetRepo.findById(-1000L).get(); final Asset product1Datasheet = assetRepo.findById(1000L).get();
final Asset catalog = assetRepo.findById(-1100L).get(); final Asset catalog = assetRepo.findById(1100L).get();
final Folder infoAssets = folderRepo.findById(-300L).get(); final Folder infoAssets = folderRepo.findById(300L).get();
final Folder media = folderRepo.findById(-400L).get(); final Folder media = folderRepo.findById(400L).get();
final Folder images = folderRepo.findById(-410L).get(); final Folder images = folderRepo.findById(410L).get();
final Folder downloads = folderRepo.findById(-420L).get(); final Folder downloads = folderRepo.findById(420L).get();
final List<Folder> headerFolders = assetManager.getAssetFolders( final List<Folder> headerFolders = assetManager.getAssetFolders(
header); header);