Browse Source

Moved tests over from testsuite to beans

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@193 50f2f4bb-b051-0410-bef5-90022cba6387
pull/1/head
Arjen Poutsma 18 years ago
parent
commit
c5a7344404
  1. 1
      org.springframework.beans/ivy.xml
  2. 28
      org.springframework.beans/src/test/java/org/springframework/beans/factory/PackageLevelVisibleBean.java
  3. 0
      org.springframework.beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java
  4. 0
      org.springframework.beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java
  5. 0
      org.springframework.beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java
  6. 0
      org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java
  7. 0
      org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java
  8. 2
      org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java
  9. 0
      org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java
  10. 0
      org.springframework.beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java
  11. 0
      org.springframework.beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java
  12. 0
      org.springframework.beans/src/test/java/org/springframework/beans/factory/support/ManagedMapTests.java
  13. 0
      org.springframework.beans/src/test/java/org/springframework/beans/factory/support/ManagedPropertiesTests.java
  14. 0
      org.springframework.beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java
  15. 0
      org.springframework.beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java
  16. 0
      org.springframework.beans/src/test/resources/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.xml
  17. 0
      org.springframework.beans/src/test/resources/org/springframework/beans/factory/config/fieldRetrieving.xml
  18. 0
      org.springframework.beans/src/test/resources/org/springframework/beans/factory/config/propertyPath.xml
  19. 9
      org.springframework.beans/src/test/resources/org/springframework/beans/factory/config/test-properties.xml
  20. 2
      org.springframework.beans/src/test/resources/org/springframework/beans/factory/config/test.properties
  21. 0
      org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/multiConstructorArgs.properties
  22. 0
      org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/refConstructorArg.properties
  23. 0
      org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/simpleConstructorArg.properties

1
org.springframework.beans/ivy.xml

@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.2.6.ga" conf="test->compile"/>
<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime" />
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->compile"/>
</dependencies>
</ivy-module>

28
org.springframework.beans/src/test/java/org/springframework/beans/factory/PackageLevelVisibleBean.java

@ -0,0 +1,28 @@ @@ -0,0 +1,28 @@
/*
* Copyright 2002-2006 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.beans.factory;
/**
* Used in the tests for the FieldRetrievingFactoryBean class
* (c.f. FieldRetrievingFactoryBeanTests)
*
* @author Rick Evans
*/
class PackageLevelVisibleBean {
public static final String CONSTANT = "Wuby";
}

0
org.springframework.testsuite/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java → org.springframework.beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java

0
org.springframework.testsuite/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java → org.springframework.beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java

0
org.springframework.testsuite/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java → org.springframework.beans/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.java

0
org.springframework.testsuite/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java → org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertiesFactoryBeanTests.java

0
org.springframework.testsuite/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java → org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java

2
org.springframework.testsuite/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java → org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java

@ -20,7 +20,7 @@ import java.util.Arrays; @@ -20,7 +20,7 @@ import java.util.Arrays;
import junit.framework.TestCase;
import org.springframework.aop.framework.PrototypeTargetTests.TestBean;
import org.springframework.beans.TestBean;
/**
* @author Rod Johnson

0
org.springframework.testsuite/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java → org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java

0
org.springframework.testsuite/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java → org.springframework.beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java

0
org.springframework.testsuite/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java → org.springframework.beans/src/test/java/org/springframework/beans/factory/support/ManagedListTests.java

0
org.springframework.testsuite/src/test/java/org/springframework/beans/factory/support/ManagedMapTests.java → org.springframework.beans/src/test/java/org/springframework/beans/factory/support/ManagedMapTests.java

0
org.springframework.testsuite/src/test/java/org/springframework/beans/factory/support/ManagedPropertiesTests.java → org.springframework.beans/src/test/java/org/springframework/beans/factory/support/ManagedPropertiesTests.java

0
org.springframework.testsuite/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java → org.springframework.beans/src/test/java/org/springframework/beans/factory/support/ManagedSetTests.java

0
org.springframework.testsuite/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java → org.springframework.beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java

0
org.springframework.testsuite/src/test/java/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.xml → org.springframework.beans/src/test/resources/org/springframework/beans/factory/config/ObjectFactoryCreatingFactoryBeanTests.xml

0
org.springframework.testsuite/src/test/java/org/springframework/beans/factory/config/fieldRetrieving.xml → org.springframework.beans/src/test/resources/org/springframework/beans/factory/config/fieldRetrieving.xml

0
org.springframework.testsuite/src/test/java/org/springframework/beans/factory/config/propertyPath.xml → org.springframework.beans/src/test/resources/org/springframework/beans/factory/config/propertyPath.xml

9
org.springframework.beans/src/test/resources/org/springframework/beans/factory/config/test-properties.xml

@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties version="1.0">
<entry key="tb.array[0].age">99</entry>
<entry key="tb.list[1].name">test</entry>
</properties>

2
org.springframework.beans/src/test/resources/org/springframework/beans/factory/config/test.properties

@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
tb.array[0].age=99
tb.list[1].name=test

0
org.springframework.testsuite/src/test/java/org/springframework/beans/factory/support/multiConstructorArgs.properties → org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/multiConstructorArgs.properties

0
org.springframework.testsuite/src/test/java/org/springframework/beans/factory/support/refConstructorArg.properties → org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/refConstructorArg.properties

0
org.springframework.testsuite/src/test/java/org/springframework/beans/factory/support/simpleConstructorArg.properties → org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/simpleConstructorArg.properties

Loading…
Cancel
Save