Revision: 1139
Author: lstreepy
Date: 2006-05-10 15:46:12 -0700 (Wed, 10 May 2006)
ViewCVS: http://svn.sourceforge.net/spring-rich-c/?rev=1139&view=rev
Log Message:
-----------
Cleanup test failures after application services refactoring.
Modified Paths:
--------------
trunk/spring-richclient/support/src/test/java/org/springframework/binding/form/support/FormModelMediatingValueModelTests.java
trunk/spring-richclient/support/src/test/java/org/springframework/binding/value/support/AbstractValueModelTests.java
trunk/spring-richclient/support/src/test/java/org/springframework/binding/value/support/TypeConverterTests.java
trunk/spring-richclient/support/src/test/java/org/springframework/binding/value/swing/AsYouTypeTextComponentAdapterTests.java
trunk/spring-richclient/support/src/test/java/org/springframework/binding/value/swing/FocusLostTextComponentAdapterTests.java
trunk/spring-richclient/support/src/test/java/org/springframework/binding/value/swing/FormattedTextFieldAdapterTests.java
trunk/spring-richclient/support/src/test/java/org/springframework/core/closure/ClosureTests.java
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/command/config/MultiFacedEnablingTests.java
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/form/binding/swing/SwingBindingFactoryTests.java
trunk/spring-richclient/tiger/src/test/java/org/springframework/binding/support/AnnotationAwareBeanPropertyAccessStrategyTests.java
Modified:
trunk/spring-richclient/support/src/test/java/org/springframework/binding/form/support/FormModelMediatingValueModelTests.java
===================================================================
---
trunk/spring-richclient/support/src/test/java/org/springframework/binding/form/support/FormModelMediatingValueModelTests.java
2006-05-10 22:45:45 UTC (rev 1138)
+++
trunk/spring-richclient/support/src/test/java/org/springframework/binding/form/support/FormModelMediatingValueModelTests.java
2006-05-10 22:46:12 UTC (rev 1139)
@@ -19,17 +19,14 @@
import org.springframework.binding.value.ValueModel;
import org.springframework.binding.value.support.DirtyTrackingValueModel;
import org.springframework.binding.value.support.ValueHolder;
-import org.springframework.richclient.application.Application;
-import
org.springframework.richclient.application.config.DefaultApplicationLifecycleAdvisor;
+import org.springframework.richclient.test.SpringRichTestCase;
-import junit.framework.TestCase;
-
/**
* Tests for @link FormModelMediatingValueModel
*
* @author Oliver Hutchison
*/
-public class FormModelMediatingValueModelTests extends TestCase {
+public class FormModelMediatingValueModelTests extends SpringRichTestCase {
private FormModelMediatingValueModel mvm;
@@ -39,10 +36,7 @@
private TestPropertyChangeListener dcl;
- protected void setUp() throws Exception {
- super.setUp();
- Application.load(null);
- new Application(new DefaultApplicationLifecycleAdvisor());
+ protected void doSetUp() throws Exception {
pvm = new ValueHolder();
mvm = new FormModelMediatingValueModel(pvm, true);
vcl = new TestPropertyChangeListener(ValueModel.VALUE_PROPERTY);
Modified:
trunk/spring-richclient/support/src/test/java/org/springframework/binding/value/support/AbstractValueModelTests.java
===================================================================
---
trunk/spring-richclient/support/src/test/java/org/springframework/binding/value/support/AbstractValueModelTests.java
2006-05-10 22:45:45 UTC (rev 1138)
+++
trunk/spring-richclient/support/src/test/java/org/springframework/binding/value/support/AbstractValueModelTests.java
2006-05-10 22:46:12 UTC (rev 1139)
@@ -19,19 +19,16 @@
import java.math.BigDecimal;
import java.math.BigInteger;
-import junit.framework.TestCase;
-
import org.springframework.binding.support.TestPropertyChangeListener;
import org.springframework.binding.value.ValueModel;
-import org.springframework.richclient.application.Application;
-import
org.springframework.richclient.application.config.DefaultApplicationLifecycleAdvisor;
+import org.springframework.richclient.test.SpringRichTestCase;
/**
* Tests class [EMAIL PROTECTED] AbstractValueModel}.
*
* @author Oliver Hutchison
*/
-public class AbstractValueModelTests extends TestCase {
+public class AbstractValueModelTests extends SpringRichTestCase {
private TestAbstractValueModel vm;
@@ -43,9 +40,7 @@
}
}
- public void setUp() {
- Application.load(null);
- new Application(new DefaultApplicationLifecycleAdvisor());
+ public void doSetUp() {
vm = new TestAbstractValueModel();
pcl = new TestPropertyChangeListener(ValueModel.VALUE_PROPERTY);
vm.addValueChangeListener(pcl);
Modified:
trunk/spring-richclient/support/src/test/java/org/springframework/binding/value/support/TypeConverterTests.java
===================================================================
---
trunk/spring-richclient/support/src/test/java/org/springframework/binding/value/support/TypeConverterTests.java
2006-05-10 22:45:45 UTC (rev 1138)
+++
trunk/spring-richclient/support/src/test/java/org/springframework/binding/value/support/TypeConverterTests.java
2006-05-10 22:46:12 UTC (rev 1139)
@@ -17,27 +17,19 @@
import org.springframework.binding.value.ValueModel;
import org.springframework.core.closure.Closure;
-import org.springframework.richclient.application.Application;
-import
org.springframework.richclient.application.config.DefaultApplicationLifecycleAdvisor;
+import org.springframework.richclient.test.SpringRichTestCase;
-import junit.framework.TestCase;
-
/**
* Tests class [EMAIL PROTECTED] TypeConverter}.
*
* @author Oliver Hutchison
*/
-public class TypeConverterTests extends TestCase {
+public class TypeConverterTests extends SpringRichTestCase {
private ValueModel vm = new ValueHolder("whatever!");
private TypeConverter tc = new TypeConverter(vm, new UpperConverter(), new
LowerConverter());
- public final void setUp() {
- Application.load(null);
- new Application(new DefaultApplicationLifecycleAdvisor());
- }
-
public void testConvertsTo() {
vm.setValue("test");
assertEquals("TEST", tc.getValue());
Modified:
trunk/spring-richclient/support/src/test/java/org/springframework/binding/value/swing/AsYouTypeTextComponentAdapterTests.java
===================================================================
---
trunk/spring-richclient/support/src/test/java/org/springframework/binding/value/swing/AsYouTypeTextComponentAdapterTests.java
2006-05-10 22:45:45 UTC (rev 1138)
+++
trunk/spring-richclient/support/src/test/java/org/springframework/binding/value/swing/AsYouTypeTextComponentAdapterTests.java
2006-05-10 22:46:12 UTC (rev 1139)
@@ -15,20 +15,17 @@
*/
package org.springframework.binding.value.swing;
-import junit.framework.TestCase;
-
import org.springframework.binding.support.TestPropertyChangeListener;
import org.springframework.binding.value.ValueModel;
import org.springframework.binding.value.support.ValueHolder;
-import org.springframework.richclient.application.Application;
-import
org.springframework.richclient.application.config.DefaultApplicationLifecycleAdvisor;
+import org.springframework.richclient.test.SpringRichTestCase;
/**
* Test cases for [EMAIL PROTECTED] AsYouTypeTextComponentAdapter}
*
* @author Oliver Hutchison
*/
-public class AsYouTypeTextComponentAdapterTests extends TestCase {
+public class AsYouTypeTextComponentAdapterTests extends SpringRichTestCase {
private ValueModel valueModel;
@@ -36,10 +33,7 @@
private TestableJTextComponent comp;
- public void setUp() throws Exception {
- super.setUp();
- Application.load(null);
- new Application(new DefaultApplicationLifecycleAdvisor());
+ public void doSetUp() throws Exception {
valueModel = new ValueHolder("");
valueListener = new
TestPropertyChangeListener(ValueModel.VALUE_PROPERTY);
valueModel.addValueChangeListener(valueListener);
Modified:
trunk/spring-richclient/support/src/test/java/org/springframework/binding/value/swing/FocusLostTextComponentAdapterTests.java
===================================================================
---
trunk/spring-richclient/support/src/test/java/org/springframework/binding/value/swing/FocusLostTextComponentAdapterTests.java
2006-05-10 22:45:45 UTC (rev 1138)
+++
trunk/spring-richclient/support/src/test/java/org/springframework/binding/value/swing/FocusLostTextComponentAdapterTests.java
2006-05-10 22:46:12 UTC (rev 1139)
@@ -15,20 +15,17 @@
*/
package org.springframework.binding.value.swing;
-import junit.framework.TestCase;
-
import org.springframework.binding.support.TestPropertyChangeListener;
import org.springframework.binding.value.ValueModel;
import org.springframework.binding.value.support.ValueHolder;
-import org.springframework.richclient.application.Application;
-import
org.springframework.richclient.application.config.DefaultApplicationLifecycleAdvisor;
+import org.springframework.richclient.test.SpringRichTestCase;
/**
* Test cases for [EMAIL PROTECTED] FocusLostTextComponentAdapter}
*
* @author Oliver Hutchison
*/
-public class FocusLostTextComponentAdapterTests extends TestCase {
+public class FocusLostTextComponentAdapterTests extends SpringRichTestCase {
private ValueModel valueModel;
@@ -36,10 +33,7 @@
private TestableJTextComponent comp;
- public void setUp() throws Exception {
- super.setUp();
- Application.load(null);
- new Application(new DefaultApplicationLifecycleAdvisor());
+ public void doSetUp() throws Exception {
valueModel = new ValueHolder("");
valueListener = new
TestPropertyChangeListener(ValueModel.VALUE_PROPERTY);
valueModel.addValueChangeListener(valueListener);
Modified:
trunk/spring-richclient/support/src/test/java/org/springframework/binding/value/swing/FormattedTextFieldAdapterTests.java
===================================================================
---
trunk/spring-richclient/support/src/test/java/org/springframework/binding/value/swing/FormattedTextFieldAdapterTests.java
2006-05-10 22:45:45 UTC (rev 1138)
+++
trunk/spring-richclient/support/src/test/java/org/springframework/binding/value/swing/FormattedTextFieldAdapterTests.java
2006-05-10 22:46:12 UTC (rev 1139)
@@ -21,20 +21,17 @@
import javax.swing.JFormattedTextField.AbstractFormatter;
import javax.swing.JFormattedTextField.AbstractFormatterFactory;
-import junit.framework.TestCase;
-
import org.springframework.binding.support.TestPropertyChangeListener;
import org.springframework.binding.value.ValueModel;
import org.springframework.binding.value.support.ValueHolder;
-import org.springframework.richclient.application.Application;
-import
org.springframework.richclient.application.config.DefaultApplicationLifecycleAdvisor;
+import org.springframework.richclient.test.SpringRichTestCase;
/**
* Test cases for [EMAIL PROTECTED] FormattedTextFieldAdapter}
*
* @author Oliver Hutchison
*/
-public class FormattedTextFieldAdapterTests extends TestCase {
+public class FormattedTextFieldAdapterTests extends SpringRichTestCase {
private ValueModel valueModel;
@@ -42,10 +39,7 @@
private TestableJTextComponent comp;
- public void setUp() throws Exception {
- super.setUp();
- Application.load(null);
- new Application(new DefaultApplicationLifecycleAdvisor());
+ public void doSetUp() throws Exception {
valueModel = new ValueHolder("");
valueListener = new
TestPropertyChangeListener(ValueModel.VALUE_PROPERTY);
valueModel.addValueChangeListener(valueListener);
Modified:
trunk/spring-richclient/support/src/test/java/org/springframework/core/closure/ClosureTests.java
===================================================================
---
trunk/spring-richclient/support/src/test/java/org/springframework/core/closure/ClosureTests.java
2006-05-10 22:45:45 UTC (rev 1138)
+++
trunk/spring-richclient/support/src/test/java/org/springframework/core/closure/ClosureTests.java
2006-05-10 22:46:12 UTC (rev 1139)
@@ -6,24 +6,16 @@
import java.util.ArrayList;
import java.util.List;
-import junit.framework.TestCase;
-
import org.springframework.binding.value.ValueModel;
import org.springframework.binding.value.support.ValueHolder;
import org.springframework.core.closure.support.Block;
import org.springframework.core.closure.support.IteratorTemplate;
-import org.springframework.richclient.application.Application;
-import
org.springframework.richclient.application.config.DefaultApplicationLifecycleAdvisor;
+import org.springframework.richclient.test.SpringRichTestCase;
/**
* @author Keith Donald
*/
-public class ClosureTests extends TestCase {
- public final void setUp() {
- Application.load(null);
- new Application(new DefaultApplicationLifecycleAdvisor());
- }
-
+public class ClosureTests extends SpringRichTestCase {
public void testIteratorProcessTemplateRunOnce() {
List collection = new ArrayList();
collection.add("Item 1");
Modified:
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/command/config/MultiFacedEnablingTests.java
===================================================================
---
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/command/config/MultiFacedEnablingTests.java
2006-05-10 22:45:45 UTC (rev 1138)
+++
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/command/config/MultiFacedEnablingTests.java
2006-05-10 22:46:12 UTC (rev 1139)
@@ -17,26 +17,18 @@
import javax.swing.AbstractButton;
-import junit.framework.TestCase;
-
-import org.springframework.richclient.application.Application;
-import
org.springframework.richclient.application.config.DefaultApplicationLifecycleAdvisor;
import org.springframework.richclient.command.ActionCommand;
+import org.springframework.richclient.test.SpringRichTestCase;
/**
* MultiFacedEnablingTests was built to check up on the issue reported as <a
* href="http://opensource.atlassian.com/projects/spring/browse/RCP-73";>RCP-73
</a>.
*/
-public class MultiFacedEnablingTests extends TestCase
+public class MultiFacedEnablingTests extends SpringRichTestCase
{
private static final String ALTERNATE_ID = "otherId";
private static final String MAIN_ID = "someid";
- public final void setUp() {
- Application.load(null);
- new Application(new DefaultApplicationLifecycleAdvisor());
- }
-
/**
* Big idea of the test:
* <ol>
Modified:
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/form/binding/swing/SwingBindingFactoryTests.java
===================================================================
---
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/form/binding/swing/SwingBindingFactoryTests.java
2006-05-10 22:45:45 UTC (rev 1138)
+++
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/form/binding/swing/SwingBindingFactoryTests.java
2006-05-10 22:46:12 UTC (rev 1139)
@@ -27,8 +27,6 @@
import javax.swing.JList;
import javax.swing.JTextField;
-import junit.framework.TestCase;
-
import org.springframework.beans.InvalidPropertyException;
import org.springframework.beans.support.PropertyComparator;
import org.springframework.beans.support.SortDefinition;
@@ -38,25 +36,19 @@
import org.springframework.binding.value.support.ListListModel;
import org.springframework.binding.value.support.ObservableList;
import org.springframework.binding.value.support.ValueHolder;
-import org.springframework.context.support.StaticApplicationContext;
-import org.springframework.richclient.application.Application;
-import
org.springframework.richclient.application.config.DefaultApplicationLifecycleAdvisor;
import org.springframework.richclient.form.FormModelHelper;
import org.springframework.richclient.list.BeanPropertyValueComboBoxEditor;
import org.springframework.richclient.list.BeanPropertyValueListRenderer;
+import org.springframework.richclient.test.SpringRichTestCase;
/**
* @author Oliver Hutchison
*/
-public class SwingBindingFactoryTests extends TestCase {
+public class SwingBindingFactoryTests extends SpringRichTestCase {
private SwingBindingFactory sbf;
- public void setUp() {
- Application.load( null );
- Application application = new Application(new
DefaultApplicationLifecycleAdvisor());
- application.setApplicationContext(new StaticApplicationContext());
-
+ public void doSetUp() {
sbf = new SwingBindingFactory(FormModelHelper.createFormModel(new
TestBean()));
sbf.setBinderSelectionStrategy(new TestingBinderSelectionStrategy());
}
Modified:
trunk/spring-richclient/tiger/src/test/java/org/springframework/binding/support/AnnotationAwareBeanPropertyAccessStrategyTests.java
===================================================================
---
trunk/spring-richclient/tiger/src/test/java/org/springframework/binding/support/AnnotationAwareBeanPropertyAccessStrategyTests.java
2006-05-10 22:45:45 UTC (rev 1138)
+++
trunk/spring-richclient/tiger/src/test/java/org/springframework/binding/support/AnnotationAwareBeanPropertyAccessStrategyTests.java
2006-05-10 22:46:12 UTC (rev 1139)
@@ -22,14 +22,13 @@
import org.springframework.binding.form.FormModel;
import org.springframework.binding.form.PropertyMetadata;
import org.springframework.binding.form.support.DefaultFormModel;
+import org.springframework.richclient.test.SpringRichTestCase;
-import junit.framework.TestCase;
-
/**
* @author andy
* @since May 8, 2006 5:20:39 PM
*/
-public class AnnotationAwareBeanPropertyAccessStrategyTests extends TestCase {
+public class AnnotationAwareBeanPropertyAccessStrategyTests extends
SpringRichTestCase {
public void testBeanWithNoAnnotations() {
final AnnotationAwareBeanPropertyAccessStrategy pas = new
AnnotationAwareBeanPropertyAccessStrategy(new NoAnnotationTestBean());
final PropertyMetadataAccessStrategy mas =
pas.getMetadataAccessStrategy();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
spring-rich-c-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/spring-rich-c-cvs
