Changes to make integration tests work with CouchDB 3.4

Author: retrodaredevil

couchdb/src/main/java/me/retrodaredevil/couchdbjava/okhttp/CouchDbConfigService.java

@@ -12,7 +12,7 @@
 import retrofit2.http.Path;
 
 /**
- * @see <a href="ttps://docs.couchdb.org/en/stable/api/server/configuration.html#accessing-the-local-node-s-configuration ">docs.couchdb.org/en/stable/api/server/configuration.html#accessing-the-local-node-s-configuration</a>
+ * @see <a href="https://docs.couchdb.org/en/stable/api/server/configuration.html#accessing-the-local-node-s-configuration ">docs.couchdb.org/en/stable/api/server/configuration.html#accessing-the-local-node-s-configuration</a>
  */
 public interface CouchDbConfigService {
 	@HEAD("./")

couchdb/src/test/java/me/retrodaredevil/couchdbjava/integration/test/ConfigEndpointTest.java

@@ -23,7 +23,7 @@ public class ConfigEndpointTest {
 
 	@ParameterizedTest
 	@MethodSource("me.retrodaredevil.couchdbjava.integration.DatabaseService#values")
-	void test(DatabaseService databaseService) throws CouchDbException, JsonProcessingException {
+	void test(DatabaseService databaseService) throws CouchDbException, JsonProcessingException, InterruptedException {
 		CouchDbInstance instance = TestUtil.createInstance(databaseService);
 		MembershipResponse membership = instance.membership();
 		// the configured CouchDB from the compose file is not clustered and even if it was it should only handle 1 node
@@ -49,10 +49,13 @@ void test(DatabaseService databaseService) throws CouchDbException, JsonProcessi
 			assertEquals("0.0.0.0", config.queryValue(httpSectionName, "bind_address"));
 		}
 		assertEquals("", config.putValue("admins", "newadmin", "coolpass"));
-		assertTrue(config.queryValue("admins", "newadmin").startsWith("-pbkdf2-"));
+		// NOTE: As of CouchDB 3.4, values under the "admins" section are not hashed immediately, hence this sleep // https://github.com/apache/couchdb/issues/5358
+		Thread.sleep(500);
+		// NOTE: As of CouchDB 3.4, hashed passwords may be hashed differently. The "-pbkdf2-" prefix is no longer reliable, but "-pbkdf2" prefix is
+		assertTrue(config.queryValue("admins", "newadmin").startsWith("-pbkdf2"));
 		if (databaseService == DatabaseService.COUCHDB) {
 			// only for CouchDB because PouchDB gives us a "unknown_config_value" error, which doesn't make any sense
-			assertTrue(config.deleteValue("admins", "newadmin").startsWith("-pbkdf2-"));
+			assertTrue(config.deleteValue("admins", "newadmin").startsWith("-pbkdf2"));
 		}
 	}
 }

couchdb/src/test/java/me/retrodaredevil/couchdbjava/integration/test/ReplicatorTest.java

@@ -65,7 +65,8 @@ void test(DatabaseService databaseService) throws CouchDbException, JsonProcessi
 		}
 
 
-		for (int i = 0; i < 15 && !target.exists(); i++) { // 15 iterations is ~7.5 seconds maximum
+		// NOTE: For CouchDB 3.3 and lower, we were able to get away with a timeout of about 7.5 seconds, but for CouchDB 3.4 we increased that
+		for (int i = 0; i < 20 && !target.exists(); i++) { // 20 iterations is ~10 seconds maximum
 			//noinspection BusyWait
 			Thread.sleep(500);
 		}

testing/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
   couchdb:
     image: 'apache/couchdb:3'