Skip to content

Commit d9b7202

Browse files
abnegateabnegate
committed
(test): Update tests and examples for renamed properties and methods
1 parent e0e5c27 commit d9b7202

File tree

9 files changed

+125
-125
lines changed

9 files changed

+125
-125
lines changed

‎examples/tcp.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@
7272
}
7373

7474
$tls = new TLS(
75-
certPath: $tlsCert,
76-
keyPath: $tlsKey,
77-
caPath: $tlsCa,
75+
certificate: $tlsCert,
76+
key: $tlsKey,
77+
ca: $tlsCa,
7878
requireClientCert: $tlsRequireClientCert,
7979
);
8080
}
@@ -136,9 +136,9 @@ public function getStats(): array
136136
echo "Max connections: {$config->maxConnections}\n";
137137
echo "Server impl: {$serverImpl}\n";
138138
if ($tls !== null) {
139-
echo "TLS: enabled (cert: {$tls->certPath})\n";
140-
if ($tls->isMutualTLS()) {
141-
echo "mTLS: enabled (ca: {$tls->caPath})\n";
139+
echo "TLS: enabled (certificate: {$tls->certificate})\n";
140+
if ($tls->isMutual()) {
141+
echo "mTLS: enabled (ca: {$tls->ca})\n";
142142
}
143143
}
144144
echo "\n";

‎tests/AdapterActionsTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function testNotifyCloseDelegatesToResolver(): void
7171
public function testTrackActivityDelegatesToResolverWithThrottling(): void
7272
{
7373
$adapter = new Adapter($this->resolver, name: 'HTTP', protocol: Protocol::HTTP);
74-
$adapter->setActivityInterval(1); // 1 second throttle
74+
$adapter->setInterval(1); // 1 second throttle
7575

7676
// First call should trigger activity tracking
7777
$adapter->track('resource-123');

‎tests/AdapterByteTrackingTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public function testNotifyCloseMergesByteDataWithExistingMetadata(): void
146146
public function testTrackFlushesAccumulatedBytes(): void
147147
{
148148
$adapter = new Adapter($this->resolver, name: 'Test', protocol: Protocol::TCP);
149-
$adapter->setActivityInterval(0);
149+
$adapter->setInterval(0);
150150

151151
$adapter->recordBytes('resource-1', inbound: 100, outbound: 200);
152152
$adapter->track('resource-1');
@@ -160,7 +160,7 @@ public function testTrackFlushesAccumulatedBytes(): void
160160
public function testTrackResetsCountersAfterFlush(): void
161161
{
162162
$adapter = new Adapter($this->resolver, name: 'Test', protocol: Protocol::TCP);
163-
$adapter->setActivityInterval(0);
163+
$adapter->setInterval(0);
164164

165165
$adapter->recordBytes('resource-1', inbound: 100, outbound: 200);
166166
$adapter->track('resource-1');
@@ -182,7 +182,7 @@ public function testTrackResetsCountersAfterFlush(): void
182182
public function testTrackWithoutBytesOmitsByteMetadata(): void
183183
{
184184
$adapter = new Adapter($this->resolver, name: 'Test', protocol: Protocol::TCP);
185-
$adapter->setActivityInterval(0);
185+
$adapter->setInterval(0);
186186

187187
$adapter->track('resource-1', ['type' => 'query']);
188188

@@ -195,7 +195,7 @@ public function testTrackWithoutBytesOmitsByteMetadata(): void
195195
public function testNotifyCloseClearsActivityTimestamp(): void
196196
{
197197
$adapter = new Adapter($this->resolver, name: 'Test', protocol: Protocol::TCP);
198-
$adapter->setActivityInterval(9999);
198+
$adapter->setInterval(9999);
199199

200200
// Track once to set the timestamp
201201
$adapter->track('resource-1');
@@ -217,7 +217,7 @@ public function testSetActivityIntervalReturnsSelf(): void
217217
{
218218
$adapter = new Adapter($this->resolver, name: 'Test', protocol: Protocol::TCP);
219219

220-
$result = $adapter->setActivityInterval(60);
220+
$result = $adapter->setInterval(60);
221221
$this->assertSame($adapter, $result);
222222
}
223223

‎tests/ConfigTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public function testDefaultRecvBufferSize(): void
124124
public function testDefaultBackendConnectTimeout(): void
125125
{
126126
$config = new Config();
127-
$this->assertSame(5.0, $config->backendConnectTimeout);
127+
$this->assertSame(5.0, $config->connectTimeout);
128128
}
129129

130130
public function testDefaultSkipValidation(): void
@@ -171,8 +171,8 @@ public function testCustomWorkers(): void
171171

172172
public function testCustomBackendConnectTimeout(): void
173173
{
174-
$config = new Config(backendConnectTimeout: 10.5);
175-
$this->assertSame(10.5, $config->backendConnectTimeout);
174+
$config = new Config(connectTimeout: 10.5);
175+
$this->assertSame(10.5, $config->connectTimeout);
176176
}
177177

178178
public function testCustomSkipValidation(): void
@@ -201,7 +201,7 @@ public function testIsTlsEnabledFalseByDefault(): void
201201

202202
public function testIsTlsEnabledTrueWhenConfigured(): void
203203
{
204-
$tls = new TLS(certPath: '/certs/server.crt', keyPath: '/certs/server.key');
204+
$tls = new TLS(certificate: '/certs/server.crt', key: '/certs/server.key');
205205
$config = new Config(tls: $tls);
206206
$this->assertTrue($config->isTlsEnabled());
207207
}
@@ -214,7 +214,7 @@ public function testGetTlsContextNullByDefault(): void
214214

215215
public function testGetTlsContextReturnsInstanceWhenConfigured(): void
216216
{
217-
$tls = new TLS(certPath: '/certs/server.crt', keyPath: '/certs/server.key');
217+
$tls = new TLS(certificate: '/certs/server.crt', key: '/certs/server.key');
218218
$config = new Config(tls: $tls);
219219

220220
$ctx = $config->getTlsContext();
@@ -224,7 +224,7 @@ public function testGetTlsContextReturnsInstanceWhenConfigured(): void
224224

225225
public function testGetTlsContextReturnsNewInstanceEachCall(): void
226226
{
227-
$tls = new TLS(certPath: '/certs/server.crt', keyPath: '/certs/server.key');
227+
$tls = new TLS(certificate: '/certs/server.crt', key: '/certs/server.key');
228228
$config = new Config(tls: $tls);
229229

230230
$ctx1 = $config->getTlsContext();

‎tests/Integration/EdgeIntegrationTest.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -195,32 +195,32 @@ public function testTransactionPinsReadsToPrimaryThroughFullFlow(): void
195195

196196
// Before transaction: SELECT goes to read replica
197197
$selectData = $this->buildPgQuery('SELECT * FROM users');
198-
$classification = $adapter->classifyQuery($selectData, $clientFd);
198+
$classification = $adapter->classify($selectData, $clientFd);
199199
$this->assertSame(QueryType::Read, $classification);
200200

201201
$result = $adapter->routeQuery('txdb', $classification);
202202
$this->assertSame('10.0.1.20:5432', $result->endpoint);
203203

204204
// BEGIN pins to primary
205205
$beginData = $this->buildPgQuery('BEGIN');
206-
$classification = $adapter->classifyQuery($beginData, $clientFd);
206+
$classification = $adapter->classify($beginData, $clientFd);
207207
$this->assertSame(QueryType::Write, $classification);
208-
$this->assertTrue($adapter->isConnectionPinned($clientFd));
208+
$this->assertTrue($adapter->isPinned($clientFd));
209209

210210
// During transaction: SELECT goes to primary (pinned)
211-
$classification = $adapter->classifyQuery($selectData, $clientFd);
211+
$classification = $adapter->classify($selectData, $clientFd);
212212
$this->assertSame(QueryType::Write, $classification);
213213

214214
$result = $adapter->routeQuery('txdb', $classification);
215215
$this->assertSame('10.0.1.10:5432', $result->endpoint);
216216

217217
// COMMIT unpins
218218
$commitData = $this->buildPgQuery('COMMIT');
219-
$adapter->classifyQuery($commitData, $clientFd);
220-
$this->assertFalse($adapter->isConnectionPinned($clientFd));
219+
$adapter->classify($commitData, $clientFd);
220+
$this->assertFalse($adapter->isPinned($clientFd));
221221

222222
// After transaction: SELECT goes back to read replica
223-
$classification = $adapter->classifyQuery($selectData, $clientFd);
223+
$classification = $adapter->classify($selectData, $clientFd);
224224
$this->assertSame(QueryType::Read, $classification);
225225

226226
$result = $adapter->routeQuery('txdb', $classification);
@@ -538,7 +538,7 @@ public function testConnectAndDisconnectLifecycleTracked(): void
538538
$this->assertSame('lifecycle1', $resolver->getConnects()[0]['resourceId']);
539539

540540
// Track activity
541-
$adapter->setActivityInterval(0);
541+
$adapter->setInterval(0);
542542
$adapter->track('lifecycle1', ['query' => 'SELECT 1']);
543543
$this->assertCount(1, $resolver->getActivities());
544544

‎tests/ReadWriteSplitTest.php‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public function testClassifyPgSelectAsRead(): void
7272
$adapter->setReadWriteSplit(true);
7373

7474
$data = $this->buildPgQuery('SELECT * FROM users');
75-
$this->assertSame(QueryType::Read, $adapter->classifyQuery($data, 1));
75+
$this->assertSame(QueryType::Read, $adapter->classify($data, 1));
7676
}
7777

7878
public function testClassifyPgInsertAsWrite(): void
@@ -81,7 +81,7 @@ public function testClassifyPgInsertAsWrite(): void
8181
$adapter->setReadWriteSplit(true);
8282

8383
$data = $this->buildPgQuery("INSERT INTO users (name) VALUES ('x')");
84-
$this->assertSame(QueryType::Write, $adapter->classifyQuery($data, 1));
84+
$this->assertSame(QueryType::Write, $adapter->classify($data, 1));
8585
}
8686

8787
public function testClassifyMysqlSelectAsRead(): void
@@ -90,7 +90,7 @@ public function testClassifyMysqlSelectAsRead(): void
9090
$adapter->setReadWriteSplit(true);
9191

9292
$data = $this->buildMySQLQuery('SELECT * FROM users');
93-
$this->assertSame(QueryType::Read, $adapter->classifyQuery($data, 1));
93+
$this->assertSame(QueryType::Read, $adapter->classify($data, 1));
9494
}
9595

9696
public function testClassifyMysqlInsertAsWrite(): void
@@ -99,7 +99,7 @@ public function testClassifyMysqlInsertAsWrite(): void
9999
$adapter->setReadWriteSplit(true);
100100

101101
$data = $this->buildMySQLQuery("INSERT INTO users (name) VALUES ('x')");
102-
$this->assertSame(QueryType::Write, $adapter->classifyQuery($data, 1));
102+
$this->assertSame(QueryType::Write, $adapter->classify($data, 1));
103103
}
104104

105105
public function testClassifyReturnsWriteWhenSplitDisabled(): void
@@ -108,7 +108,7 @@ public function testClassifyReturnsWriteWhenSplitDisabled(): void
108108
// Read/write split is disabled by default
109109

110110
$data = $this->buildPgQuery('SELECT * FROM users');
111-
$this->assertSame(QueryType::Write, $adapter->classifyQuery($data, 1));
111+
$this->assertSame(QueryType::Write, $adapter->classify($data, 1));
112112
}
113113

114114
public function testBeginPinsConnectionToPrimary(): void
@@ -119,13 +119,13 @@ public function testBeginPinsConnectionToPrimary(): void
119119
$clientFd = 42;
120120

121121
// Not pinned initially
122-
$this->assertFalse($adapter->isConnectionPinned($clientFd));
122+
$this->assertFalse($adapter->isPinned($clientFd));
123123

124124
// BEGIN pins
125125
$data = $this->buildPgQuery('BEGIN');
126-
$result = $adapter->classifyQuery($data, $clientFd);
126+
$result = $adapter->classify($data, $clientFd);
127127
$this->assertSame(QueryType::Write, $result);
128-
$this->assertTrue($adapter->isConnectionPinned($clientFd));
128+
$this->assertTrue($adapter->isPinned($clientFd));
129129
}
130130

131131
public function testPinnedConnectionRoutesSelectToWrite(): void
@@ -136,12 +136,12 @@ public function testPinnedConnectionRoutesSelectToWrite(): void
136136
$clientFd = 42;
137137

138138
// Begin transaction
139-
$adapter->classifyQuery($this->buildPgQuery('BEGIN'), $clientFd);
140-
$this->assertTrue($adapter->isConnectionPinned($clientFd));
139+
$adapter->classify($this->buildPgQuery('BEGIN'), $clientFd);
140+
$this->assertTrue($adapter->isPinned($clientFd));
141141

142142
// SELECT should still route to WRITE when pinned
143143
$data = $this->buildPgQuery('SELECT * FROM users');
144-
$this->assertSame(QueryType::Write, $adapter->classifyQuery($data, $clientFd));
144+
$this->assertSame(QueryType::Write, $adapter->classify($data, $clientFd));
145145
}
146146

147147
public function testCommitUnpinsConnection(): void
@@ -152,16 +152,16 @@ public function testCommitUnpinsConnection(): void
152152
$clientFd = 42;
153153

154154
// Begin transaction
155-
$adapter->classifyQuery($this->buildPgQuery('BEGIN'), $clientFd);
156-
$this->assertTrue($adapter->isConnectionPinned($clientFd));
155+
$adapter->classify($this->buildPgQuery('BEGIN'), $clientFd);
156+
$this->assertTrue($adapter->isPinned($clientFd));
157157

158158
// COMMIT unpins
159-
$adapter->classifyQuery($this->buildPgQuery('COMMIT'), $clientFd);
160-
$this->assertFalse($adapter->isConnectionPinned($clientFd));
159+
$adapter->classify($this->buildPgQuery('COMMIT'), $clientFd);
160+
$this->assertFalse($adapter->isPinned($clientFd));
161161

162162
// Now SELECT should route to READ again
163163
$data = $this->buildPgQuery('SELECT * FROM users');
164-
$this->assertSame(QueryType::Read, $adapter->classifyQuery($data, $clientFd));
164+
$this->assertSame(QueryType::Read, $adapter->classify($data, $clientFd));
165165
}
166166

