Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
84a12c84
Commit
84a12c84
authored
Aug 28, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade to Testcontainers 1.14.3
Closes gh-23122
parent
0032ab6a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
21 deletions
+8
-21
CouchbaseAutoConfigurationIntegrationTests.java
...couchbase/CouchbaseAutoConfigurationIntegrationTests.java
+7
-20
pom.xml
spring-boot-project/spring-boot-parent/pom.xml
+1
-1
No files found.
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfigurationIntegrationTests.java
View file @
84a12c84
...
@@ -17,23 +17,16 @@
...
@@ -17,23 +17,16 @@
package
org
.
springframework
.
boot
.
autoconfigure
.
couchbase
;
package
org
.
springframework
.
boot
.
autoconfigure
.
couchbase
;
import
java.time.Duration
;
import
java.time.Duration
;
import
java.util.Collections
;
import
java.util.List
;
import
com.couchbase.client.java.Bucket
;
import
com.couchbase.client.java.Bucket
;
import
com.couchbase.client.java.Cluster
;
import
com.couchbase.client.java.Cluster
;
import
com.couchbase.client.java.CouchbaseBucket
;
import
com.couchbase.client.java.CouchbaseBucket
;
import
com.couchbase.client.java.bucket.BucketType
;
import
com.couchbase.client.java.cluster.BucketSettings
;
import
com.couchbase.client.java.cluster.ClusterInfo
;
import
com.couchbase.client.java.cluster.ClusterInfo
;
import
com.couchbase.client.java.cluster.DefaultBucketSettings
;
import
com.couchbase.client.java.cluster.UserRole
;
import
com.couchbase.client.java.cluster.UserSettings
;
import
com.couchbase.client.java.env.CouchbaseEnvironment
;
import
com.couchbase.client.java.env.CouchbaseEnvironment
;
import
org.junit.jupiter.api.AfterEach
;
import
org.junit.jupiter.api.AfterEach
;
import
org.junit.jupiter.api.BeforeAll
;
import
org.junit.jupiter.api.BeforeEach
;
import
org.junit.jupiter.api.BeforeEach
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.testcontainers.couchbase.BucketDefinition
;
import
org.testcontainers.couchbase.CouchbaseContainer
;
import
org.testcontainers.couchbase.CouchbaseContainer
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Container
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
import
org.testcontainers.junit.jupiter.Testcontainers
;
...
@@ -55,21 +48,15 @@ import static org.mockito.Mockito.mock;
...
@@ -55,21 +48,15 @@ import static org.mockito.Mockito.mock;
@Testcontainers
(
disabledWithoutDocker
=
true
)
@Testcontainers
(
disabledWithoutDocker
=
true
)
class
CouchbaseAutoConfigurationIntegrationTests
{
class
CouchbaseAutoConfigurationIntegrationTests
{
private
static
final
String
BUCKET_NAME
=
"cbbucket"
;
@Container
@Container
static
final
CouchbaseContainer
couchbase
=
new
CouchbaseContainer
().
withClusterAdmin
(
"spring"
,
"password"
)
static
final
CouchbaseContainer
couchbase
=
new
CouchbaseContainer
().
withCredentials
(
"spring"
,
"password"
)
.
withStartupAttempts
(
5
).
withStartupTimeout
(
Duration
.
ofMinutes
(
10
));
.
withStartupAttempts
(
5
).
withStartupTimeout
(
Duration
.
ofMinutes
(
10
))
.
withBucket
(
new
BucketDefinition
(
BUCKET_NAME
).
withPrimaryIndex
(
false
));
private
AnnotationConfigApplicationContext
context
;
private
AnnotationConfigApplicationContext
context
;
@BeforeAll
static
void
createBucket
()
{
BucketSettings
bucketSettings
=
DefaultBucketSettings
.
builder
().
enableFlush
(
true
).
name
(
"default"
)
.
password
(
"password"
).
quota
(
100
).
replicas
(
0
).
type
(
BucketType
.
COUCHBASE
).
build
();
List
<
UserRole
>
userSettings
=
Collections
.
singletonList
(
new
UserRole
(
"admin"
));
couchbase
.
createBucket
(
bucketSettings
,
UserSettings
.
build
().
password
(
bucketSettings
.
password
()).
roles
(
userSettings
),
true
);
}
@BeforeEach
@BeforeEach
void
setUp
()
{
void
setUp
()
{
this
.
context
=
new
AnnotationConfigApplicationContext
();
this
.
context
=
new
AnnotationConfigApplicationContext
();
...
@@ -77,7 +64,7 @@ class CouchbaseAutoConfigurationIntegrationTests {
...
@@ -77,7 +64,7 @@ class CouchbaseAutoConfigurationIntegrationTests {
TestPropertyValues
.
of
(
"spring.couchbase.bootstrap-hosts="
+
couchbase
.
getContainerIpAddress
(),
TestPropertyValues
.
of
(
"spring.couchbase.bootstrap-hosts="
+
couchbase
.
getContainerIpAddress
(),
"spring.couchbase.env.bootstrap.http-direct-port:"
+
couchbase
.
getMappedPort
(
8091
),
"spring.couchbase.env.bootstrap.http-direct-port:"
+
couchbase
.
getMappedPort
(
8091
),
"spring.couchbase.username:spring"
,
"spring.couchbase.password:password"
,
"spring.couchbase.username:spring"
,
"spring.couchbase.password:password"
,
"spring.couchbase.bucket.name:
default"
).
applyTo
(
this
.
context
.
getEnvironment
());
"spring.couchbase.bucket.name:
"
+
BUCKET_NAME
).
applyTo
(
this
.
context
.
getEnvironment
());
}
}
@AfterEach
@AfterEach
...
...
spring-boot-project/spring-boot-parent/pom.xml
View file @
84a12c84
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
<spring-asciidoctor-extensions.version>
0.4.0.RELEASE
</spring-asciidoctor-extensions.version>
<spring-asciidoctor-extensions.version>
0.4.0.RELEASE
</spring-asciidoctor-extensions.version>
<spring-doc-resources.version>
0.1.3.RELEASE
</spring-doc-resources.version>
<spring-doc-resources.version>
0.1.3.RELEASE
</spring-doc-resources.version>
<spring-doc-resources.url>
https://repo.spring.io/release/io/spring/docresources/spring-doc-resources/${spring-doc-resources.version}/spring-doc-resources-${spring-doc-resources.version}.zip
</spring-doc-resources.url>
<spring-doc-resources.url>
https://repo.spring.io/release/io/spring/docresources/spring-doc-resources/${spring-doc-resources.version}/spring-doc-resources-${spring-doc-resources.version}.zip
</spring-doc-resources.url>
<testcontainers.version>
1.1
2.5
</testcontainers.version>
<testcontainers.version>
1.1
4.3
</testcontainers.version>
<testng.version>
6.14.3
</testng.version>
<testng.version>
6.14.3
</testng.version>
</properties>
</properties>
<scm>
<scm>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment