File tree Expand file tree Collapse file tree 4 files changed +7
-16
lines changed
src/main/java/org/hibernate/reactive/it/techempower
src/main/java/org/hibernate/reactive/it/verticle Expand file tree Collapse file tree 4 files changed +7
-16
lines changed Original file line number Diff line number Diff line change @@ -58,7 +58,7 @@ tasks.withType( Test ).configureEach {
58
58
59
59
// We need a to use an instance of PostgreSQL with a specific configuration.
60
60
// So, for this particular integration-test module, we default to true unless docker is disabled.
61
- systemProperty ' docker' , project. properties[ ' docker' ] ?: true
61
+ systemProperty ' docker' , project. hasProperty( ' docker' )
62
62
systemProperty ' org.hibernate.reactive.common.InternalStateAssertions.ENFORCE' , ' true'
63
63
64
64
if ( project. hasProperty( ' includeTests' ) ) {
Original file line number Diff line number Diff line change @@ -36,21 +36,12 @@ public class VertxServer {
36
36
private static final Log LOG = make ( Log .class , lookup () );
37
37
38
38
// These properties are in DatabaseConfiguration in core
39
- public static final boolean USE_DOCKER = isDockerEnabled ();
40
-
41
- // If not specify, default to enable docker
42
- private static boolean isDockerEnabled () {
43
- String enableDocker = System .getProperty ( "docker" );
44
- if ( enableDocker == null ) {
45
- return true ;
46
- }
47
- return Boolean .parseBoolean ( enableDocker );
48
- }
39
+ public static final boolean USE_DOCKER = Boolean .getBoolean ( "docker" );
49
40
50
41
public static final String IMAGE_NAME = "postgres:15-bullseye" ;
51
- public static final String USERNAME = "benchmarkdbuser " ;
52
- public static final String PASSWORD = "benchmarkdbpass " ;
53
- public static final String DB_NAME = "hello_world " ;
42
+ public static final String USERNAME = "hreact " ;
43
+ public static final String PASSWORD = "hreact " ;
44
+ public static final String DB_NAME = "hreact " ;
54
45
55
46
public static final int VERTICLE_INSTANCES = 10 ;
56
47
Original file line number Diff line number Diff line change @@ -55,7 +55,7 @@ tasks.withType( Test ).configureEach {
55
55
displayGranularity = 1
56
56
events = [' PASSED' , ' FAILED' , ' SKIPPED' ]
57
57
}
58
- systemProperty ' docker' , project. hasProperty( ' docker' ) ? ' true ' : ' false '
58
+ systemProperty ' docker' , project. hasProperty( ' docker' )
59
59
systemProperty ' org.hibernate.reactive.common.InternalStateAssertions.ENFORCE' , ' true'
60
60
61
61
if ( project. hasProperty( ' includeTests' ) ) {
Original file line number Diff line number Diff line change @@ -34,7 +34,7 @@ public class VertxServer {
34
34
private static final Log LOG = make ( Log .class , lookup () );
35
35
36
36
// These properties are in DatabaseConfiguration in core
37
- public static final boolean USE_DOCKER = true ;
37
+ public static final boolean USE_DOCKER = Boolean . getBoolean ( "docker" ) ;
38
38
39
39
public static final String IMAGE_NAME = "postgres:15.2" ;
40
40
public static final String USERNAME = "hreact" ;
You can’t perform that action at this time.
0 commit comments