|
3 | 3 | */ |
4 | 4 |
|
5 | 5 | test { |
6 | | - useJUnitPlatform() |
7 | | - testLogging{ |
8 | | - events 'started','passed', 'skipped' |
9 | | - } |
10 | | - // For use in testing TestDatabaseClientKerberosFromFile |
11 | | - systemProperty "keytabFile", System.getProperty("keytabFile") |
12 | | - systemProperty "principal", System.getProperty("principal") |
| 6 | + // For use in testing TestDatabaseClientKerberosFromFile |
| 7 | + systemProperty "keytabFile", System.getProperty("keytabFile") |
| 8 | + systemProperty "principal", System.getProperty("principal") |
13 | 9 |
|
14 | 10 | systemProperty "TEST_USE_REVERSE_PROXY_SERVER", testUseReverseProxyServer |
15 | 11 | } |
@@ -43,34 +39,34 @@ dependencies { |
43 | 39 |
|
44 | 40 | tasks.register("runFragileTests", Test) { |
45 | 41 | useJUnitPlatform() |
46 | | - description = "These are called 'fragile' because they'll pass when run by themselves, but when run as part of the " + |
47 | | - "full suite, there seem to be one or more other fast functional tests that run before them and cause some of " + |
48 | | - "their test methods to break. The Jenkinsfile thus calls these first before running the other functional " + |
49 | | - "tests." |
50 | | - include "com/marklogic/client/fastfunctest/TestQueryOptionBuilder.class" |
51 | | - include "com/marklogic/client/fastfunctest/TestRawCombinedQuery.class" |
52 | | - include "com/marklogic/client/fastfunctest/TestRawStructuredQuery.class" |
| 42 | + description = "These are called 'fragile' because they'll pass when run by themselves, but when run as part of the " + |
| 43 | + "full suite, there seem to be one or more other fast functional tests that run before them and cause some of " + |
| 44 | + "their test methods to break. The Jenkinsfile thus calls these first before running the other functional " + |
| 45 | + "tests." |
| 46 | + include "com/marklogic/client/fastfunctest/TestQueryOptionBuilder.class" |
| 47 | + include "com/marklogic/client/fastfunctest/TestRawCombinedQuery.class" |
| 48 | + include "com/marklogic/client/fastfunctest/TestRawStructuredQuery.class" |
53 | 49 | } |
54 | 50 |
|
55 | 51 | tasks.register("runFastFunctionalTests", Test) { |
56 | 52 | useJUnitPlatform() |
57 | | - description = "Run all fast functional tests that don't setup/teardown custom app servers / databases" |
58 | | - include "com/marklogic/client/fastfunctest/**" |
59 | | - // Exclude the "fragile" ones |
60 | | - exclude "com/marklogic/client/fastfunctest/TestQueryOptionBuilder.class" |
61 | | - exclude "com/marklogic/client/fastfunctest/TestRawCombinedQuery.class" |
62 | | - exclude "com/marklogic/client/fastfunctest/TestRawStructuredQuery.class" |
| 53 | + description = "Run all fast functional tests that don't setup/teardown custom app servers / databases" |
| 54 | + include "com/marklogic/client/fastfunctest/**" |
| 55 | + // Exclude the "fragile" ones |
| 56 | + exclude "com/marklogic/client/fastfunctest/TestQueryOptionBuilder.class" |
| 57 | + exclude "com/marklogic/client/fastfunctest/TestRawCombinedQuery.class" |
| 58 | + exclude "com/marklogic/client/fastfunctest/TestRawStructuredQuery.class" |
63 | 59 | } |
64 | 60 |
|
65 | 61 | tasks.register("runSlowFunctionalTests", Test) { |
66 | 62 | useJUnitPlatform() |
67 | | - description = "Run slow functional tests; i.e. those that setup/teardown custom app servers / databases" |
68 | | - include "com/marklogic/client/datamovement/functionaltests/**" |
69 | | - include "com/marklogic/client/functionaltest/**" |
| 63 | + description = "Run slow functional tests; i.e. those that setup/teardown custom app servers / databases" |
| 64 | + include "com/marklogic/client/datamovement/functionaltests/**" |
| 65 | + include "com/marklogic/client/functionaltest/**" |
70 | 66 | } |
71 | 67 |
|
72 | 68 | tasks.register("runFunctionalTests") { |
73 | | - dependsOn(runFragileTests, runFastFunctionalTests, runSlowFunctionalTests) |
| 69 | + dependsOn(runFragileTests, runFastFunctionalTests, runSlowFunctionalTests) |
74 | 70 | } |
75 | 71 | runFastFunctionalTests.mustRunAfter runFragileTests |
76 | 72 | runSlowFunctionalTests.mustRunAfter runFastFunctionalTests |
0 commit comments