CCM NG: Fixed test failures in ContentItemL10NManagerTest

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@6002 8810af33-2d31-482b-a856-94f89814c4df
ccm-docs
jensp 2019-05-03 17:26:48 +00:00
parent 1dfe947944
commit b220ed7266
1 changed files with 11 additions and 10 deletions

View File

@ -147,6 +147,7 @@ public class ContentItemL10NManagerTest {
.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())
@ -191,7 +192,7 @@ public class ContentItemL10NManagerTest {
+ "ContentItemL10NManagerTest/data.xml") + "ContentItemL10NManagerTest/data.xml")
public void verifyHasLanguage() { public void verifyHasLanguage() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10100L); final Optional<ContentItem> item = itemRepo.findById(10100L);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
assertThat(l10nManager.hasLanguage(item.get(), Locale.ENGLISH), assertThat(l10nManager.hasLanguage(item.get(), Locale.ENGLISH),
@ -235,7 +236,7 @@ public class ContentItemL10NManagerTest {
public void hasLanguageLanguageIsNull() { public void hasLanguageLanguageIsNull() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10100L); final Optional<ContentItem> item = itemRepo.findById(10100L);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
assertThat(l10nManager.hasLanguage(item.get(), null), assertThat(l10nManager.hasLanguage(item.get(), null),
@ -259,7 +260,7 @@ public class ContentItemL10NManagerTest {
public void addLanguage() { public void addLanguage() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10100L); final Optional<ContentItem> item = itemRepo.findById(10100L);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
l10nManager.addLanguage(item.get(), Locale.GERMAN); l10nManager.addLanguage(item.get(), Locale.GERMAN);
@ -281,7 +282,7 @@ public class ContentItemL10NManagerTest {
public void addLanguageAlreadyPresent() { public void addLanguageAlreadyPresent() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10100L); final Optional<ContentItem> item = itemRepo.findById(10100L);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
l10nManager.addLanguage(item.get(), Locale.FRENCH); l10nManager.addLanguage(item.get(), Locale.FRENCH);
@ -327,7 +328,7 @@ public class ContentItemL10NManagerTest {
public void addLanguageLanguageIsNull() { public void addLanguageLanguageIsNull() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10100L); final Optional<ContentItem> item = itemRepo.findById(10100L);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
l10nManager.addLanguage(item.get(), null); l10nManager.addLanguage(item.get(), null);
@ -349,7 +350,7 @@ public class ContentItemL10NManagerTest {
public void removeLanguage() { public void removeLanguage() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10100L); final Optional<ContentItem> item = itemRepo.findById(10100L);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
l10nManager.removeLanguage(item.get(), Locale.FRENCH); l10nManager.removeLanguage(item.get(), Locale.FRENCH);
@ -371,7 +372,7 @@ public class ContentItemL10NManagerTest {
public void removeNotPresentLanguage() { public void removeNotPresentLanguage() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10100L); final Optional<ContentItem> item = itemRepo.findById(10100L);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
l10nManager.removeLanguage(item.get(), Locale.GERMAN); l10nManager.removeLanguage(item.get(), Locale.GERMAN);
@ -418,7 +419,7 @@ public class ContentItemL10NManagerTest {
public void removeLanguageLanguageIsNull() { public void removeLanguageLanguageIsNull() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10100L); final Optional<ContentItem> item = itemRepo.findById(10100L);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
l10nManager.removeLanguage(item.get(), null); l10nManager.removeLanguage(item.get(), null);
@ -441,7 +442,7 @@ public class ContentItemL10NManagerTest {
public void normalizeItem() { public void normalizeItem() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10200L); final Optional<ContentItem> item = itemRepo.findById(10200L);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
l10nManager.normalizeLanguages(item.get()); l10nManager.normalizeLanguages(item.get());
@ -463,7 +464,7 @@ public class ContentItemL10NManagerTest {
public void normalizeItemAlreadyNormalized() { public void normalizeItemAlreadyNormalized() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10100L); final Optional<ContentItem> item = itemRepo.findById(10100L);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
l10nManager.normalizeLanguages(item.get()); l10nManager.normalizeLanguages(item.get());