diff options
| -rw-r--r-- | build.xml | 29 | ||||
| -rw-r--r-- | ide/nbproject/ide-file-targets.xml | 7 |
2 files changed, 22 insertions, 14 deletions
@@ -34,6 +34,7 @@ <property name="test.reports.dir" value="test-reports"/> <property name="test.html.reports.dir" value="${test.reports.dir}/html"/> <property name="test.local.properties.file" value="${lib}/testing.properties"/> + <property name="test.accounts.properties.file" value="${lib}/accounts.properties"/> <property name="release" value="release"/> <property name="log" value="log"/> <property name="release.src" value="${release}/install"/> @@ -48,15 +49,6 @@ <isset property="label"/> </condition> - <!-- The following file contains a list of protocol account initialization - properties, such as SIP server addresses and usernames, ICQ uin-s and - passwords, AIM screennames and etc. The file should not be committed - to CVS or shared among developers since that could lead to multiple - login problems and cause testing to fail. You could create the file - yourself using the lib/account.properties.template and setting all - fields as indicated. --> - <property file="${lib}/accounts.properties"/> - <!-- windows specific properties --> <condition property="is.running.windows" value="${os.name}"> <os family="windows"/> @@ -424,7 +416,22 @@ <!-- - - - - - - - - - - - - - UNIT TESTING - - - - - - - - - - - - - - --> - <!--PREPARE-TESTS--> + <!--PREPARE-TESTING-ACCOUNTS--> + <target name="prepare-local-accounts"> + <!--internal-target- setup testing accounts properties --> + <!-- The following local file should contain a list of protocol + account initialization properties, such as SIP server addresses + and usernames, ICQ uin-s and passwords, AIM screennames and etc. + You should create the file based on lib/account.properties.template + and set all the empty fields as indicated. --> + <available property="accounts.properties.present" + file="${test.accounts.properties.file}"/> + <fail unless="accounts.properties.present" + message="${test.accounts.properties.file} not found - did you copy the template?"/> + <property file="${test.accounts.properties.file}"/> + </target> + + <!--PREPARE-TESTS-TO-BE-RUN--> <target name="identify-test"> <!--internal-target- is a single slick defined to be run alone? --> <condition property="test.name.known"> @@ -469,7 +476,7 @@ <!--RUN-TESTS--> <target name="test" - depends="prepare-all-tests,-deploy-os-specific-bundles" + depends="prepare-all-tests,prepare-local-accounts,-deploy-os-specific-bundles" description="Starts felix and runs selected Service Impl Compatibility Kits."> <!-- Do the testing itself. Note that we don't fail on error as we need diff --git a/ide/nbproject/ide-file-targets.xml b/ide/nbproject/ide-file-targets.xml index a5fc762..cce2952 100644 --- a/ide/nbproject/ide-file-targets.xml +++ b/ide/nbproject/ide-file-targets.xml @@ -9,13 +9,14 @@ <import file="../build.xml"/> <target name="debug-selected-file-in-test" - depends="prepare-all-tests,-deploy-os-specific-bundles" + depends="prepare-local-accounts,prepare-all-tests,-deploy-os-specific-bundles" description="Starts felix and debugs the selected Service Impl Compatibility Kit" > <!-- This target runs felix under the debugger, but it can only work with unit test classes that extend TestSuite and implements BundleActivator e.g. GibberishProtocolProviderServiceLick --> - <fail unless="test.name.known" - message="debug impossible when 'test.name' property not defined!" /> + + <!-- if 'test.name' property is not defined, we will be + runing all tests defined in testing.properties. --> <!-- we allow users to pass command line args using the "args" system property. However we need to manually set tha prop to an empty |