diff --git a/org.springframework.context/src/test/java/org/springframework/ui/alert/AlertsTests.java b/org.springframework.context/src/test/java/org/springframework/model/alert/AlertsTests.java similarity index 63% rename from org.springframework.context/src/test/java/org/springframework/ui/alert/AlertsTests.java rename to org.springframework.context/src/test/java/org/springframework/model/alert/AlertsTests.java index 8915c9d378..c82df3874e 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/alert/AlertsTests.java +++ b/org.springframework.context/src/test/java/org/springframework/model/alert/AlertsTests.java @@ -1,15 +1,17 @@ -package org.springframework.ui.alert; +package org.springframework.model.alert; import static org.junit.Assert.assertEquals; -import static org.springframework.ui.alert.Alerts.error; -import static org.springframework.ui.alert.Alerts.fatal; -import static org.springframework.ui.alert.Alerts.info; -import static org.springframework.ui.alert.Alerts.warning; +import static org.springframework.model.alert.Alerts.error; +import static org.springframework.model.alert.Alerts.fatal; +import static org.springframework.model.alert.Alerts.info; +import static org.springframework.model.alert.Alerts.warning; import org.junit.Test; +import org.springframework.model.alert.Alert; +import org.springframework.model.alert.Severity; public class AlertsTests { - + @Test public void testFactoryMethods() { Alert a1 = info("alert 1"); diff --git a/org.springframework.context/src/test/java/org/springframework/ui/alert/support/DefaultAlertContextTests.java b/org.springframework.context/src/test/java/org/springframework/model/alert/support/DefaultAlertContextTests.java similarity index 77% rename from org.springframework.context/src/test/java/org/springframework/ui/alert/support/DefaultAlertContextTests.java rename to org.springframework.context/src/test/java/org/springframework/model/alert/support/DefaultAlertContextTests.java index 37bc63366d..b945720083 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/alert/support/DefaultAlertContextTests.java +++ b/org.springframework.context/src/test/java/org/springframework/model/alert/support/DefaultAlertContextTests.java @@ -1,12 +1,12 @@ -package org.springframework.ui.alert.support; +package org.springframework.model.alert.support; import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; -import org.springframework.ui.alert.Alert; -import org.springframework.ui.alert.Severity; -import org.springframework.ui.alert.support.DefaultAlertContext; +import org.springframework.model.alert.Alert; +import org.springframework.model.alert.Severity; +import org.springframework.model.alert.support.DefaultAlertContext; public class DefaultAlertContextTests { diff --git a/org.springframework.context/src/test/java/org/springframework/ui/message/MessageBuilderTests.java b/org.springframework.context/src/test/java/org/springframework/model/message/MessageBuilderTests.java similarity index 82% rename from org.springframework.context/src/test/java/org/springframework/ui/message/MessageBuilderTests.java rename to org.springframework.context/src/test/java/org/springframework/model/message/MessageBuilderTests.java index 5324ed9315..bc301c519d 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/message/MessageBuilderTests.java +++ b/org.springframework.context/src/test/java/org/springframework/model/message/MessageBuilderTests.java @@ -1,10 +1,12 @@ -package org.springframework.ui.message; +package org.springframework.model.message; import static org.junit.Assert.assertEquals; import java.util.Locale; import org.junit.Test; +import org.springframework.model.message.MessageBuilder; +import org.springframework.model.message.ResolvableArgument; public class MessageBuilderTests { diff --git a/org.springframework.context/src/test/java/org/springframework/ui/message/MessageResolverBuilderTests.java b/org.springframework.context/src/test/java/org/springframework/model/message/MessageResolverBuilderTests.java similarity index 78% rename from org.springframework.context/src/test/java/org/springframework/ui/message/MessageResolverBuilderTests.java rename to org.springframework.context/src/test/java/org/springframework/model/message/MessageResolverBuilderTests.java index f8c4a9af82..9907a0708a 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/message/MessageResolverBuilderTests.java +++ b/org.springframework.context/src/test/java/org/springframework/model/message/MessageResolverBuilderTests.java @@ -1,10 +1,13 @@ -package org.springframework.ui.message; +package org.springframework.model.message; import static org.junit.Assert.assertEquals; import java.util.Locale; import org.junit.Test; +import org.springframework.model.message.MessageResolver; +import org.springframework.model.message.MessageResolverBuilder; +import org.springframework.model.message.ResolvableArgument; public class MessageResolverBuilderTests { diff --git a/org.springframework.context/src/test/java/org/springframework/ui/message/MockMessageSource.java b/org.springframework.context/src/test/java/org/springframework/model/message/MockMessageSource.java similarity index 97% rename from org.springframework.context/src/test/java/org/springframework/ui/message/MockMessageSource.java rename to org.springframework.context/src/test/java/org/springframework/model/message/MockMessageSource.java index 6327bd1e50..a12e5dac7d 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/message/MockMessageSource.java +++ b/org.springframework.context/src/test/java/org/springframework/model/message/MockMessageSource.java @@ -1,4 +1,4 @@ -package org.springframework.ui.message; +package org.springframework.model.message; import java.text.MessageFormat; import java.util.HashMap; diff --git a/org.springframework.context/src/test/java/org/springframework/ui/binding/binder/GenericBinderTests.java b/org.springframework.context/src/test/java/org/springframework/model/ui/binder/GenericBinderTests.java similarity index 95% rename from org.springframework.context/src/test/java/org/springframework/ui/binding/binder/GenericBinderTests.java rename to org.springframework.context/src/test/java/org/springframework/model/ui/binder/GenericBinderTests.java index f5a35ee596..3bf30a1826 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/binding/binder/GenericBinderTests.java +++ b/org.springframework.context/src/test/java/org/springframework/model/ui/binder/GenericBinderTests.java @@ -1,4 +1,4 @@ -package org.springframework.ui.binding.binder; +package org.springframework.model.ui.binder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -22,19 +22,22 @@ import org.junit.Before; import org.junit.Test; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.core.style.ToStringCreator; -import org.springframework.ui.binding.BindingStatus; -import org.springframework.ui.binding.FieldModel; -import org.springframework.ui.binding.support.CollectionTypeDescriptor; -import org.springframework.ui.binding.support.DefaultPresentationModel; -import org.springframework.ui.binding.support.GenericFormatterRegistry; -import org.springframework.ui.format.AnnotationFormatterFactory; -import org.springframework.ui.format.Formatted; -import org.springframework.ui.format.Formatter; -import org.springframework.ui.format.date.DateFormatter; -import org.springframework.ui.format.number.CurrencyFormat; -import org.springframework.ui.format.number.CurrencyFormatter; -import org.springframework.ui.format.number.IntegerFormatter; -import org.springframework.ui.message.MockMessageSource; +import org.springframework.model.binder.BindingResults; +import org.springframework.model.binder.MissingFieldException; +import org.springframework.model.message.MockMessageSource; +import org.springframework.model.ui.BindingStatus; +import org.springframework.model.ui.FieldModel; +import org.springframework.model.ui.binder.PresentationModelBinder; +import org.springframework.model.ui.format.AnnotationFormatterFactory; +import org.springframework.model.ui.format.Formatted; +import org.springframework.model.ui.format.Formatter; +import org.springframework.model.ui.format.date.DateFormatter; +import org.springframework.model.ui.format.number.CurrencyFormat; +import org.springframework.model.ui.format.number.CurrencyFormatter; +import org.springframework.model.ui.format.number.IntegerFormatter; +import org.springframework.model.ui.support.CollectionTypeDescriptor; +import org.springframework.model.ui.support.DefaultPresentationModel; +import org.springframework.model.ui.support.GenericFormatterRegistry; public class GenericBinderTests { diff --git a/org.springframework.context/src/test/java/org/springframework/ui/binding/binder/WebBinderTests.java b/org.springframework.context/src/test/java/org/springframework/model/ui/binder/WebBinderTests.java similarity index 89% rename from org.springframework.context/src/test/java/org/springframework/ui/binding/binder/WebBinderTests.java rename to org.springframework.context/src/test/java/org/springframework/model/ui/binder/WebBinderTests.java index 5fce8b0a3b..33b404a4f5 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/binding/binder/WebBinderTests.java +++ b/org.springframework.context/src/test/java/org/springframework/model/ui/binder/WebBinderTests.java @@ -1,4 +1,4 @@ -package org.springframework.ui.binding.binder; +package org.springframework.model.ui.binder; import static org.junit.Assert.assertEquals; @@ -14,13 +14,13 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.springframework.context.i18n.LocaleContextHolder; -import org.springframework.ui.binding.binder.BindingResults; -import org.springframework.ui.binding.binder.WebBinder; -import org.springframework.ui.binding.support.DefaultPresentationModel; -import org.springframework.ui.binding.support.GenericFormatterRegistry; -import org.springframework.ui.format.date.DateFormatter; -import org.springframework.ui.format.number.CurrencyFormat; -import org.springframework.ui.format.number.CurrencyFormatter; +import org.springframework.model.binder.BindingResults; +import org.springframework.model.ui.binder.WebBinder; +import org.springframework.model.ui.format.date.DateFormatter; +import org.springframework.model.ui.format.number.CurrencyFormat; +import org.springframework.model.ui.format.number.CurrencyFormatter; +import org.springframework.model.ui.support.DefaultPresentationModel; +import org.springframework.model.ui.support.GenericFormatterRegistry; public class WebBinderTests { diff --git a/org.springframework.context/src/test/java/org/springframework/ui/format/date/DateFormatterTests.java b/org.springframework.context/src/test/java/org/springframework/model/ui/format/date/DateFormatterTests.java similarity index 88% rename from org.springframework.context/src/test/java/org/springframework/ui/format/date/DateFormatterTests.java rename to org.springframework.context/src/test/java/org/springframework/model/ui/format/date/DateFormatterTests.java index ab64e776cb..389a6eb91d 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/format/date/DateFormatterTests.java +++ b/org.springframework.context/src/test/java/org/springframework/model/ui/format/date/DateFormatterTests.java @@ -1,4 +1,4 @@ -package org.springframework.ui.format.date; +package org.springframework.model.ui.format.date; import static org.junit.Assert.assertEquals; @@ -7,6 +7,7 @@ import java.util.Calendar; import java.util.Locale; import org.junit.Test; +import org.springframework.model.ui.format.date.DateFormatter; public class DateFormatterTests { diff --git a/org.springframework.context/src/test/java/org/springframework/ui/format/number/CurrencyFormatterTests.java b/org.springframework.context/src/test/java/org/springframework/model/ui/format/number/CurrencyFormatterTests.java similarity index 91% rename from org.springframework.context/src/test/java/org/springframework/ui/format/number/CurrencyFormatterTests.java rename to org.springframework.context/src/test/java/org/springframework/model/ui/format/number/CurrencyFormatterTests.java index 5a1c8b8ab5..612c53eb42 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/format/number/CurrencyFormatterTests.java +++ b/org.springframework.context/src/test/java/org/springframework/model/ui/format/number/CurrencyFormatterTests.java @@ -1,4 +1,4 @@ -package org.springframework.ui.format.number; +package org.springframework.model.ui.format.number; import static org.junit.Assert.assertEquals; @@ -7,6 +7,7 @@ import java.text.ParseException; import java.util.Locale; import org.junit.Test; +import org.springframework.model.ui.format.number.CurrencyFormatter; public class CurrencyFormatterTests { diff --git a/org.springframework.context/src/test/java/org/springframework/ui/format/number/DecimalFormatterTests.java b/org.springframework.context/src/test/java/org/springframework/model/ui/format/number/DecimalFormatterTests.java similarity index 88% rename from org.springframework.context/src/test/java/org/springframework/ui/format/number/DecimalFormatterTests.java rename to org.springframework.context/src/test/java/org/springframework/model/ui/format/number/DecimalFormatterTests.java index 268cb71bf7..bacd4366d1 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/format/number/DecimalFormatterTests.java +++ b/org.springframework.context/src/test/java/org/springframework/model/ui/format/number/DecimalFormatterTests.java @@ -1,4 +1,4 @@ -package org.springframework.ui.format.number; +package org.springframework.model.ui.format.number; import static org.junit.Assert.assertEquals; @@ -7,6 +7,7 @@ import java.text.ParseException; import java.util.Locale; import org.junit.Test; +import org.springframework.model.ui.format.number.DecimalFormatter; public class DecimalFormatterTests { diff --git a/org.springframework.context/src/test/java/org/springframework/ui/format/number/IntegerFormatterTests.java b/org.springframework.context/src/test/java/org/springframework/model/ui/format/number/IntegerFormatterTests.java similarity index 87% rename from org.springframework.context/src/test/java/org/springframework/ui/format/number/IntegerFormatterTests.java rename to org.springframework.context/src/test/java/org/springframework/model/ui/format/number/IntegerFormatterTests.java index b8b88209f3..aa81233d72 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/format/number/IntegerFormatterTests.java +++ b/org.springframework.context/src/test/java/org/springframework/model/ui/format/number/IntegerFormatterTests.java @@ -1,4 +1,4 @@ -package org.springframework.ui.format.number; +package org.springframework.model.ui.format.number; import static org.junit.Assert.assertEquals; @@ -6,6 +6,7 @@ import java.text.ParseException; import java.util.Locale; import org.junit.Test; +import org.springframework.model.ui.format.number.IntegerFormatter; public class IntegerFormatterTests { diff --git a/org.springframework.context/src/test/java/org/springframework/ui/format/number/PercentFormatterTests.java b/org.springframework.context/src/test/java/org/springframework/model/ui/format/number/PercentFormatterTests.java similarity index 88% rename from org.springframework.context/src/test/java/org/springframework/ui/format/number/PercentFormatterTests.java rename to org.springframework.context/src/test/java/org/springframework/model/ui/format/number/PercentFormatterTests.java index 13e276fa84..399115414e 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/format/number/PercentFormatterTests.java +++ b/org.springframework.context/src/test/java/org/springframework/model/ui/format/number/PercentFormatterTests.java @@ -1,4 +1,4 @@ -package org.springframework.ui.format.number; +package org.springframework.model.ui.format.number; import static org.junit.Assert.assertEquals; @@ -7,6 +7,7 @@ import java.text.ParseException; import java.util.Locale; import org.junit.Test; +import org.springframework.model.ui.format.number.PercentFormatter; public class PercentFormatterTests {