Skip to content

Commit

Permalink
Enable service tesst with encrypted db as they work now expected_db S…
Browse files Browse the repository at this point in the history
…PB is implemented
  • Loading branch information
mrotteveel committed Jan 12, 2024
1 parent ceb74c2 commit 6b97416
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions src/test/org/firebirdsql/jdbc/DatabaseEncryptionTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import org.firebirdsql.management.FBStatisticsManager;
import org.firebirdsql.management.MaintenanceManager;
import org.firebirdsql.management.StatisticsManager;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
Expand All @@ -52,15 +51,11 @@
* Tests related to database encryption.
* <p>
* Tests in this class require the existence of an encrypted database with alias crypttest, and encryption key passed
* through callback (eg IBPhoenix AES128/256 with Callback configuration), and an encryption key value of
* through callback (e.g. IBPhoenix AES128/256 with Callback configuration), and an encryption key value of
* {@code TestKey}.
* </p>
* <p>
* The ignored service tests require a global {@code KeyHolderPlugin} configuration instead of a database-specific
* configuration in {@code databases.conf}.
* </p>
* <p>
* The ignored encrypted security db tests require an encrypted database with alias cryptsec that also serves as its own
* The encrypted security db tests require an encrypted database with alias cryptsec that also serves as its own
* security database, with a sysdba password of {@code alt-masterkey}. Like crypttest, its encryption key passed through
* callback (eg IBPhoenix AES128/256 with Callback configuration), and an encryption key value of {@code TestKey}.
* </p>
Expand Down Expand Up @@ -199,7 +194,6 @@ void testFBXADataSource() throws Exception {
}

@Test
@Disabled("Requires global KeyHolderPlugin configuration")
void testServiceManagerConnection_gstatException() {
FBStatisticsManager statManager = configureServiceManager(new FBStatisticsManager(getGdsType()));
statManager.setDatabase(CRYPTTEST_DB);
Expand All @@ -215,7 +209,6 @@ void testServiceManagerConnection_gstatException() {
}

@Test
@Disabled("Requires global KeyHolderPlugin configuration")
void testDatabaseValidation() throws Exception {
FBMaintenanceManager maintenanceManager = configureServiceManager(new FBMaintenanceManager(getGdsType()));
maintenanceManager.setDatabase(CRYPTTEST_DB);
Expand Down

0 comments on commit 6b97416

Please sign in to comment.