Index: ssts-web/build.gradle =================================================================== diff -u -r26091 -r26129 --- ssts-web/build.gradle (.../build.gradle) (revision 26091) +++ ssts-web/build.gradle (.../build.gradle) (revision 26129) @@ -37,27 +37,17 @@ */ //ignoreFailures = true //use this to allow build to continue for CI purposes - //useTestNG() + useJUnit() - //{ - // suites 'src/test/resources/test/forgon/AllTests.xml' - //} - - - // enable TestNG support (default is JUnit) - useTestNG(){ - //outputDirectory = file("$project.buildDir//testngOutput") - //report generation delegated to TestNG library: - useDefaultListeners = true - - // 运行时传入参数seleniumTests,则运行selenium测试套件,否则运行JUnit测试套件 - if (project.hasProperty("seleniumTests")){ - suites 'src/test/resources/test/forgon/disinfectsystem/selenium/SeleniumTests.xml' - } - else{ - suites 'src/test/resources/test/forgon/AllTests.xml' - } - } + if (project.hasProperty("seleniumTests")){ + filter { + includeTestsMatching "test.forgon.disinfectsystem.selenium.ALL" + } + } + else{ + exclude "test.forgon.disinfectsystem.selenium.ALL" + } + //reports.html.enabled = false ignoreFailures = true //use this to allow build to continue for CI purposes //{