Skip to content

Commit 623f570

Browse files
gregturngregturn
committed
Merged my se-springpython-py-50 branch changes r16:26 into trunk.
git-svn-id: https://src.springframework.org/svn/se-springpython-py/trunk@27 ce8fead1-4192-4296-8608-a705134b927f
1 parent ccfa6c1 commit 623f570

49 files changed

Lines changed: 130 additions & 133 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/setup.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,9 @@
4040
'springpython.security',
4141
'springpython.security.context',
4242
'springpython.security.providers',
43-
'springpython.security.userdetails',
44-
'springpython.test',
45-
'springpython.test.support'
43+
'springpython.security.userdetails'
4644
],
47-
package_data={'springpython': ["README", "NOTICE", "LICENSE.txt"],
48-
'springpython.test.support': ['*.xml', '*.txt']},
45+
package_data={'springpython': ["README", "NOTICE", "LICENSE.txt"]},
4946
download_url="http://sourceforge.net/projects/springpython/",
5047
classifiers=["License :: OSI Approved :: Apache Software License",
5148
"Intended Audience :: Developers",

‎src/springpython/test/__init__.py‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎src/springpython/test/support/contextSingletonPrototypeCOmponentContext.xml‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/springpython/test/support/contextTestPrimaryApplicationContext.xml‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/springpython/test/support/contextTestSecondaryApplicationContext.xml‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/springpython/test/support/databaseTestApplicationContext.xml‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎test/springpythontest/__init__.py‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
"""
2+
Copyright 2006-2008 SpringSource (http://springsource.com), All Rights Reserved
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
"""
16+
from springpythontest.aopTestCases import *
17+
from springpythontest.contextTestCases import *
18+
from springpythontest.databaseCoreTestCases import MySQLDatabaseTemplateTestCase
19+
from springpythontest.databaseCoreTestCases import PostGreSQLDatabaseTemplateTestCase
20+
from springpythontest.databaseCoreTestCases import SqliteDatabaseTemplateTestCase
21+
from springpythontest.databaseCoreTestCases import DatabaseTemplateMockTestCase
22+
from springpythontest.databaseTransactionTestCases import MySQLTransactionTestCase
23+
from springpythontest.databaseTransactionTestCases import PostGreSQLTransactionTestCase
24+
from springpythontest.databaseTransactionTestCases import SqliteTransactionTestCase
25+
from springpythontest.remotingTestCases import *
26+
from springpythontest.securityEncodingTestCases import *
27+
from springpythontest.securityProviderTestCases import *
28+
from springpythontest.securityUserDetailsTestCases import *
29+
from springpythontest.securityVoteTestCases import *
30+
from springpythontest.securityWebTestCases import *

src/springpython/test/allTests.py renamed to test/springpythontest/allTests.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import logging
1717
import unittest, os
1818
import springpython
19-
import springpython.test
19+
import springpythontest
2020

2121
if __name__ == "__main__":
2222
logger = logging.getLogger("springpython")
@@ -29,5 +29,5 @@
2929
logger.addHandler(ch)
3030

3131
suite = unittest.TestSuite()
32-
suite.addTest(unittest.defaultTestLoader.loadTestsFromModule(springpython.test))
32+
suite.addTest(unittest.defaultTestLoader.loadTestsFromModule(springpythontest))
3333
unittest.TextTestRunner(verbosity=2).run(suite)

src/springpython/test/aopTestCases.py renamed to test/springpythontest/aopTestCases.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
from springpython.aop import RegexpMethodPointcutAdvisor
2323
from springpython.context import XmlApplicationContext
2424
from springpython.remoting.pyro import PyroDaemonHolder
25-
from springpython.test.support.testSupportClasses import BeforeAndAfterInterceptor
26-
from springpython.test.support.testSupportClasses import SampleService
27-
from springpython.test.support.testSupportClasses import WrappingInterceptor
25+
from springpythontest.support.testSupportClasses import BeforeAndAfterInterceptor
26+
from springpythontest.support.testSupportClasses import SampleService
27+
from springpythontest.support.testSupportClasses import WrappingInterceptor
2828

2929
class AopInterfaceTestCase(unittest.TestCase):
3030
def testPointcutInterface(self):

src/springpython/test/contextTestCases.py renamed to test/springpythontest/contextTestCases.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from springpython.context import ApplicationContext
1818
from springpython.context import XmlApplicationContext
1919
from springpython.context import ComponentNotFound
20-
from springpython.test.support import testSupportClasses
20+
from springpythontest.support import testSupportClasses
2121

2222
class XmlApplicationContextTestCase(unittest.TestCase):
2323
def testCreatingAnApplicationContext(self):

0 commit comments

Comments
 (0)