Index: ssts-web/build.gradle =================================================================== diff -u -r18059 -r18286 --- ssts-web/build.gradle (.../build.gradle) (revision 18059) +++ ssts-web/build.gradle (.../build.gradle) (revision 18286) @@ -49,7 +49,14 @@ //outputDirectory = file("$project.buildDir//testngOutput") //report generation delegated to TestNG library: useDefaultListeners = true - suites 'src/test/resources/test/forgon/AllTests.xml' + + // 运行时传入参数seleniumTests,则运行selenium测试套件,否则运行JUnit测试套件 + if (project.hasProperty("seleniumTests")){ + suites 'src/test/resources/test/forgon/selenium/SeleniumTests.xml' + } + else{ + suites 'src/test/resources/test/forgon/AllTests.xml' + } } //reports.html.enabled = false ignoreFailures = true //use this to allow build to continue for CI purposes @@ -215,7 +222,8 @@ runtime 'commons-jxpath:commons-jxpath:1.2' runtime 'commons-validator:commons-validator:1.3.1' - runtime 'xalan:xalan:2.5.1' + runtime 'xalan:xalan:2.7.2' + runtime 'xalan:serializer:2.7.2' runtime 'org.codehaus.groovy:groovy-all:1.7.5' @@ -328,55 +336,61 @@ } } -task cleanDir0 { - cleanDir_Method() -} +if (project.hasProperty("seleniumTests") == false){ -task prepareSpringSecurityXmlFile0 { - prepareSpringSecurityXmlFile_Method() -} + task cleanDir0 { + cleanDir_Method() + } + + task prepareSpringSecurityXmlFile0 { + prepareSpringSecurityXmlFile_Method() + } + + task copyToWebappClasses0 { + copyToWebappClasses_Method() + } + + task copyDependenciesToLibDir0 { + copyDependenciesToLibDir_Method() + } + + task prepareWebXmlFile0 { + prepareWebXmlFile_Method() + } + + // task定义的名字后加上 <<,这样不会每次build都自动运行task,也可改为doLast + task cleanDir << { + cleanDir_Method() + } + + task prepareSpringSecurityXmlFile << { + prepareSpringSecurityXmlFile_Method() + } + + task copyToWebappClasses << { + copyToWebappClasses_Method() + } + + task copyDependenciesToLibDir << { + copyDependenciesToLibDir_Method() + } + + task prepareWebXmlFile << { + prepareWebXmlFile_Method() + } + + + + prepareSpringSecurityXmlFile.dependsOn cleanDir + + copyToWebappClasses.dependsOn prepareSpringSecurityXmlFile + + copyDependenciesToLibDir.dependsOn copyToWebappClasses + + prepareWebXmlFile.dependsOn copyDependenciesToLibDir + + // build结束后,自动运行准备web.xml文件的任务,以及该任务所依赖的任务 + build.finalizedBy(prepareWebXmlFile) + //war.finalizedBy(prepareWebXmlFile) -task copyToWebappClasses0 { - copyToWebappClasses_Method() -} - -task copyDependenciesToLibDir0 { - copyDependenciesToLibDir_Method() -} - -task prepareWebXmlFile0 { - prepareWebXmlFile_Method() -} - -// task定义的名字后加上 <<,这样不会每次build都自动运行task,也可改为doLast -task cleanDir << { - cleanDir_Method() -} - -task prepareSpringSecurityXmlFile << { - prepareSpringSecurityXmlFile_Method() -} - -task copyToWebappClasses << { - copyToWebappClasses_Method() -} - -task copyDependenciesToLibDir << { - copyDependenciesToLibDir_Method() -} - -task prepareWebXmlFile << { - prepareWebXmlFile_Method() -} - -prepareSpringSecurityXmlFile.dependsOn cleanDir - -copyToWebappClasses.dependsOn prepareSpringSecurityXmlFile - -copyDependenciesToLibDir.dependsOn copyToWebappClasses - -prepareWebXmlFile.dependsOn copyDependenciesToLibDir - -// build结束后,自动运行准备web.xml文件的任务,以及该任务所依赖的任务 -build.finalizedBy(prepareWebXmlFile) -//war.finalizedBy(prepareWebXmlFile) \ No newline at end of file +} \ No newline at end of file