forked from wildfly/wildfly
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[WFLY-15366] split and simplify DataSourceMultipleConnStatsTestCase
https://issues.redhat.com/browse/WFLY-15366 The test case was unstable because of missing `ExecutorService.awaitTermination` in the first test so there could still be active requests that could interfere with the second test. Also tests in this test case tested different scenarios with different configurations so I split them into two test cases with two setup tasks. I also removed the asynchronous calls to the servlet. The second test doesn't need an asynchronous call, and the first test only need to add a connection request to queue.
- Loading branch information
Showing
6 changed files
with
330 additions
and
296 deletions.
There are no files selected for viewing
66 changes: 66 additions & 0 deletions
66
...rg/jboss/as/test/integration/jca/statistics/AbstractDataSourcePoolStatisticsTestCase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
/* | ||
* Copyright The WildFly Authors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
package org.jboss.as.test.integration.jca.statistics; | ||
|
||
import static org.hamcrest.CoreMatchers.is; | ||
import static org.hamcrest.MatcherAssert.assertThat; | ||
|
||
import java.sql.Connection; | ||
import java.sql.SQLException; | ||
import java.util.Set; | ||
import java.util.concurrent.CopyOnWriteArraySet; | ||
import javax.sql.DataSource; | ||
|
||
import jakarta.annotation.Resource; | ||
import org.jboss.arquillian.test.api.ArquillianResource; | ||
import org.jboss.as.arquillian.container.ManagementClient; | ||
import org.jboss.as.controller.PathAddress; | ||
import org.jboss.as.controller.client.helpers.Operations; | ||
import org.jboss.as.controller.operations.common.Util; | ||
import org.jboss.dmr.ModelNode; | ||
|
||
public abstract class AbstractDataSourcePoolStatisticsTestCase { | ||
|
||
private Set<Connection> connections = new CopyOnWriteArraySet<>(); | ||
|
||
@ArquillianResource | ||
protected ManagementClient managementClient; | ||
|
||
@Resource(lookup = "java:jboss/datasources/ExampleDS") | ||
private DataSource dataSource; | ||
|
||
// /subsystem=datasources/data-source=ExampleDS/statistics=pool:read-attribute(name=AvailableCount) | ||
protected int readStatisticsAttribute(String attributeName) throws Exception { | ||
PathAddress statisticsPathAddress = PathAddress.parseCLIStyleAddress("/subsystem=datasources/data-source=ExampleDS/statistics=pool"); | ||
ModelNode readAttributeOperation = Util.getReadAttributeOperation(statisticsPathAddress, attributeName); | ||
|
||
ModelNode result = managementClient.getControllerClient().execute(readAttributeOperation); | ||
assertThat("Failed to read statistics: " + result, Operations.isSuccessfulOutcome(result), is(true)); | ||
return Operations.readResult(result).asInt(); | ||
} | ||
|
||
// /subsystem=datasources/data-source=ExampleDS/statistics=pool/clear-statistics | ||
protected void clearStatistics() throws Exception { | ||
PathAddress statisticsPathAddress = PathAddress.parseCLIStyleAddress("/subsystem=datasources/data-source=ExampleDS/statistics=pool/"); | ||
ModelNode operation = Util.createOperation("clear-statistics", statisticsPathAddress); | ||
ModelNode result = managementClient.getControllerClient().execute(operation); | ||
assertThat("Failed to configure connection pool: " + result, Operations.isSuccessfulOutcome(result), is(true)); | ||
} | ||
|
||
protected void allocateConnection() throws SQLException { | ||
connections.add(dataSource.getConnection()); | ||
} | ||
|
||
protected void clearConnections() { | ||
connections.forEach(connection -> { | ||
try { | ||
connection.close(); | ||
} catch (SQLException sqle) { | ||
throw new RuntimeException(sqle); | ||
} | ||
}); | ||
} | ||
} |
55 changes: 0 additions & 55 deletions
55
.../jboss/as/test/integration/jca/statistics/DataSourceMultipleConnStatsServerSetupTask.java
This file was deleted.
Oops, something went wrong.
189 changes: 0 additions & 189 deletions
189
...ava/org/jboss/as/test/integration/jca/statistics/DataSourceMultipleConnStatsTestCase.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.