167167
public function testRollbackUnpinsConnection(): void
@@ -172,12 +172,12 @@ public function testRollbackUnpinsConnection(): void
172172
$clientFd = 42;
173173

174174
// Begin transaction
175-
$adapter->classifyQuery($this->buildPgQuery('BEGIN'), $clientFd);
176-
$this->assertTrue($adapter->isConnectionPinned($clientFd));
175+
$adapter->classify($this->buildPgQuery('BEGIN'), $clientFd);
176+
$this->assertTrue($adapter->isPinned($clientFd));
177177

178178
// ROLLBACK unpins
179-
$adapter->classifyQuery($this->buildPgQuery('ROLLBACK'), $clientFd);
180-
$this->assertFalse($adapter->isConnectionPinned($clientFd));
179+
$adapter->classify($this->buildPgQuery('ROLLBACK'), $clientFd);
180+
$this->assertFalse($adapter->isPinned($clientFd));
181181
}
182182

183183
public function testStartTransactionPinsConnection(): void
@@ -187,8 +187,8 @@ public function testStartTransactionPinsConnection(): void
187187

188188
$clientFd = 42;
189189

190-
$adapter->classifyQuery($this->buildPgQuery('START TRANSACTION'), $clientFd);
191-
$this->assertTrue($adapter->isConnectionPinned($clientFd));
190+
$adapter->classify($this->buildPgQuery('START TRANSACTION'), $clientFd);
191+
$this->assertTrue($adapter->isPinned($clientFd));
192192
}
193193

