updated test package structure

org.springframework.context/src/test/java/org/springframework/model/alert/AlertsTests.java

@@ -1,12 +1,14 @@
-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.model.alert.Alerts.error;
-import static org.springframework.ui.alert.Alerts.fatal;
+import static org.springframework.model.alert.Alerts.fatal;
-import static org.springframework.ui.alert.Alerts.info;
+import static org.springframework.model.alert.Alerts.info;
-import static org.springframework.ui.alert.Alerts.warning;
+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 {
 

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.model.alert.Alert;
-import org.springframework.ui.alert.Severity;
+import org.springframework.model.alert.Severity;
-import org.springframework.ui.alert.support.DefaultAlertContext;
+import org.springframework.model.alert.support.DefaultAlertContext;
 
 public class DefaultAlertContextTests {
 	

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 {
 

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 {
 	

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;

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.model.binder.BindingResults;
-import org.springframework.ui.binding.FieldModel;
+import org.springframework.model.binder.MissingFieldException;
-import org.springframework.ui.binding.support.CollectionTypeDescriptor;
+import org.springframework.model.message.MockMessageSource;
-import org.springframework.ui.binding.support.DefaultPresentationModel;
+import org.springframework.model.ui.BindingStatus;
-import org.springframework.ui.binding.support.GenericFormatterRegistry;
+import org.springframework.model.ui.FieldModel;
-import org.springframework.ui.format.AnnotationFormatterFactory;
+import org.springframework.model.ui.binder.PresentationModelBinder;
-import org.springframework.ui.format.Formatted;
+import org.springframework.model.ui.format.AnnotationFormatterFactory;
-import org.springframework.ui.format.Formatter;
+import org.springframework.model.ui.format.Formatted;
-import org.springframework.ui.format.date.DateFormatter;
+import org.springframework.model.ui.format.Formatter;
-import org.springframework.ui.format.number.CurrencyFormat;
+import org.springframework.model.ui.format.date.DateFormatter;
-import org.springframework.ui.format.number.CurrencyFormatter;
+import org.springframework.model.ui.format.number.CurrencyFormat;
-import org.springframework.ui.format.number.IntegerFormatter;
+import org.springframework.model.ui.format.number.CurrencyFormatter;
-import org.springframework.ui.message.MockMessageSource;
+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 {
 

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.model.binder.BindingResults;
-import org.springframework.ui.binding.binder.WebBinder;
+import org.springframework.model.ui.binder.WebBinder;
-import org.springframework.ui.binding.support.DefaultPresentationModel;
+import org.springframework.model.ui.format.date.DateFormatter;
-import org.springframework.ui.binding.support.GenericFormatterRegistry;
+import org.springframework.model.ui.format.number.CurrencyFormat;
-import org.springframework.ui.format.date.DateFormatter;
+import org.springframework.model.ui.format.number.CurrencyFormatter;
-import org.springframework.ui.format.number.CurrencyFormat;
+import org.springframework.model.ui.support.DefaultPresentationModel;
-import org.springframework.ui.format.number.CurrencyFormatter;
+import org.springframework.model.ui.support.GenericFormatterRegistry;
 
 public class WebBinderTests {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {