Index: ssts-web/src/test/resources/test/forgon/selenium/SeleniumTests.xml =================================================================== diff -u --- ssts-web/src/test/resources/test/forgon/selenium/SeleniumTests.xml (revision 0) +++ ssts-web/src/test/resources/test/forgon/selenium/SeleniumTests.xml (revision 18285) @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file Index: build.gradle =================================================================== diff -u -r18247 -r18285 --- build.gradle (.../build.gradle) (revision 18247) +++ build.gradle (.../build.gradle) (revision 18285) @@ -897,6 +897,18 @@ compile (project(":ssts-datasync")) compile (project(":ssts-datasync-default-impl")) + + compile group: 'org.seleniumhq.selenium', name: 'selenium-server', version: '3.4.0' + // https://mvnrepository.com/artifact/org.seleniumhq.selenium/selenium-java + compile group: 'org.seleniumhq.selenium', name: 'selenium-java', version: '3.4.0' + + compile group: 'org.seleniumhq.selenium', name: 'selenium-server-standalone', version: '3.4.0' + + // https://mvnrepository.com/artifact/net.sf.ezmorph/ezmorph + compile group: 'net.sf.ezmorph', name: 'ezmorph', version: '1.0.6' + + + // ssts-web项目,具有条件依赖,根据发布项目的名称,依赖于不同的jar包 if (projectName == 'gyey'){ // 广医二院 compile (project(":ssts-datasync-settlement-gyey-impl")) @@ -929,11 +941,11 @@ compile (project(":ssts-web")) - //runtime files(project(':ssts-web').sourceSets.main.resources.srcDirs) - //runtime files(project(':ssts-web').sourceSets.test.resources.srcDirs) + runtime files(project(':ssts-web').sourceSets.main.resources.srcDirs) + runtime files(project(':ssts-web').sourceSets.test.resources.srcDirs) - //runtime fileTree(dir: webProjectDir + '/src/main/webapp/WEB-INF/lib', include: '*.jar',excludes:['forgon-core-*.jar','forgon-tools-*.jar']) + runtime fileTree(dir: webProjectDir + '/src/main/webapp/WEB-INF/lib', include: '*.jar',excludes:['forgon-core-*.jar','forgon-tools-*.jar']) } } \ No newline at end of file Index: ssts-web/src/test/java/test/forgon/selenium/tools/Utils.java =================================================================== diff -u -r18284 -r18285 --- ssts-web/src/test/java/test/forgon/selenium/tools/Utils.java (.../Utils.java) (revision 18284) +++ ssts-web/src/test/java/test/forgon/selenium/tools/Utils.java (.../Utils.java) (revision 18285) @@ -1020,7 +1020,7 @@ InputStream instream1 = Utils.class.getClassLoader() .getResourceAsStream( - "test_4_1/config/" + projectName + "/config.js"); + "test/forgon/selenium/config/" + projectName + "/config.js"); Scanner scanner1 = new Scanner(instream1); String content = scanner1.useDelimiter("\\Z").next(); @@ -1035,7 +1035,7 @@ InputStream instream2 = Utils.class .getClassLoader() .getResourceAsStream( - "test_4_1/config/" + projectName + "/settings.json"); + "test/forgon/selenium/config/" + projectName + "/settings.json"); Scanner scanner2 = new Scanner(instream2); String testConfigFileContent = scanner2.useDelimiter("\\Z").next();