194194
public function testMysqlBeginPinsConnection(): void
@@ -198,8 +198,8 @@ public function testMysqlBeginPinsConnection(): void
198198

199199
$clientFd = 42;
200200

201-
$adapter->classifyQuery($this->buildMySQLQuery('BEGIN'), $clientFd);
202-
$this->assertTrue($adapter->isConnectionPinned($clientFd));
201+
$adapter->classify($this->buildMySQLQuery('BEGIN'), $clientFd);
202+
$this->assertTrue($adapter->isPinned($clientFd));
203203
}
204204

205205
public function testMysqlCommitUnpinsConnection(): void
@@ -209,11 +209,11 @@ public function testMysqlCommitUnpinsConnection(): void
209209

210210
$clientFd = 42;
211211

212-
$adapter->classifyQuery($this->buildMySQLQuery('BEGIN'), $clientFd);
213-
$this->assertTrue($adapter->isConnectionPinned($clientFd));
212+
$adapter->classify($this->buildMySQLQuery('BEGIN'), $clientFd);
213+
$this->assertTrue($adapter->isPinned($clientFd));
214214

215-
$adapter->classifyQuery($this->buildMySQLQuery('COMMIT'), $clientFd);
216-
$this->assertFalse($adapter->isConnectionPinned($clientFd));
215+
$adapter->classify($this->buildMySQLQuery('COMMIT'), $clientFd);
216+
$this->assertFalse($adapter->isPinned($clientFd));
217217
}
218218

