[dna-commits] DNA SVN: r109 - in trunk/dna-common/src: main/java/org/jboss/dna/common/monitor and 4 other directories.

Author: rhauch Date: 2008-04-24 23:05:53 -0400 (Thu, 24 Apr 2008) New Revision: 109 Added: trunk/dna-common/src/test/resources/org/jboss/dna/common/monitor/ trunk/dna-common/src/test/resources/org/jboss/dna/common/monitor/SimpleProgressMonitorTest$I18nMessages_en.properties trunk/dna-common/src/test/resources/org/jboss/dna/common/monitor/SimpleProgressMonitorTest$I18nMessages_fr.properties Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/CommonI18n.java trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/LoggingProgressMonitor.java trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/NullProgressMonitor.java trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/ProgressMonitor.java trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/ProgressMonitorWrapper.java trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/SimpleProgressMonitor.java trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/SubProgressMonitor.java trunk/dna-common/src/main/resources/org/jboss/dna/common/CommonI18n.properties trunk/dna-common/src/test/java/org/jboss/dna/common/monitor/SimpleProgressMonitorTest.java Log: DNA-60: Progress monitor framework does not allow for localization of progress statuses http://jira.jboss.org/jira/browse/DNA-60 Changed the "getStatus()" method in ProgresMonitor to be "getStatus(Locale)" that can take a null locale when the default locale should be used. All implementation classes were affected (this is before 0.1 release, so that's acceptable). Corrected how the SimpleProgressMonitor handles the taskName and taskNameParameters. Also Added test cases for when the monitor has not yet been started as well as after it has been started (and given a task name). The latter is done by supplying different locales (with and without parameters). Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/CommonI18n.java =================================================================== --- trunk/dna-common/src/main/java/org/jboss/dna/common/CommonI18n.java 2008-04-24 13:49:15 UTC (rev 108) +++ trunk/dna-common/src/main/java/org/jboss/dna/common/CommonI18n.java 2008-04-25 03:05:53 UTC (rev 109) @@ -34,15 +34,15 @@ // Make sure the following I18n.java-related fields are defined before all other fields to ensure a valid error message is // produced in the event of a missing/duplicate/unused property - /** - * Parameters: - * <ol> - * <li>{@link I18n#id() ID}</li> - * <li>Number of supplied arguments</li> - * <li>Localized text before parameter substitution</li> - * <li>Localized text after parameter substitution</li> - * </ol> - */ + /** + * Parameters: + * <ol> + * <li>{@link I18n#id() ID}</li> + * <li>Number of supplied arguments</li> + * <li>Localized text before parameter substitution</li> + * <li>Localized text after parameter substitution</li> + * </ol> + */ public static I18n i18nArgumentsMismatchedParameter; public static I18n i18nArgumentMismatchedParameters; public static I18n i18nArgumentsMismatchedParameters; @@ -56,15 +56,15 @@ public static I18n i18nFieldNotPublic; public static I18n i18nFieldNotStatic; public static I18n i18nLocalizationFileNotFound; - public static I18n i18nLocalizationProblems; + public static I18n i18nLocalizationProblems; - /** - * Parameters: - * <ol> - * <li>{@link I18n#id() Property}</li> - * <li>Localization file URL</li> - * </ol> - */ + /** + * Parameters: + * <ol> + * <li>{@link I18n#id() Property}</li> + * <li>Localization file URL</li> + * </ol> + */ public static I18n i18nPropertyDuplicate; public static I18n i18nPropertyMissing; public static I18n i18nPropertyUnused; @@ -74,7 +74,7 @@ public static I18n componentNotConfigured; public static I18n progressMonitorBeginTask; public static I18n progressMonitorStatus; - public static I18n initialProgressMonitorTaskName; + public static I18n nullProgressMonitorTaskName; public static I18n argumentMayNotBeNegative; public static I18n argumentMayNotBePositive; @@ -112,14 +112,14 @@ } public static Set<Locale> getLocalizationProblemLocales() { - return I18n.getLocalizationProblemLocales(CommonI18n.class); - } + return I18n.getLocalizationProblemLocales(CommonI18n.class); + } public static Set<String> getLocalizationProblems() { - return I18n.getLocalizationProblems(CommonI18n.class); - } + return I18n.getLocalizationProblems(CommonI18n.class); + } public static Set<String> getLocalizationProblems( Locale locale ) { - return I18n.getLocalizationProblems(CommonI18n.class, locale); - } + return I18n.getLocalizationProblems(CommonI18n.class, locale); + } } Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/LoggingProgressMonitor.java =================================================================== --- trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/LoggingProgressMonitor.java 2008-04-24 13:49:15 UTC (rev 108) +++ trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/LoggingProgressMonitor.java 2008-04-25 03:05:53 UTC (rev 109) @@ -22,6 +22,7 @@ package org.jboss.dna.common.monitor; +import java.util.Locale; import org.jboss.dna.common.CommonI18n; import org.jboss.dna.common.i18n.I18n; import org.jboss.dna.common.util.Logger; @@ -33,13 +34,19 @@ private final Logger logger; private final Logger.Level level; + private final Locale locale; public LoggingProgressMonitor( ProgressMonitor delegate, Logger logger, Logger.Level level ) { + this(delegate, logger, level, null); + } + + public LoggingProgressMonitor( ProgressMonitor delegate, Logger logger, Logger.Level level, Locale locale ) { super(delegate); assert level != null; assert logger != null; this.level = level; this.logger = logger; + this.locale = locale; } /** @@ -57,7 +64,7 @@ @Override public void done() { super.done(); - this.logger.log(level, CommonI18n.progressMonitorStatus, super.getStatus()); + this.logger.log(level, CommonI18n.progressMonitorStatus, super.getStatus(this.locale)); } /** @@ -66,7 +73,7 @@ @Override public void setCancelled( boolean value ) { super.setCancelled(value); - this.logger.log(level, CommonI18n.progressMonitorStatus, super.getStatus()); + this.logger.log(level, CommonI18n.progressMonitorStatus, super.getStatus(this.locale)); } /** @@ -75,7 +82,7 @@ @Override public void worked( double work ) { super.worked(work); - this.logger.log(level, CommonI18n.progressMonitorStatus, super.getStatus()); + this.logger.log(level, CommonI18n.progressMonitorStatus, super.getStatus(this.locale)); } } Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/NullProgressMonitor.java =================================================================== --- trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/NullProgressMonitor.java 2008-04-24 13:49:15 UTC (rev 108) +++ trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/NullProgressMonitor.java 2008-04-25 03:05:53 UTC (rev 109) @@ -22,7 +22,9 @@ package org.jboss.dna.common.monitor; +import java.util.Locale; import java.util.concurrent.atomic.AtomicBoolean; +import org.jboss.dna.common.CommonI18n; import org.jboss.dna.common.i18n.I18n; import net.jcip.annotations.ThreadSafe; @@ -92,7 +94,7 @@ /** * {@inheritDoc} */ - public ProgressStatus getStatus() { - return new ProgressStatus(this.activityName, "Not available", 0.0d, cancelled.get()); + public ProgressStatus getStatus( Locale locale ) { + return new ProgressStatus(this.activityName, CommonI18n.nullProgressMonitorTaskName.text(locale), 0.0d, cancelled.get()); } } Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/ProgressMonitor.java =================================================================== --- trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/ProgressMonitor.java 2008-04-24 13:49:15 UTC (rev 108) +++ trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/ProgressMonitor.java 2008-04-25 03:05:53 UTC (rev 109) @@ -22,6 +22,7 @@ package org.jboss.dna.common.monitor; +import java.util.Locale; import org.jboss.dna.common.i18n.I18n; /** @@ -83,10 +84,12 @@ boolean isCancelled(); /** - * Return the current status of this activity. This method returns an immutable but consistent snapshot of the status for this - * activity. Note that if this instance is a {@link #createSubtask(double) subtask}, this method returns the status of the - * subtask. + * Return the current status of this activity, localized to the specified locale. This method returns an immutable but + * consistent snapshot of the status for this activity. Note that if this instance is a {@link #createSubtask(double) subtask}, + * this method returns the status of the subtask. + * @param locale the locale in which the status is to be represented; if null, the {@link Locale#getDefault() default locale} + * will be used * @return the status of this activity */ - ProgressStatus getStatus(); + ProgressStatus getStatus( Locale locale ); } Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/ProgressMonitorWrapper.java =================================================================== --- trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/ProgressMonitorWrapper.java 2008-04-24 13:49:15 UTC (rev 108) +++ trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/ProgressMonitorWrapper.java 2008-04-25 03:05:53 UTC (rev 109) @@ -22,6 +22,7 @@ package org.jboss.dna.common.monitor; +import java.util.Locale; import org.jboss.dna.common.i18n.I18n; /** @@ -73,8 +74,8 @@ /** * {@inheritDoc} */ - public ProgressStatus getStatus() { - return this.delegate.getStatus(); + public ProgressStatus getStatus( Locale locale ) { + return this.delegate.getStatus(locale); } /** Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/SimpleProgressMonitor.java =================================================================== --- trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/SimpleProgressMonitor.java 2008-04-24 13:49:15 UTC (rev 108) +++ trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/SimpleProgressMonitor.java 2008-04-25 03:05:53 UTC (rev 109) @@ -22,13 +22,13 @@ package org.jboss.dna.common.monitor; +import java.util.Locale; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.jboss.dna.common.CommonI18n; -import org.jboss.dna.common.i18n.I18n; import net.jcip.annotations.GuardedBy; import net.jcip.annotations.ThreadSafe; +import org.jboss.dna.common.i18n.I18n; /** * A basic progress monitor @@ -40,7 +40,7 @@ @GuardedBy( "lock" ) private I18n taskName; @GuardedBy( "lock" ) - private Object[] params; + private Object[] taskNameParams; @GuardedBy( "lock" ) private double totalWork; @GuardedBy( "lock" ) @@ -54,7 +54,8 @@ public SimpleProgressMonitor( String activityName ) { this.activityName = activityName != null ? activityName.trim() : ""; - this.taskName = CommonI18n.initialProgressMonitorTaskName; + this.taskName = null; + this.taskNameParams = null; } /** @@ -72,7 +73,7 @@ try { this.lock.writeLock().lock(); this.taskName = name; - this.params = params; + this.taskNameParams = params; this.totalWork = totalWork; this.worked = 0.0d; } finally { @@ -140,10 +141,11 @@ /** * {@inheritDoc} */ - public ProgressStatus getStatus() { + public ProgressStatus getStatus( Locale locale ) { try { this.lock.readLock().lock(); - return new ProgressStatus(this.getActivityName(), this.taskName.text(this.params), this.worked, this.totalWork, this.isCancelled()); + String localizedTaskName = this.taskName == null ? "" : this.taskName.text(locale, this.taskNameParams); + return new ProgressStatus(this.getActivityName(), localizedTaskName, this.worked, this.totalWork, this.isCancelled()); } finally { this.lock.readLock().unlock(); } Modified: trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/SubProgressMonitor.java =================================================================== --- trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/SubProgressMonitor.java 2008-04-24 13:49:15 UTC (rev 108) +++ trunk/dna-common/src/main/java/org/jboss/dna/common/monitor/SubProgressMonitor.java 2008-04-25 03:05:53 UTC (rev 109) @@ -22,6 +22,7 @@ package org.jboss.dna.common.monitor; +import java.util.Locale; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import org.jboss.dna.common.i18n.I18n; @@ -146,10 +147,10 @@ /** * {@inheritDoc} */ - public ProgressStatus getStatus() { + public ProgressStatus getStatus( Locale locale ) { try { this.lock.readLock().lock(); - return new ProgressStatus(this.getActivityName(), this.taskName.text(this.params), this.submittedToParent, this.subtaskTotalInParent, this.isCancelled()); + return new ProgressStatus(this.getActivityName(), this.taskName.text(locale, this.params), this.submittedToParent, this.subtaskTotalInParent, this.isCancelled()); } finally { this.lock.readLock().unlock(); } Modified: trunk/dna-common/src/main/resources/org/jboss/dna/common/CommonI18n.properties =================================================================== --- trunk/dna-common/src/main/resources/org/jboss/dna/common/CommonI18n.properties 2008-04-24 13:49:15 UTC (rev 108) +++ trunk/dna-common/src/main/resources/org/jboss/dna/common/CommonI18n.properties 2008-04-25 03:05:53 UTC (rev 109) @@ -24,7 +24,7 @@ componentNotConfigured = The component {0} was not configured and will not be used progressMonitorBeginTask = Beginning {0} ({1}) progressMonitorStatus = {0} -initialProgressMonitorTaskName = +nullProgressMonitorTaskName = Not available argumentMayNotBeNegative = The {0} argument value, {1}, may not be negative argumentMayNotBePositive = The {0} argument value, {1}, may not be positive Modified: trunk/dna-common/src/test/java/org/jboss/dna/common/monitor/SimpleProgressMonitorTest.java =================================================================== --- trunk/dna-common/src/test/java/org/jboss/dna/common/monitor/SimpleProgressMonitorTest.java 2008-04-24 13:49:15 UTC (rev 108) +++ trunk/dna-common/src/test/java/org/jboss/dna/common/monitor/SimpleProgressMonitorTest.java 2008-04-25 03:05:53 UTC (rev 109) @@ -22,12 +22,16 @@ package org.jboss.dna.common.monitor; +import java.util.Locale; +import java.util.Set; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsInstanceOf.instanceOf; import static org.hamcrest.core.IsNull.notNullValue; import static org.hamcrest.core.IsSame.sameInstance; import static org.hamcrest.number.IsCloseTo.closeTo; import static org.junit.Assert.assertThat; +import org.jboss.dna.common.CommonI18n; +import org.jboss.dna.common.i18n.I18n; import org.jboss.dna.common.i18n.MockI18n; import org.junit.Before; import org.junit.Test; @@ -54,8 +58,71 @@ } @Test + public void shouldReturnProgressStatusWithEmptyMessageBeforeTaskIsBegun() { + ProgressStatus status = monitor.getStatus(Locale.FRANCE); + assertThat(status, is(notNullValue())); + assertThat(status.getMessage(), is("")); + assertThat(status.getPercentWorked(), is(closeTo(0.0d, 0.001d))); + + status = monitor.getStatus(null); + assertThat(status, is(notNullValue())); + assertThat(status.getMessage(), is("")); + assertThat(status.getPercentWorked(), is(closeTo(0.0d, 0.001d))); + } + + @Test + public void shouldReturnProgressStatusWithCorrectMessageAfterTaskIsBegun() { + monitor.beginTask(100, I18nMessages.testTaskName); + monitor.worked(10.0d); + ProgressStatus status = monitor.getStatus(Locale.FRANCE); + assertThat(status, is(notNullValue())); + assertThat(status.getMessage(), is("t�che d'essai")); + assertThat(status.getPercentWorked(), is(closeTo(10.0d, 0.001d))); + + status = monitor.getStatus(Locale.ENGLISH); + assertThat(status, is(notNullValue())); + assertThat(status.getMessage(), is("test task")); + assertThat(status.getPercentWorked(), is(closeTo(10.0d, 0.001d))); + + status = monitor.getStatus(Locale.getDefault()); + assertThat(status, is(notNullValue())); + assertThat(status.getMessage(), is("test task")); + assertThat(status.getPercentWorked(), is(closeTo(10.0d, 0.001d))); + + status = monitor.getStatus(null); + assertThat(status, is(notNullValue())); + assertThat(status.getMessage(), is("test task")); + assertThat(status.getPercentWorked(), is(closeTo(10.0d, 0.001d))); + } + + @Test + public void shouldReturnProgressStatusWithCorrectMessageAndSubstitutedParametersAfterTaskIsBegun() { + monitor.beginTask(100, I18nMessages.testTaskName2, 2); + monitor.worked(10.0d); + ProgressStatus status = monitor.getStatus(Locale.FRANCE); + assertThat(status, is(notNullValue())); + assertThat(status.getMessage(), is("deuxi�me t�che d'essai 2")); + assertThat(status.getPercentWorked(), is(closeTo(10.0d, 0.001d))); + + status = monitor.getStatus(Locale.ENGLISH); + assertThat(status, is(notNullValue())); + assertThat(status.getMessage(), is("second test task 2")); + assertThat(status.getPercentWorked(), is(closeTo(10.0d, 0.001d))); + + status = monitor.getStatus(Locale.getDefault()); + assertThat(status, is(notNullValue())); + assertThat(status.getMessage(), is("second test task 2")); + assertThat(status.getPercentWorked(), is(closeTo(10.0d, 0.001d))); + + status = monitor.getStatus(null); + assertThat(status, is(notNullValue())); + assertThat(status.getMessage(), is("second test task 2")); + assertThat(status.getPercentWorked(), is(closeTo(10.0d, 0.001d))); + } + + @Test public void shouldHaveProgressOfZeroPercentUponCreation() { - ProgressStatus status = monitor.getStatus(); + ProgressStatus status = monitor.getStatus(null); assertThat(status, is(notNullValue())); assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName()))); assertThat(status.getMessage(), is("")); @@ -65,7 +132,7 @@ @Test public void shouldHaveProgressOfZeroPercentUponBeginningTask() { this.monitor.beginTask(100, MockI18n.passthrough, validTaskName); - ProgressStatus status = monitor.getStatus(); + ProgressStatus status = monitor.getStatus(null); assertThat(status, is(notNullValue())); assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName()))); assertThat(status.getMessage(), is(validTaskName)); @@ -75,7 +142,7 @@ @Test public void shouldShowProperProgress() { this.monitor.beginTask(1000, MockI18n.passthrough, validTaskName); - ProgressStatus status = monitor.getStatus(); + ProgressStatus status = monitor.getStatus(null); assertThat(status, is(notNullValue())); assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName()))); assertThat(status.getMessage(), is(validTaskName)); @@ -83,7 +150,7 @@ for (int i = 1; i <= 9; ++i) { this.monitor.worked(100); // Check the monitor's status ... - status = monitor.getStatus(); + status = monitor.getStatus(null); assertThat(status, is(notNullValue())); assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName()))); assertThat(status.getMessage(), is(validTaskName)); @@ -92,7 +159,7 @@ } monitor.done(); // Check the monitor's status shows 100% - status = monitor.getStatus(); + status = monitor.getStatus(null); assertThat(status, is(notNullValue())); assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName()))); assertThat(status.getMessage(), is(validTaskName)); @@ -103,7 +170,7 @@ @Test public void shouldShowProperProgressUsingSubtasks() { monitor.beginTask(1000, MockI18n.passthrough, validTaskName); - ProgressStatus status = monitor.getStatus(); + ProgressStatus status = monitor.getStatus(null); assertThat(status, is(notNullValue())); assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName()))); assertThat(status.getMessage(), is(validTaskName)); @@ -123,7 +190,7 @@ subtask.worked(1); // Check the submonitor's status - status = subtask.getStatus(); + status = subtask.getStatus(null); assertThat(status, is(notNullValue())); assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName()))); assertThat(status.getMessage(), is(subtaskName)); @@ -135,7 +202,7 @@ subtask.done(); // Check the main monitor's status - status = monitor.getStatus(); + status = monitor.getStatus(null); assertThat(status, is(notNullValue())); assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName()))); assertThat(status.getMessage(), is(validTaskName)); @@ -145,7 +212,7 @@ monitor.done(); // Check the monitor's status shows 100% - status = monitor.getStatus(); + status = monitor.getStatus(null); assertThat(status, is(notNullValue())); assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName()))); assertThat(status.getMessage(), is(validTaskName)); @@ -156,7 +223,7 @@ @Test public void shouldAllowDoneToBeCalledEvenAfterFinished() { monitor.beginTask(1000, MockI18n.passthrough, validTaskName); - ProgressStatus status = monitor.getStatus(); + ProgressStatus status = monitor.getStatus(null); assertThat(status, is(notNullValue())); assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName()))); assertThat(status.getMessage(), is(validTaskName)); @@ -168,7 +235,7 @@ monitor.done(); // Check the status ... - status = monitor.getStatus(); + status = monitor.getStatus(null); assertThat(status, is(notNullValue())); assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName()))); assertThat(status.getMessage(), is(validTaskName)); @@ -185,7 +252,7 @@ @Test public void shouldAllowCancelToBeRejected() { monitor.beginTask(1000, MockI18n.passthrough, validTaskName); - ProgressStatus status = monitor.getStatus(); + ProgressStatus status = monitor.getStatus(null); assertThat(status, is(notNullValue())); assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName()))); assertThat(status.getMessage(), is(validTaskName)); @@ -194,7 +261,7 @@ monitor.worked(100); // Check the monitor's status ... - status = monitor.getStatus(); + status = monitor.getStatus(null); assertThat(status, is(notNullValue())); assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName()))); assertThat(status.getMessage(), is(validTaskName)); @@ -207,7 +274,7 @@ } monitor.done(); // Check the monitor's status shows 100% - status = monitor.getStatus(); + status = monitor.getStatus(null); assertThat(status, is(notNullValue())); assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName()))); assertThat(status.getMessage(), is(validTaskName)); @@ -219,7 +286,7 @@ @Test public void shouldContinueToRecordWorkEvenWhenCancelled() { monitor.beginTask(1000, MockI18n.passthrough, validTaskName); - ProgressStatus status = monitor.getStatus(); + ProgressStatus status = monitor.getStatus(null); assertThat(status, is(notNullValue())); assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName()))); assertThat(status.getMessage(), is(validTaskName)); @@ -228,7 +295,7 @@ monitor.worked(100); // Check the monitor's status ... - status = monitor.getStatus(); + status = monitor.getStatus(null); assertThat(status, is(notNullValue())); assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName()))); assertThat(status.getMessage(), is(validTaskName)); @@ -241,7 +308,7 @@ } monitor.done(); // Check the monitor's status shows 100% - status = monitor.getStatus(); + status = monitor.getStatus(null); assertThat(status, is(notNullValue())); assertThat(status.getActivityName(), is(sameInstance(monitor.getActivityName()))); assertThat(status.getMessage(), is(validTaskName)); @@ -249,4 +316,31 @@ assertThat(status.isDone(), is(true)); assertThat(monitor.isCancelled(), is(true)); } + + public static class I18nMessages { + + public static I18n testTaskName; + public static I18n testTaskName2; + + static { + try { + I18n.initialize(SimpleProgressMonitorTest.I18nMessages.class); + } catch (final Exception err) { + System.err.println(err); + } + } + + public static Set<Locale> getLocalizationProblemLocales() { + return I18n.getLocalizationProblemLocales(CommonI18n.class); + } + + public static Set<String> getLocalizationProblems() { + return I18n.getLocalizationProblems(CommonI18n.class); + } + + public static Set<String> getLocalizationProblems( Locale locale ) { + return I18n.getLocalizationProblems(CommonI18n.class, locale); + } + + } } Added: trunk/dna-common/src/test/resources/org/jboss/dna/common/monitor/SimpleProgressMonitorTest$I18nMessages_en.properties =================================================================== --- trunk/dna-common/src/test/resources/org/jboss/dna/common/monitor/SimpleProgressMonitorTest$I18nMessages_en.properties (rev 0) +++ trunk/dna-common/src/test/resources/org/jboss/dna/common/monitor/SimpleProgressMonitorTest$I18nMessages_en.properties 2008-04-25 03:05:53 UTC (rev 109) @@ -0,0 +1,2 @@ +testTaskName = test task +testTaskName2 = second test task {0} \ No newline at end of file Property changes on: trunk/dna-common/src/test/resources/org/jboss/dna/common/monitor/SimpleProgressMonitorTest$I18nMessages_en.properties ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain Added: trunk/dna-common/src/test/resources/org/jboss/dna/common/monitor/SimpleProgressMonitorTest$I18nMessages_fr.properties =================================================================== --- trunk/dna-common/src/test/resources/org/jboss/dna/common/monitor/SimpleProgressMonitorTest$I18nMessages_fr.properties (rev 0) +++ trunk/dna-common/src/test/resources/org/jboss/dna/common/monitor/SimpleProgressMonitorTest$I18nMessages_fr.properties 2008-04-25 03:05:53 UTC (rev 109) @@ -0,0 +1,2 @@ +testTaskName = t�che d'essai +testTaskName2 = deuxi�me t�che d'essai {0} \ No newline at end of file Property changes on: trunk/dna-common/src/test/resources/org/jboss/dna/common/monitor/SimpleProgressMonitorTest$I18nMessages_fr.properties ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain