CBL-8743 : Add binary test targets for the Objective-C tests

.gitignore

@@ -17,6 +17,7 @@ frameworks/
 
 # CBL files:
 Tests/Extensions/CouchbaseLiteVectorSearch.xcframework
+Tests/Extensions/.downloaded-version
 Tests/Extensions/LICENSE.txt
 Tests/Extensions/Build
 vendor/couchbase-lite-core-EE
@@ -28,4 +29,5 @@ vendor/couchbase-lite-core-EE
 .idea
 
 # Agents
-settings.local.json
+settings.local.json
+BinaryTests/

CouchbaseLite.xcodeproj/xcshareddata/xcschemes/CBL_EE_ObjC_Binary_Tests.xcscheme

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "2640"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "NO"
+      buildArchitectures = "Automatic">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug_EE"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "40CC4B7F302C2FF90002386D"
+               BuildableName = "CouchbaseLiteBinaryTests.xctest"
+               BlueprintName = "CBL_EE_ObjC_Binary_Tests"
+               ReferencedContainer = "container:CouchbaseLite.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug_EE"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      queueDebuggingEnableBacktraceRecording = "Yes">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release_EE"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug_EE">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release_EE"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

CouchbaseLite.xcodeproj/xcshareddata/xcschemes/CBL_EE_ObjC_Binary_Tests_iOS_App.xcscheme

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "2640"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "NO"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "40CC4C4D3033CE540002386D"
+               BuildableName = "CBL_Binary_Tests.app"
+               BlueprintName = "CBL_ObjC_Binary_Tests_iOS_App"
+               ReferencedContainer = "container:CouchbaseLite.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "40CC4B7F302C2FF90002386D"
+               BuildableName = "CouchbaseLiteBinaryTests.xctest"
+               BlueprintName = "CBL_EE_ObjC_Binary_Tests"
+               ReferencedContainer = "container:CouchbaseLite.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug_EE"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "40CC4B7F302C2FF90002386D"
+               BuildableName = "CouchbaseLiteBinaryTests.xctest"
+               BlueprintName = "CBL_EE_ObjC_Binary_Tests"
+               ReferencedContainer = "container:CouchbaseLite.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug_EE"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      queueDebuggingEnableBacktraceRecording = "Yes">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release_EE"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug_EE">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release_EE"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

CouchbaseLite.xcodeproj/xcshareddata/xcschemes/CBL_ObjC_Binary_Tests.xcscheme

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "2640"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "NO"
+      buildArchitectures = "Automatic">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "40CC4CFD303403F30002386D"
+               BuildableName = "CouchbaseLiteBinaryTests.xctest"
+               BlueprintName = "CBL_ObjC_Binary_Tests"
+               ReferencedContainer = "container:CouchbaseLite.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      queueDebuggingEnableBacktraceRecording = "Yes">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

CouchbaseLite.xcodeproj/xcshareddata/xcschemes/CBL_ObjC_Binary_Tests_iOS_App.xcscheme

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "2640"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "NO"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "40CC4C4D3033CE540002386D"
+               BuildableName = "CBL_Binary_Tests.app"
+               BlueprintName = "CBL_ObjC_Binary_Tests_iOS_App"
+               ReferencedContainer = "container:CouchbaseLite.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "40CC4CFD303403F30002386D"
+               BuildableName = "CouchbaseLiteBinaryTests.xctest"
+               BlueprintName = "CBL_ObjC_Binary_Tests"
+               ReferencedContainer = "container:CouchbaseLite.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "40CC4CFD303403F30002386D"
+               BuildableName = "CouchbaseLiteBinaryTests.xctest"
+               BlueprintName = "CBL_ObjC_Binary_Tests"
+               ReferencedContainer = "container:CouchbaseLite.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      queueDebuggingEnableBacktraceRecording = "Yes">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Objective-C/CBLCollectionConfiguration.m

@@ -57,20 +57,6 @@ - (instancetype) initWithConfig: (CBLCollectionConfiguration*)config {
     return configs;
 }
 
-+ (NSArray<CBLCollectionConfiguration*>*) fromCollections:(NSArray<CBLCollection*>*)collections
-                                                   config:(void (^)(CBLCollectionConfiguration* config))config {
-    [CBLPrecondition assertArrayNotEmpty:collections name:@"collections"];
-    NSMutableArray* configs = [NSMutableArray arrayWithCapacity:collections.count];
-    for (CBLCollection* collection in collections) {
-        CBLCollectionConfiguration* colConfig = [[CBLCollectionConfiguration alloc] initWithCollection:collection];
-        if (config) {
-            config(colConfig);
-        }
-        [configs addObject:colConfig];
-    }
-    return configs;
-}
-
 - (NSDictionary*) effectiveOptions {
     NSMutableDictionary* options = [NSMutableDictionary dictionary];
     options[@kC4ReplicatorOptionChannels] = self.channels;

Objective-C/CBLDatabase.mm

@@ -39,7 +39,6 @@
 #import "CBLStatus.h"
 #import "CBLStringBytes.h"
 #import "CBLVersion.h"
-#import "Foundation+CBL.h"
 #import "c4BlobStore.h"
 #import "c4Observer.h"
 #import "fleece/Fleece.hh"
@@ -704,12 +703,6 @@ - (BOOL) isClosed {
     }
 }
 
-- (BOOL) isClosedLocked {
-    CBL_LOCK(_mutex) {
-        return [self isClosed];
-    }
-}
-
 - (C4SliceResult) getPublicUUID: (NSError**)outError {
     CBL_LOCK(_mutex) {
         if (![self mustBeOpen: outError])
@@ -914,12 +907,6 @@ - (void) unregisterActiveService: (id<CBLDatabaseService>)service {
     }
 }
 
-- (uint64_t) activeServiceCount {
-    CBL_LOCK(_mutex) {
-        return _activeServices.count;
-    }
-}
-
 #pragma mark - Private for test
 
 - (const C4DatabaseConfig2*) getC4DBConfig {

Objective-C/Internal/CBLDatabase+Internal.h

@@ -55,15 +55,13 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (BOOL) mustBeOpen: (NSError**)outError;
 - (void) mustBeOpenLocked;
-- (BOOL) isClosedLocked;
 
 - (C4SliceResult) getPublicUUID: (NSError**)outError;
 
 - (nullable C4BlobStore*) getBlobStore: (NSError**)outError;
 
 - (void) registerActiveService: (id<CBLDatabaseService>)service;
 - (void) unregisterActiveService: (id<CBLDatabaseService>)service;
-- (uint64_t) activeServiceCount; // For testing only
 
 // Initialize the CBLDatabase with a give C4Database object in the shell mode.
 // This is currently used for creating a CBLDictionary as an input of the predict()

Objective-C/Internal/Replicator/CBLCollectionConfiguration+Internal.h

@@ -28,20 +28,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (NSDictionary*) effectiveOptions;
 
-/**
- Creates an array of `CBLCollectionConfiguration` objects from the given collections with the same configuration closure.
-
- This is a convenience method for configuring multiple collections with the same configurations.
- If custom configurations are needed, construct `CBLCollectionConfiguration` objects
- directly instead.
-
- @param collections The collections to replicate.
- @param config A block to configure all `CBLCollectionConfiguration` object.
- @return An array of CBLCollectionConfiguration objects for the given collections.
- */
-+ (NSArray<CBLCollectionConfiguration*>*) fromCollections: (NSArray<CBLCollection*>*)collections
-                                                   config: (void (^)(CBLCollectionConfiguration* config))config;
-
 @end
 
 NS_ASSUME_NONNULL_END