219219
public function testClearConnectionStateRemovesPin(): void
@@ -223,11 +223,11 @@ public function testClearConnectionStateRemovesPin(): void
223223

224224
$clientFd = 42;
225225

226-
$adapter->classifyQuery($this->buildPgQuery('BEGIN'), $clientFd);
227-
$this->assertTrue($adapter->isConnectionPinned($clientFd));
226+
$adapter->classify($this->buildPgQuery('BEGIN'), $clientFd);
227+
$this->assertTrue($adapter->isPinned($clientFd));
228228

229-
$adapter->clearConnectionState($clientFd);
230-
$this->assertFalse($adapter->isConnectionPinned($clientFd));
229+
$adapter->clearState($clientFd);
230+
$this->assertFalse($adapter->isPinned($clientFd));
231231
}
232232

233233
public function testPinningIsPerConnection(): void
@@ -239,15 +239,15 @@ public function testPinningIsPerConnection(): void
239239
$fd2 = 2;
240240

241241
// Pin fd1
242-
$adapter->classifyQuery($this->buildPgQuery('BEGIN'), $fd1);
243-
$this->assertTrue($adapter->isConnectionPinned($fd1));
244-
$this->assertFalse($adapter->isConnectionPinned($fd2));
242+
$adapter->classify($this->buildPgQuery('BEGIN'), $fd1);
243+
$this->assertTrue($adapter->isPinned($fd1));
244+
$this->assertFalse($adapter->isPinned($fd2));
245245

