Skip to content

Commit e95dc1b

Browse files
committed
Fix backward compatibility with older version
1 parent ef03930 commit e95dc1b

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

src/main/java/org/testcontainers/couchbase/AbstractCouchbaseTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
*/
1616
public abstract class AbstractCouchbaseTest {
1717

18-
public static final String DEFAULT_BUCKET = "default";
18+
public static final String TEST_BUCKET = "test";
1919

2020
public static final String DEFAULT_PASSWORD = "password";
2121

2222
@Getter(lazy = true)
2323
private final static CouchbaseContainer couchbaseContainer = initCouchbaseContainer();
2424

2525
@Getter(lazy = true)
26-
private final static Bucket bucket = openBucket(DEFAULT_BUCKET, DEFAULT_PASSWORD);
26+
private final static Bucket bucket = openBucket(TEST_BUCKET, DEFAULT_PASSWORD);
2727

2828
@After
2929
public void clear() {
@@ -40,7 +40,7 @@ private static CouchbaseContainer initCouchbaseContainer() {
4040
CouchbaseContainer couchbaseContainer = new CouchbaseContainer()
4141
.withNewBucket(DefaultBucketSettings.builder()
4242
.enableFlush(true)
43-
.name(DEFAULT_BUCKET)
43+
.name(TEST_BUCKET)
4444
.password(DEFAULT_PASSWORD)
4545
.quota(100)
4646
.replicas(0)

src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
/**
3939
* Based on Laurent Doguin version
40-
*
40+
* <p>
4141
* Optimized by ctayeb
4242
*/
4343
public class CouchbaseContainer<SELF extends CouchbaseContainer<SELF>> extends GenericContainer<SELF> {
@@ -254,7 +254,11 @@ public void createBucket(BucketSettings bucketSetting, boolean primaryIndex) {
254254
UserSettings userSettings = UserSettings.build()
255255
.password(bucketSetting.password())
256256
.roles(Collections.singletonList(new UserRole("bucket_admin", bucketSetting.name())));
257-
clusterManager.upsertUser(AuthDomain.LOCAL, bucketSetting.name(), userSettings);
257+
try {
258+
clusterManager.upsertUser(AuthDomain.LOCAL, bucketSetting.name(), userSettings);
259+
} catch (Exception e) {
260+
logger().warn("Unable to insert user '" + bucketSetting.name() + "', maybe you are using older version");
261+
}
258262
if (index) {
259263
Bucket bucket = getCouchbaseCluster().openBucket(bucketSettings.name(), bucketSettings.password());
260264
new CouchbaseQueryServiceWaitStrategy(bucket).waitUntilReady(this);

src/test/java/org/testcontainers/couchbase/CouchbaseContainerTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ public void should_insert_document() {
2929

3030
@Test
3131
public void should_execute_n1ql() {
32-
getBucket().query(N1qlQuery.simple("INSERT INTO " + DEFAULT_BUCKET + " (KEY, VALUE) VALUES ('" + ID + "', " + DOCUMENT + ")"));
32+
getBucket().query(N1qlQuery.simple("INSERT INTO " + TEST_BUCKET + " (KEY, VALUE) VALUES ('" + ID + "', " + DOCUMENT + ")"));
3333

34-
N1qlQueryResult query = getBucket().query(N1qlQuery.simple("SELECT * FROM " + DEFAULT_BUCKET + " USE KEYS '" + ID + "'"));
34+
N1qlQueryResult query = getBucket().query(N1qlQuery.simple("SELECT * FROM " + TEST_BUCKET + " USE KEYS '" + ID + "'"));
3535
Assert.assertTrue(query.parseSuccess());
3636
Assert.assertTrue(query.finalSuccess());
3737
List<N1qlQueryRow> n1qlQueryRows = query.allRows();
3838
Assert.assertEquals(1, n1qlQueryRows.size());
39-
Assert.assertEquals(DOCUMENT, n1qlQueryRows.get(0).value().get(DEFAULT_BUCKET).toString());
39+
Assert.assertEquals(DOCUMENT, n1qlQueryRows.get(0).value().get(TEST_BUCKET).toString());
4040
}
4141
}

0 commit comments

Comments
 (0)