From 508966f0c7854196393265c4e43a350703a85c65 Mon Sep 17 00:00:00 2001 From: Ben Alex Date: Tue, 14 Nov 2006 03:18:42 +0000 Subject: [PATCH] SEC-313: Add integration test for Contacts. --- .classpath | 26 ++-- ...pplicationContext-common-authorization.xml | 0 .../applicationContext-common-business.xml | 0 .../src/main/webapp/ca/WEB-INF/web.xml | 4 +- .../src/main/webapp/cas/WEB-INF/web.xml | 4 +- .../src/main/webapp/filter/WEB-INF/web.xml | 4 +- .../src/main/webapp/ldap/WEB-INF/web.xml | 4 +- .../src/main/webapp/x509/WEB-INF/web.xml | 4 +- .../contact/AbstractContactsSampleTest.java | 118 ++++++++++++++++++ .../sample/contact/GetAllContactsTests.java | 79 ++++++++++++ .../applicationContext-contacts-test.xml | 38 ++++++ 11 files changed, 260 insertions(+), 21 deletions(-) rename samples/contacts/src/main/{webapp/common/WEB-INF => resources}/applicationContext-common-authorization.xml (100%) rename samples/contacts/src/main/{webapp/common/WEB-INF => resources}/applicationContext-common-business.xml (100%) create mode 100644 samples/contacts/src/test/java/sample/contact/AbstractContactsSampleTest.java create mode 100644 samples/contacts/src/test/java/sample/contact/GetAllContactsTests.java create mode 100644 samples/contacts/src/test/resources/applicationContext-contacts-test.xml diff --git a/.classpath b/.classpath index 62cf322580..dc83cb3e10 100644 --- a/.classpath +++ b/.classpath @@ -1,22 +1,27 @@ - + + + + - - + + + + + - + + - - - + @@ -24,8 +29,7 @@ - - + @@ -49,14 +53,14 @@ + - + - diff --git a/samples/contacts/src/main/webapp/common/WEB-INF/applicationContext-common-authorization.xml b/samples/contacts/src/main/resources/applicationContext-common-authorization.xml similarity index 100% rename from samples/contacts/src/main/webapp/common/WEB-INF/applicationContext-common-authorization.xml rename to samples/contacts/src/main/resources/applicationContext-common-authorization.xml diff --git a/samples/contacts/src/main/webapp/common/WEB-INF/applicationContext-common-business.xml b/samples/contacts/src/main/resources/applicationContext-common-business.xml similarity index 100% rename from samples/contacts/src/main/webapp/common/WEB-INF/applicationContext-common-business.xml rename to samples/contacts/src/main/resources/applicationContext-common-business.xml diff --git a/samples/contacts/src/main/webapp/ca/WEB-INF/web.xml b/samples/contacts/src/main/webapp/ca/WEB-INF/web.xml index f414d221fd..79e93e20b2 100644 --- a/samples/contacts/src/main/webapp/ca/WEB-INF/web.xml +++ b/samples/contacts/src/main/webapp/ca/WEB-INF/web.xml @@ -21,8 +21,8 @@ contextConfigLocation /WEB-INF/applicationContext-acegi-security.xml - /WEB-INF/applicationContext-common-business.xml - /WEB-INF/applicationContext-common-authorization.xml + classpath:applicationContext-common-business.xml + classpath:applicationContext-common-authorization.xml diff --git a/samples/contacts/src/main/webapp/cas/WEB-INF/web.xml b/samples/contacts/src/main/webapp/cas/WEB-INF/web.xml index 86f72e3926..f7e7d25eb6 100644 --- a/samples/contacts/src/main/webapp/cas/WEB-INF/web.xml +++ b/samples/contacts/src/main/webapp/cas/WEB-INF/web.xml @@ -21,8 +21,8 @@ contextConfigLocation /WEB-INF/applicationContext-acegi-security.xml - /WEB-INF/applicationContext-common-business.xml - /WEB-INF/applicationContext-common-authorization.xml + classpath:applicationContext-common-business.xml + classpath:applicationContext-common-authorization.xml diff --git a/samples/contacts/src/main/webapp/filter/WEB-INF/web.xml b/samples/contacts/src/main/webapp/filter/WEB-INF/web.xml index a0363c0d36..cd05943446 100644 --- a/samples/contacts/src/main/webapp/filter/WEB-INF/web.xml +++ b/samples/contacts/src/main/webapp/filter/WEB-INF/web.xml @@ -21,8 +21,8 @@ contextConfigLocation /WEB-INF/applicationContext-acegi-security.xml - /WEB-INF/applicationContext-common-business.xml - /WEB-INF/applicationContext-common-authorization.xml + classpath:applicationContext-common-business.xml + classpath:applicationContext-common-authorization.xml diff --git a/samples/contacts/src/main/webapp/ldap/WEB-INF/web.xml b/samples/contacts/src/main/webapp/ldap/WEB-INF/web.xml index ca26575cd8..b2f86de8d8 100644 --- a/samples/contacts/src/main/webapp/ldap/WEB-INF/web.xml +++ b/samples/contacts/src/main/webapp/ldap/WEB-INF/web.xml @@ -21,8 +21,8 @@ contextConfigLocation /WEB-INF/applicationContext-acegi-security.xml - /WEB-INF/applicationContext-common-business.xml - /WEB-INF/applicationContext-common-authorization.xml + classpath:applicationContext-common-business.xml + classpath:applicationContext-common-authorization.xml diff --git a/samples/contacts/src/main/webapp/x509/WEB-INF/web.xml b/samples/contacts/src/main/webapp/x509/WEB-INF/web.xml index 04fe330ebd..2482b7db94 100644 --- a/samples/contacts/src/main/webapp/x509/WEB-INF/web.xml +++ b/samples/contacts/src/main/webapp/x509/WEB-INF/web.xml @@ -21,8 +21,8 @@ contextConfigLocation /WEB-INF/applicationContext-acegi-security.xml - /WEB-INF/applicationContext-common-business.xml - /WEB-INF/applicationContext-common-authorization.xml + classpath:applicationContext-common-business.xml + classpath:applicationContext-common-authorization.xml + + + + + + + + + + + + + + + + + + + + + + + + + + + +