246246
// fd2 can still read
247-
$this->assertSame(QueryType::Read, $adapter->classifyQuery($this->buildPgQuery('SELECT 1'), $fd2));
247+
$this->assertSame(QueryType::Read, $adapter->classify($this->buildPgQuery('SELECT 1'), $fd2));
248248

249249
// fd1 is pinned to write
250-
$this->assertSame(QueryType::Write, $adapter->classifyQuery($this->buildPgQuery('SELECT 1'), $fd1));
250+
$this->assertSame(QueryType::Write, $adapter->classify($this->buildPgQuery('SELECT 1'), $fd1));
251251
}
252252

253253
public function testRouteQueryReadUsesReadEndpoint(): void
@@ -315,11 +315,11 @@ public function testSetCommandRoutesToPrimaryButDoesNotPin(): void
315315
$clientFd = 42;
316316

317317
// SET is a transaction-class command, routes to primary
318-
$result = $adapter->classifyQuery($this->buildPgQuery("SET search_path = 'public'"), $clientFd);
318+
$result = $adapter->classify($this->buildPgQuery("SET search_path = 'public'"), $clientFd);
319319
$this->assertSame(QueryType::Write, $result);
320320

321321
// But SET should not pin the connection (only BEGIN/START pin)
322-
$this->assertFalse($adapter->isConnectionPinned($clientFd));
322+
$this->assertFalse($adapter->isPinned($clientFd));
323323
}
324324

325325
public function testUnknownQueryRoutesToWrite(): void
@@ -329,7 +329,7 @@ public function testUnknownQueryRoutesToWrite(): void
329329

330330
// Use an unknown PG message type
331331
$data = 'X' . \pack('N', 5) . "\x00";
332-
$result = $adapter->classifyQuery($data, 1);
332+
$result = $adapter->classify($data, 1);
333333
$this->assertSame(QueryType::Write, $result);
334334
}
335335
}

0 commit comments

Comments
 (0)