From 835aaf1db05095563746967f1a9bb1e99c1020c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Finn=C3=A9?= Date: Mon, 27 May 2019 10:16:14 +0200 Subject: [PATCH] Simplified and deduplicated some methods of MessageMatcher --- .../bolt/v1/runtime/ErrorReporterTest.java | 10 +- .../integration/BoltSchedulerBusyIT.java | 6 +- ...etectAllRelationshipInconsistenciesIT.java | 2 +- .../neo4j/kernel/DiagnosticsLoggingTest.java | 14 +-- .../RecoveryCorruptedTransactionLogIT.java | 44 ++++---- .../java/org/neo4j/kernel/RecoveryIT.java | 4 +- .../org/neo4j/store/watch/FileWatchIT.java | 10 +- .../test/java/recovery/RecoveryCleanupIT.java | 10 +- .../neo4j/kernel/NeoStoreDataSourceTest.java | 10 +- ...estGraphDatabaseConfigurationMigrator.java | 4 +- .../KernelTransactionTimeoutMonitorTest.java | 8 +- .../ConstraintIndexCreatorTest.java | 6 +- .../impl/api/index/IndexingServiceTest.java | 18 ++-- .../schema/NativeIndexProviderTests.java | 4 +- .../ConfiguringPageCacheFactoryTest.java | 4 +- .../impl/proc/ProcedureJarLoaderTest.java | 4 +- .../VisibleMigrationProgressMonitorTest.java | 8 +- .../participant/StoreMigratorIT.java | 2 +- .../DefaultFileDeletionEventListenerTest.java | 4 +- .../kernel/internal/DatabaseHealthTest.java | 8 +- .../internal/KernelDiagnosticsTest.java | 6 +- .../neo4j/logging/AssertableLogProvider.java | 102 +++--------------- .../logging/internal/CappedLoggerTest.java | 28 ++--- .../storemigration/StoreUpgraderTest.java | 8 +- .../server/NeoServerShutdownLoggingIT.java | 2 +- .../server/database/CypherExecutorTest.java | 2 +- .../neo4j/server/web/HttpHeaderUtilsTest.java | 2 +- 27 files changed, 130 insertions(+), 200 deletions(-) diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/ErrorReporterTest.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/ErrorReporterTest.java index ee942f97215e6..c42adeffb0c63 100644 --- a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/ErrorReporterTest.java +++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/ErrorReporterTest.java @@ -69,12 +69,12 @@ public void databaseErrorShouldLogFullMessageInDebugLogAndHelpfulPointerInUserLo reporter.report( error ); // then - userLog.rawMessageMatcher().assertContainsLogCallContaining( "Client triggered an unexpected error" ); - userLog.rawMessageMatcher().assertContainsLogCallContaining( reference.toString() ); - userLog.rawMessageMatcher().assertContainsLogCallContaining( "Database error" ); + userLog.rawMessageMatcher().assertContains( "Client triggered an unexpected error" ); + userLog.rawMessageMatcher().assertContains( reference.toString() ); + userLog.rawMessageMatcher().assertContains( "Database error" ); - internalLog.rawMessageMatcher().assertContainsLogCallContaining( reference.toString() ); - internalLog.rawMessageMatcher().assertContainsLogCallContaining( "Database error" ); + internalLog.rawMessageMatcher().assertContains( reference.toString() ); + internalLog.rawMessageMatcher().assertContains( "Database error" ); } private static ErrorReporter newErrorReporter( LogProvider userLog, LogProvider internalLog ) diff --git a/community/community-it/bolt-it/src/test/java/org/neo4j/bolt/runtime/integration/BoltSchedulerBusyIT.java b/community/community-it/bolt-it/src/test/java/org/neo4j/bolt/runtime/integration/BoltSchedulerBusyIT.java index d2a14e1f8b180..f601fb417bdff 100644 --- a/community/community-it/bolt-it/src/test/java/org/neo4j/bolt/runtime/integration/BoltSchedulerBusyIT.java +++ b/community/community-it/bolt-it/src/test/java/org/neo4j/bolt/runtime/integration/BoltSchedulerBusyIT.java @@ -125,7 +125,7 @@ public void shouldReportFailureWhenAllThreadsInThreadPoolAreBusy() throws Throwa assertThat( connection3, util.eventuallyReceives( msgFailure( Status.Request.NoThreadsAvailable, "There are no available threads to serve this request at the moment" ) ) ); - userLogProvider.rawMessageMatcher().assertContainsMessageContaining( + userLogProvider.rawMessageMatcher().assertContains( "since there are no available threads to serve it at the moment. You can retry at a later time" ); internalLogProvider.assertAtLeastOnce( AssertableLogProvider .inLog( startsWith( BoltConnection.class.getPackage().getName() ) ) @@ -160,9 +160,9 @@ public void shouldStopConnectionsWhenRelatedJobIsRejectedOnShutdown() throws Thr server.shutdownDatabase(); // Expect no scheduling error logs - userLogProvider.rawMessageMatcher().assertNoLogCallContaining( + userLogProvider.rawMessageMatcher().assertNotContains( "since there are no available threads to serve it at the moment. You can retry at a later time" ); - internalLogProvider.rawMessageMatcher().assertNoLogCallContaining( + internalLogProvider.rawMessageMatcher().assertNotContains( "since there are no available threads to serve it at the moment. You can retry at a later time" ); } diff --git a/community/community-it/consistency-it/src/test/java/org/neo4j/consistency/checking/full/DetectAllRelationshipInconsistenciesIT.java b/community/community-it/consistency-it/src/test/java/org/neo4j/consistency/checking/full/DetectAllRelationshipInconsistenciesIT.java index ebe535e4a2cc9..9a461808bc447 100644 --- a/community/community-it/consistency-it/src/test/java/org/neo4j/consistency/checking/full/DetectAllRelationshipInconsistenciesIT.java +++ b/community/community-it/consistency-it/src/test/java/org/neo4j/consistency/checking/full/DetectAllRelationshipInconsistenciesIT.java @@ -139,7 +139,7 @@ public void shouldDetectSabotagedRelationshipWhereEverItIs() throws Exception RecordType.RELATIONSHIP ); assertTrue( "Couldn't detect sabotaged relationship " + sabotage, relationshipInconsistencies > 0 ); - logProvider.rawMessageMatcher().assertContainsLogCallContaining( sabotage.after.toString() ); + logProvider.rawMessageMatcher().assertContains( sabotage.after.toString() ); } } finally diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/DiagnosticsLoggingTest.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/DiagnosticsLoggingTest.java index cca4643e9e9da..c588c8e16b292 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/DiagnosticsLoggingTest.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/DiagnosticsLoggingTest.java @@ -48,18 +48,18 @@ public void shouldSeeExpectedDiagnostics() cleanupRule.add( db ); // THEN we should have logged - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Network information" ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Disk space on partition" ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Local timezone" ); + logProvider.rawMessageMatcher().assertContains( "Network information" ); + logProvider.rawMessageMatcher().assertContains( "Disk space on partition" ); + logProvider.rawMessageMatcher().assertContains( "Local timezone" ); // page cache info - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Page cache: 4M" ); + logProvider.rawMessageMatcher().assertContains( "Page cache: 4M" ); // neostore records for ( MetaDataStore.Position position : MetaDataStore.Position.values() ) { - logProvider.rawMessageMatcher().assertContainsMessageContaining( position.name() ); + logProvider.rawMessageMatcher().assertContains( position.name() ); } // transaction log info - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Transaction log" ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "TimeZone version: " ); + logProvider.rawMessageMatcher().assertContains( "Transaction log" ); + logProvider.rawMessageMatcher().assertContains( "TimeZone version: " ); } } diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/RecoveryCorruptedTransactionLogIT.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/RecoveryCorruptedTransactionLogIT.java index f4275a087ca6e..0b0c3c0cdfe9d 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/RecoveryCorruptedTransactionLogIT.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/RecoveryCorruptedTransactionLogIT.java @@ -174,8 +174,8 @@ public void truncateNewerTransactionLogFileWhenForced() throws IOException database = startDbNoRecoveryOfCorruptedLogs(); database.shutdown(); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Fail to read transaction log version 0." ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( + logProvider.rawMessageMatcher().assertContains( "Fail to read transaction log version 0." ); + logProvider.rawMessageMatcher().assertContains( "Fail to read transaction log version 0. Last valid transaction start offset is: 5668." ); assertEquals( numberOfClosedTransactions, recoveryMonitor.getNumberOfRecoveredTransactions() ); } @@ -188,11 +188,11 @@ public void recoverFirstCorruptedTransactionSingleFileNoCheckpoint() throws IOEx GraphDatabaseService recoveredDatabase = startDbNoRecoveryOfCorruptedLogs(); recoveredDatabase.shutdown(); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Fail to read transaction log version 0." ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Fail to read first transaction of log version 0." ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( + logProvider.rawMessageMatcher().assertContains( "Fail to read transaction log version 0." ); + logProvider.rawMessageMatcher().assertContains( "Fail to read first transaction of log version 0." ); + logProvider.rawMessageMatcher().assertContains( "Recovery required from position LogPosition{logVersion=0, byteOffset=16}" ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Fail to recover all transactions. Any later transactions after" + + logProvider.rawMessageMatcher().assertContains( "Fail to recover all transactions. Any later transactions after" + " position LogPosition{logVersion=0, byteOffset=16} are unreadable and will be truncated." ); assertEquals( 0, logFiles.getHighestLogVersion() ); @@ -237,11 +237,11 @@ public void recoverNotAFirstCorruptedTransactionSingleFileNoCheckpoint() throws database = startDbNoRecoveryOfCorruptedLogs(); database.shutdown(); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Fail to read transaction log version 0." ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( + logProvider.rawMessageMatcher().assertContains( "Fail to read transaction log version 0." ); + logProvider.rawMessageMatcher().assertContains( "Recovery required from position LogPosition{logVersion=0, byteOffset=16}" ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Fail to recover all transactions." ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( + logProvider.rawMessageMatcher().assertContains( "Fail to recover all transactions." ); + logProvider.rawMessageMatcher().assertContains( "Any later transaction after LogPosition{logVersion=0, byteOffset=6245} are unreadable and will be truncated." ); assertEquals( 0, logFiles.getHighestLogVersion() ); @@ -278,11 +278,11 @@ public void recoverNotAFirstCorruptedTransactionMultipleFilesNoCheckpoints() thr database = startDbNoRecoveryOfCorruptedLogs(); database.shutdown(); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Fail to read transaction log version 3." ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( + logProvider.rawMessageMatcher().assertContains( "Fail to read transaction log version 3." ); + logProvider.rawMessageMatcher().assertContains( "Recovery required from position LogPosition{logVersion=0, byteOffset=16}" ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Fail to recover all transactions." ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( + logProvider.rawMessageMatcher().assertContains( "Fail to recover all transactions." ); + logProvider.rawMessageMatcher().assertContains( "Any later transaction after LogPosition{logVersion=3, byteOffset=4632} are unreadable and will be truncated." ); assertEquals( 3, logFiles.getHighestLogVersion() ); @@ -316,11 +316,11 @@ public void recoverNotAFirstCorruptedTransactionMultipleFilesMultipleCheckpoints database = startDbNoRecoveryOfCorruptedLogs(); database.shutdown(); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Fail to read transaction log version 3." ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( + logProvider.rawMessageMatcher().assertContains( "Fail to read transaction log version 3." ); + logProvider.rawMessageMatcher().assertContains( "Recovery required from position LogPosition{logVersion=3, byteOffset=593}" ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Fail to recover all transactions." ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( + logProvider.rawMessageMatcher().assertContains( "Fail to recover all transactions." ); + logProvider.rawMessageMatcher().assertContains( "Any later transaction after LogPosition{logVersion=3, byteOffset=4650} are unreadable and will be truncated." ); assertEquals( 3, logFiles.getHighestLogVersion() ); @@ -347,11 +347,11 @@ public void recoverFirstCorruptedTransactionAfterCheckpointInLastLogFile() throw database = startDbNoRecoveryOfCorruptedLogs(); database.shutdown(); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Fail to read transaction log version 5." ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Fail to read first transaction of log version 5." ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( + logProvider.rawMessageMatcher().assertContains( "Fail to read transaction log version 5." ); + logProvider.rawMessageMatcher().assertContains( "Fail to read first transaction of log version 5." ); + logProvider.rawMessageMatcher().assertContains( "Recovery required from position LogPosition{logVersion=5, byteOffset=593}" ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Fail to recover all transactions. " + + logProvider.rawMessageMatcher().assertContains( "Fail to recover all transactions. " + "Any later transactions after position LogPosition{logVersion=5, byteOffset=593} " + "are unreadable and will be truncated." ); diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/RecoveryIT.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/RecoveryIT.java index 8c6e3cd3226c9..e914e58c88d4c 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/RecoveryIT.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/RecoveryIT.java @@ -194,8 +194,8 @@ public void reportProgressOnRecovery() throws IOException { assertEquals( 10, count( recoveredDatabase.getAllNodes() ) ); } - logProvider.rawMessageMatcher().assertContainsMessageContaining( "10% completed" ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "100% completed" ); + logProvider.rawMessageMatcher().assertContains( "10% completed" ); + logProvider.rawMessageMatcher().assertContains( "100% completed" ); database.shutdown(); recoveredDatabase.shutdown(); diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/store/watch/FileWatchIT.java b/community/community-it/kernel-it/src/test/java/org/neo4j/store/watch/FileWatchIT.java index 5c62b4b253132..677b12dabe283 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/store/watch/FileWatchIT.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/store/watch/FileWatchIT.java @@ -108,7 +108,7 @@ public void notifyAboutStoreFileDeletion() throws Exception deleteFile( testDirectory.storeDir(), fileName ); deletionListener.awaitDeletionNotification(); - logProvider.rawMessageMatcher().assertContainsMessageContaining( + logProvider.rawMessageMatcher().assertContains( "'" + fileName + "' which belongs to the store was deleted while database was running." ); } @@ -123,7 +123,7 @@ public void notifyWhenFileWatchingFailToStart() .setFileSystem( new NonWatchableFileSystemAbstraction() ) .newEmbeddedDatabase( testDirectory.storeDir( "failed-start-db" ) ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Can not create file watcher for current file system. " + + logProvider.rawMessageMatcher().assertContains( "Can not create file watcher for current file system. " + "File monitoring capabilities for store files will be disabled." ); } finally @@ -155,7 +155,7 @@ public void notifyAboutExplicitIndexFolderRemoval() throws InterruptedException, deleteStoreDirectory( storeDir, monitoredDirectory ); deletionListener.awaitDeletionNotification(); - logProvider.rawMessageMatcher().assertContainsMessageContaining( + logProvider.rawMessageMatcher().assertContains( "'" + monitoredDirectory + "' which belongs to the store was deleted while database was running." ); } @@ -255,7 +255,7 @@ public void notifyWhenWholeStoreDirectoryRemoved() throws IOException, Interrupt eventListener.awaitDeletionNotification(); - logProvider.rawMessageMatcher().assertContainsMessageContaining( + logProvider.rawMessageMatcher().assertContains( "'" + storeDirectoryName + "' which belongs to the store was deleted while database was running." ); } @@ -272,7 +272,7 @@ public void shouldLogWhenDisabled() .setConfig( GraphDatabaseSettings.filewatcher_enabled, Settings.FALSE ) .newGraphDatabase(); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "File watcher disabled by configuration." ); + logProvider.rawMessageMatcher().assertContains( "File watcher disabled by configuration." ); } finally { diff --git a/community/community-it/kernel-it/src/test/java/recovery/RecoveryCleanupIT.java b/community/community-it/kernel-it/src/test/java/recovery/RecoveryCleanupIT.java index 8a04fce260d85..6c2bd4a01af14 100644 --- a/community/community-it/kernel-it/src/test/java/recovery/RecoveryCleanupIT.java +++ b/community/community-it/kernel-it/src/test/java/recovery/RecoveryCleanupIT.java @@ -140,14 +140,14 @@ public void scanStoreMustLogCrashPointerCleanupDuringRecovery() throws Exception startDatabase().shutdown(); // then - logProvider.rawMessageMatcher().assertContainsLogCallContaining( "Label index cleanup job registered" ); - logProvider.rawMessageMatcher().assertContainsLogCallContaining( "Label index cleanup job started" ); - logProvider.rawMessageMatcher().assertContainsMessageMatching( Matchers.stringContainsInOrder( Iterables.asIterable( + logProvider.rawMessageMatcher().assertContains( "Label index cleanup job registered" ); + logProvider.rawMessageMatcher().assertContains( "Label index cleanup job started" ); + logProvider.rawMessageMatcher().assertContains( Matchers.stringContainsInOrder( Iterables.asIterable( "Label index cleanup job finished", "Number of pages visited", "Number of cleaned crashed pointers", "Time spent" ) ) ); - logProvider.rawMessageMatcher().assertContainsLogCallContaining( "Label index cleanup job closed" ); + logProvider.rawMessageMatcher().assertContains( "Label index cleanup job closed" ); } @Test @@ -189,7 +189,7 @@ private void nativeIndexMustLogCrashPointerCleanupDuringRecovery( GraphDatabaseS matchers.add( indexRecoveryLogMatcher( "Schema index cleanup job closed", subType ) ); } AssertableLogProvider.MessageMatcher messageMatcher = logProvider.rawMessageMatcher(); - matchers.forEach( messageMatcher::assertContainsExactlyOneMessageMatching ); + matchers.forEach( messageMatcher::assertContainsSingle ); } private Matcher indexRecoveryLogMatcher( String logMessage, String subIndexProviderKey ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/NeoStoreDataSourceTest.java b/community/kernel/src/test/java/org/neo4j/kernel/NeoStoreDataSourceTest.java index e5f3f49dea39e..484de75f5e7aa 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/NeoStoreDataSourceTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/NeoStoreDataSourceTest.java @@ -165,7 +165,7 @@ public void shouldLogCorrectTransactionLogDiagnosticsForNoTransactionLogs() DataSourceDiagnostics.TRANSACTION_RANGE.dump( dataSource, logger ); // THEN - logProvider.rawMessageMatcher().assertContainsMessageContaining( "No transactions" ); + logProvider.rawMessageMatcher().assertContains( "No transactions" ); } @Test @@ -183,8 +183,8 @@ public void shouldLogCorrectTransactionLogDiagnosticsForTransactionsInOldestLog( DataSourceDiagnostics.TRANSACTION_RANGE.dump( dataSource, logger ); // THEN - logProvider.rawMessageMatcher().assertContainsMessageContaining( "transaction " + (prevLogLastTxId + 1) ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "version " + logVersion ); + logProvider.rawMessageMatcher().assertContains( "transaction " + (prevLogLastTxId + 1) ); + logProvider.rawMessageMatcher().assertContains( "version " + logVersion ); } @Test @@ -202,8 +202,8 @@ public void shouldLogCorrectTransactionLogDiagnosticsForTransactionsInSecondOlde DataSourceDiagnostics.TRANSACTION_RANGE.dump( dataSource, logger ); // THEN - logProvider.rawMessageMatcher().assertContainsMessageContaining( "transaction " + (prevLogLastTxId + 1) ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "version " + (logVersion + 1) ); + logProvider.rawMessageMatcher().assertContains( "transaction " + (prevLogLastTxId + 1) ); + logProvider.rawMessageMatcher().assertContains( "version " + (logVersion + 1) ); } @Test diff --git a/community/kernel/src/test/java/org/neo4j/kernel/configuration/TestGraphDatabaseConfigurationMigrator.java b/community/kernel/src/test/java/org/neo4j/kernel/configuration/TestGraphDatabaseConfigurationMigrator.java index 9c2deacfb0020..ddd9e2b29978a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/configuration/TestGraphDatabaseConfigurationMigrator.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/configuration/TestGraphDatabaseConfigurationMigrator.java @@ -204,7 +204,7 @@ private Log getLog() private void assertContainsWarningMessage() { - logProvider.rawMessageMatcher().assertContainsMessageContaining( "WARNING! Deprecated configuration options used. See manual for details" ); + logProvider.rawMessageMatcher().assertContains( "WARNING! Deprecated configuration options used. See manual for details" ); } private void assertContainsWarningMessage( String deprecationMessage ) @@ -212,7 +212,7 @@ private void assertContainsWarningMessage( String deprecationMessage ) assertContainsWarningMessage(); if ( StringUtils.isNotEmpty( deprecationMessage ) ) { - logProvider.rawMessageMatcher().assertContainsMessageContaining( deprecationMessage ); + logProvider.rawMessageMatcher().assertContains( deprecationMessage ); } } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTimeoutMonitorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTimeoutMonitorTest.java index 533c4133219ff..2f00c2501780d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTimeoutMonitorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTimeoutMonitorTest.java @@ -76,21 +76,21 @@ void terminateExpiredTransactions() verify( tx1, never() ).markForTermination( Status.Transaction.TransactionTimedOut ); verify( tx2, never() ).markForTermination( Status.Transaction.TransactionTimedOut ); - logProvider.rawMessageMatcher().assertNoMessagesContaining( "timeout" ); + logProvider.rawMessageMatcher().assertNotContains( "timeout" ); fakeClock.forward( 2, TimeUnit.MILLISECONDS ); transactionMonitor.run(); verify( tx1 ).markForTermination( EXPECTED_REUSE_COUNT, Status.Transaction.TransactionTimedOut ); verify( tx2, never() ).markForTermination( Status.Transaction.TransactionTimedOut ); - logProvider.rawMessageMatcher().assertContainsLogCallContaining( "timeout" ); + logProvider.rawMessageMatcher().assertContains( "timeout" ); logProvider.clear(); fakeClock.forward( 10, TimeUnit.MILLISECONDS ); transactionMonitor.run(); verify( tx2 ).markForTermination( EXPECTED_REUSE_COUNT, Status.Transaction.TransactionTimedOut ); - logProvider.rawMessageMatcher().assertContainsLogCallContaining( "timeout" ); + logProvider.rawMessageMatcher().assertContains( "timeout" ); } @Test @@ -113,7 +113,7 @@ void skipTransactionWithoutTimeout() verify( tx1, never() ).markForTermination( Status.Transaction.TransactionTimedOut ); verify( tx2, never() ).markForTermination( Status.Transaction.TransactionTimedOut ); - logProvider.rawMessageMatcher().assertNoMessagesContaining( "timeout" ); + logProvider.rawMessageMatcher().assertNotContains( "timeout" ); } private KernelTransactionMonitor buildTransactionMonitor() diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java index 9d0ab2f02755b..0c2b40c0b3db1 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java @@ -336,9 +336,9 @@ public void logMessagesAboutConstraintCreation() creator.createUniquenessConstraintIndex( transaction, descriptor, "indexProviderByName-1.0" ); - logProvider.rawMessageMatcher().assertContainsLogCallContaining( "Starting constraint creation: %s." ); - logProvider.rawMessageMatcher().assertContainsLogCallContaining( "Constraint %s populated, starting verification." ); - logProvider.rawMessageMatcher().assertContainsLogCallContaining( "Constraint %s verified." ); + logProvider.rawMessageMatcher().assertContains( "Starting constraint creation: %s." ); + logProvider.rawMessageMatcher().assertContains( "Constraint %s populated, starting verification." ); + logProvider.rawMessageMatcher().assertContains( "Constraint %s verified." ); } private class StubKernel implements Kernel diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java index 66fd63ee65808..ccdbbd5585f4d 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java @@ -506,9 +506,9 @@ public void shouldNotLogWhenNoDeprecatedIndexesOnInit() throws IOException // then onBothLogProviders( - logProvider -> logProvider.rawMessageMatcher().assertNoMessagesContaining( "IndexingService.init: Deprecated index providers in use:" ) ); - onBothLogProviders( logProvider -> internalLogProvider.rawMessageMatcher().assertNoMessagesContaining( nativeBtree10Descriptor.name() ) ); - onBothLogProviders( logProvider -> internalLogProvider.rawMessageMatcher().assertNoMessagesContaining( fulltextDescriptor.name() ) ); + logProvider -> logProvider.rawMessageMatcher().assertNotContains( "IndexingService.init: Deprecated index providers in use:" ) ); + onBothLogProviders( logProvider -> internalLogProvider.rawMessageMatcher().assertNotContains( nativeBtree10Descriptor.name() ) ); + onBothLogProviders( logProvider -> internalLogProvider.rawMessageMatcher().assertNotContains( fulltextDescriptor.name() ) ); } @Test @@ -546,9 +546,9 @@ public void shouldNotLogWhenNoDeprecatedIndexesOnStart() throws IOException // then AssertableLogProvider.MessageMatcher messageMatcher = internalLogProvider.rawMessageMatcher(); - onBothLogProviders( logProvider -> messageMatcher.assertNoMessagesContaining( "IndexingService.start: Deprecated index providers in use:" ) ); - onBothLogProviders( logProvider -> messageMatcher.assertNoMessagesContaining( nativeBtree10Descriptor.name() ) ); - onBothLogProviders( logProvider -> messageMatcher.assertNoMessagesContaining( fulltextDescriptor.name() ) ); + onBothLogProviders( logProvider -> messageMatcher.assertNotContains( "IndexingService.start: Deprecated index providers in use:" ) ); + onBothLogProviders( logProvider -> messageMatcher.assertNotContains( nativeBtree10Descriptor.name() ) ); + onBothLogProviders( logProvider -> messageMatcher.assertNotContains( fulltextDescriptor.name() ) ); } @Test @@ -592,7 +592,7 @@ public void shouldLogDeprecatedIndexesOnStart() throws IOException indexingService.start(); // then - userLogProvider.rawMessageMatcher().assertContainsExactlyOneMessageMatching( + userLogProvider.rawMessageMatcher().assertContainsSingle( Matchers.allOf( Matchers.containsString( "Deprecated index providers in use:" ), Matchers.containsString( lucene10Descriptor.name() + " (1 index)" ), @@ -601,8 +601,8 @@ public void shouldLogDeprecatedIndexesOnStart() throws IOException Matchers.containsString( "Use procedure 'db.indexes()' to see what indexes use which index provider." ) ) ); - onBothLogProviders( logProvider -> internalLogProvider.rawMessageMatcher().assertNoMessagesContaining( nativeBtree10Descriptor.name() ) ); - onBothLogProviders( logProvider -> internalLogProvider.rawMessageMatcher().assertNoMessagesContaining( fulltextDescriptor.name() ) ); + onBothLogProviders( logProvider -> internalLogProvider.rawMessageMatcher().assertNotContains( nativeBtree10Descriptor.name() ) ); + onBothLogProviders( logProvider -> internalLogProvider.rawMessageMatcher().assertNotContains( fulltextDescriptor.name() ) ); userLogProvider.print( System.out ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexProviderTests.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexProviderTests.java index 1d837d18678b4..211ea6c75e8c5 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexProviderTests.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/NativeIndexProviderTests.java @@ -270,11 +270,11 @@ public void shouldReportCorrectInitialStateIfIndexDoesntExist() assertEquals( expected, state ); if ( InternalIndexState.POPULATING == expected ) { - logging.rawMessageMatcher().assertContainsLogCallContaining( "Failed to open index" ); + logging.rawMessageMatcher().assertContains( "Failed to open index" ); } else { - logging.rawMessageMatcher().assertNoLogCallContaining( "Failed to open index" ); + logging.rawMessageMatcher().assertNotContains( "Failed to open index" ); } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactoryTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactoryTest.java index bc60cfd50f6d5..7708e629e2a2c 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactoryTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/pagecache/ConfiguringPageCacheFactoryTest.java @@ -106,7 +106,7 @@ public void shouldWarnWhenCreatedWithConfiguredPageCache() // Then try ( PageCache ignore = pageCacheFactory.getOrCreatePageCache() ) { - logProvider.rawMessageMatcher().assertContainsLogCallContaining( + logProvider.rawMessageMatcher().assertContains( "The setting unsupported.dbms.memory.pagecache.pagesize does not have any effect. It is " + "deprecated and will be removed in a future version." ); } @@ -130,7 +130,7 @@ public void mustUseAndLogConfiguredPageSwapper() // Then assertThat( PageSwapperFactoryForTesting.countCreatedPageSwapperFactories(), is( 1 ) ); assertThat( PageSwapperFactoryForTesting.countConfiguredPageSwapperFactories(), is( 1 ) ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( TEST_PAGESWAPPER_NAME ); + logProvider.rawMessageMatcher().assertContains( TEST_PAGESWAPPER_NAME ); } @Test( expected = IllegalArgumentException.class ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ProcedureJarLoaderTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ProcedureJarLoaderTest.java index 1358d3aa28372..48e3870170eb6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ProcedureJarLoaderTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/proc/ProcedureJarLoaderTest.java @@ -261,7 +261,7 @@ public void shouldLogHelpfullyWhenPluginJarIsCorrupt() throws Exception catch ( ZipException expected ) { // then - logProvider.rawMessageMatcher().assertContainsLogCallContaining( + logProvider.internalToStringMessageMatcher().assertContains( escapeJava( String.format( "Plugin jar file: %s corrupted.", new File( theJar.toURI() ).toPath() ) ) ); } } @@ -289,7 +289,7 @@ public void shouldWorkOnPathsWithSpaces() throws Exception catch ( ZipException expected ) { // then - logProvider.rawMessageMatcher().assertContainsLogCallContaining( + logProvider.internalToStringMessageMatcher().assertContains( escapeJava( String.format( "Plugin jar file: %s corrupted.", fileWithSpacesInName.toPath() ) ) ); } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/monitoring/VisibleMigrationProgressMonitorTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/monitoring/VisibleMigrationProgressMonitorTest.java index 4517e443520da..3335797ca5e38 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/monitoring/VisibleMigrationProgressMonitorTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/monitoring/VisibleMigrationProgressMonitorTest.java @@ -78,18 +78,18 @@ public void shouldIncludeDurationInCompletionMessage() monitor.completed(); // then - logProvider.formattedMessageMatcher().assertContainsMessageContaining( "took 1s 500ms" ); + logProvider.formattedMessageMatcher().assertContains( "took 1s 500ms" ); } private void verifySectionReportedCorrectly( AssertableLogProvider logProvider ) { - logProvider.formattedMessageMatcher().assertContainsMessageContaining( VisibleMigrationProgressMonitor.MESSAGE_STARTED ); + logProvider.formattedMessageMatcher().assertContains( VisibleMigrationProgressMonitor.MESSAGE_STARTED ); for ( int i = 10; i <= 100; i += 10 ) { - logProvider.formattedMessageMatcher().assertContainsMessageContaining( i + "%" ); + logProvider.formattedMessageMatcher().assertContains( i + "%" ); } logProvider.assertNone( AssertableLogProvider.inLog( VisibleMigrationProgressMonitor.class ).info( containsString( "110%" ) ) ); - logProvider.formattedMessageMatcher().assertContainsMessageContaining( VisibleMigrationProgressMonitor.MESSAGE_COMPLETED ); + logProvider.formattedMessageMatcher().assertContains( VisibleMigrationProgressMonitor.MESSAGE_COMPLETED ); } private void monitorSection( VisibleMigrationProgressMonitor monitor, String name, int max, int... steps ) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorIT.java index 124748e1ea574..db1670232ed57 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/participant/StoreMigratorIT.java @@ -193,7 +193,7 @@ public void shouldBeAbleToMigrateWithoutErrors() throws Exception databaseLayout, CONFIG, new DefaultIdGeneratorFactory( fs ), pageCache, fs, logService.getInternalLogProvider(), EmptyVersionContextSupplier.EMPTY ); storeFactory.openAllNeoStores().close(); - logProvider.rawMessageMatcher().assertNoLogCallContaining( "ERROR" ); + logProvider.rawMessageMatcher().assertNotContains( "ERROR" ); } @Test diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/watcher/DefaultFileDeletionEventListenerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/watcher/DefaultFileDeletionEventListenerTest.java index 0217ca2909be3..184e4bc29462e 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/watcher/DefaultFileDeletionEventListenerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/watcher/DefaultFileDeletionEventListenerTest.java @@ -36,9 +36,9 @@ public void notificationInLogAboutFileDeletion() listener.fileDeleted( "testFile.db" ); listener.fileDeleted( "anotherDirectory" ); - internalLogProvider.rawMessageMatcher().assertContainsMessageContaining( + internalLogProvider.rawMessageMatcher().assertContains( "'testFile.db' which belongs to the store was deleted while database was running." ); - internalLogProvider.rawMessageMatcher().assertContainsMessageContaining( + internalLogProvider.rawMessageMatcher().assertContains( "'anotherDirectory' which belongs to the store was deleted while database was running." ); } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/internal/DatabaseHealthTest.java b/community/kernel/src/test/java/org/neo4j/kernel/internal/DatabaseHealthTest.java index cf3003254e866..6b4ed54d556e4 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/internal/DatabaseHealthTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/internal/DatabaseHealthTest.java @@ -93,8 +93,8 @@ public void healDatabaseWithoutCriticalErrors() assertFalse( databaseHealth.isHealthy() ); assertTrue( databaseHealth.healed() ); - logProvider.rawMessageMatcher().assertContainsLogCallContaining( "Database health set to OK" ); - logProvider.rawMessageMatcher().assertNoMessagesContaining( "Database encountered a critical error and can't be healed. Restart required." ); + logProvider.rawMessageMatcher().assertContains( "Database health set to OK" ); + logProvider.rawMessageMatcher().assertNotContains( "Database encountered a critical error and can't be healed. Restart required." ); } @Test @@ -111,8 +111,8 @@ public void databaseWithCriticalErrorsCanNotBeHealed() assertFalse( databaseHealth.isHealthy() ); assertFalse( databaseHealth.healed() ); - logProvider.rawMessageMatcher().assertNoMessagesContaining( "Database health set to OK" ); - logProvider.rawMessageMatcher().assertContainsLogCallContaining( + logProvider.rawMessageMatcher().assertNotContains( "Database health set to OK" ); + logProvider.rawMessageMatcher().assertContains( "Database encountered a critical error and can't be healed. Restart required." ); } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/internal/KernelDiagnosticsTest.java b/community/kernel/src/test/java/org/neo4j/kernel/internal/KernelDiagnosticsTest.java index f07e7c4adf0b3..d96cb7fccf15a 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/internal/KernelDiagnosticsTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/internal/KernelDiagnosticsTest.java @@ -61,7 +61,7 @@ public void shouldPrintDiskUsage() KernelDiagnostics.StoreFiles storeFiles = new KernelDiagnostics.StoreFiles( layout ); storeFiles.dump( logProvider.getLog( getClass() ).debugLogger() ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "100 / 40 / 40" ); + logProvider.rawMessageMatcher().assertContains( "100 / 40 / 40" ); } @Test @@ -80,8 +80,8 @@ public void shouldCountFileSizeRecursively() throws IOException KernelDiagnostics.StoreFiles storeFiles = new KernelDiagnostics.StoreFiles( layout ); storeFiles.dump( logProvider.getLog( getClass() ).debugLogger() ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Total size of store: 4.00 kB" ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Total size of mapped files: 3.00 kB" ); + logProvider.rawMessageMatcher().assertContains( "Total size of store: 4.00 kB" ); + logProvider.rawMessageMatcher().assertContains( "Total size of mapped files: 3.00 kB" ); } private File directory( File parent, String name ) throws IOException diff --git a/community/logging/src/test/java/org/neo4j/logging/AssertableLogProvider.java b/community/logging/src/test/java/org/neo4j/logging/AssertableLogProvider.java index 92249b03e3a3a..086c7e1f53f5c 100644 --- a/community/logging/src/test/java/org/neo4j/logging/AssertableLogProvider.java +++ b/community/logging/src/test/java/org/neo4j/logging/AssertableLogProvider.java @@ -588,7 +588,7 @@ public MessageMatcher internalToStringMessageMatcher() } @SafeVarargs - private final void assertContainsLogCallsMatching( int logSkipCount, Function stringifyer, Matcher... matchers ) + private final void assertContains( int logSkipCount, Function stringifyer, Matcher... matchers ) { synchronized ( logCalls ) { @@ -661,7 +661,7 @@ public void assertNone( LogMatcher notExpected ) } } - private void assertNoLogCallContaining( String partOfMessage, Function stringifyer ) + private void assertNotContains( String partOfMessage, Function stringifyer ) { if ( containsLogCallContaining( partOfMessage, stringifyer ) ) { @@ -671,24 +671,7 @@ private void assertNoLogCallContaining( String partOfMessage, Function stringifyer ) - { - synchronized ( logCalls ) - { - for ( LogCall logCall : logCalls ) - { - if ( stringifyer.apply( logCall ).contains( partOfMessage ) ) - { - return; - } - } - } - fail( format( - "Expected at least one log strings containing '%s', but none found. Actual log calls were:\n%s", - partOfMessage, serialize( logCalls.iterator() ) ) ); - } - - private void assertContainsLogCallContaining( String partOfMessage, Function stringifyer ) + private void assertContains( String partOfMessage, Function stringifyer ) { if ( !containsLogCallContaining( partOfMessage, stringifyer ) ) { @@ -733,45 +716,7 @@ private LogCall firstMatchingLogCall( LogMatcher logMatcher ) return null; } - private void assertContainsMessageContaining( String partOfMessage, Function stringifyer ) - { - synchronized ( logCalls ) - { - if ( containsMessage( partOfMessage, stringifyer ) ) - { - return; - } - fail( format( "Expected at least one log statement containing '%s', but none found. Actual log calls were:\n%s", - partOfMessage, serialize( logCalls.iterator() ) ) ); - } - } - - private boolean containsMessage( String partOfMessage, Function stringifyer ) - { - for ( LogCall logCall : logCalls ) - { - if ( stringifyer.apply( logCall ).contains( partOfMessage ) ) - { - return true; - } - } - return false; - } - - private void assertNoMessagesContaining( String partOfMessage, Function stringifyer ) - { - synchronized ( logCalls ) - { - if ( containsMessage( partOfMessage, stringifyer ) ) - { - fail( format( - "Expected at least one log statement containing '%s', but none found. Actual log calls were:\n%s", - partOfMessage, serialize( logCalls.iterator() ) ) ); - } - } - } - - private void assertContainsMessageMatching( Matcher messageMatcher, Function stringifyer ) + private void assertContains( Matcher messageMatcher, Function stringifyer ) { synchronized ( logCalls ) { @@ -790,7 +735,7 @@ private void assertContainsMessageMatching( Matcher messageMatcher, Func } } - private void assertContainsExactlyOneMessageMatching( Matcher messageMatcher, Function stringifyer ) + private void assertContainsSingle( Matcher messageMatcher, Function stringifyer ) { boolean found = false; synchronized ( logCalls ) @@ -880,45 +825,30 @@ public class MessageMatcher this.stringifyer = stringifyer; } - public void assertContainsExactlyOneMessageMatching( Matcher messageMatcher ) - { - AssertableLogProvider.this.assertContainsExactlyOneMessageMatching( messageMatcher, stringifyer ); - } - - public void assertContainsLogCallContaining( String partOfMessage ) - { - AssertableLogProvider.this.assertContainsLogCallContaining( partOfMessage, stringifyer ); - } - - @SafeVarargs - public final void assertContainsLogCallsMatching( int logSkipCount, Matcher... matchers ) - { - AssertableLogProvider.this.assertContainsLogCallsMatching( logSkipCount, stringifyer, matchers ); - } - - public void assertContainsMessageContaining( String partOfMessage ) + public void assertContainsSingle( Matcher messageMatcher ) { - AssertableLogProvider.this.assertContainsMessageContaining( partOfMessage, stringifyer ); + AssertableLogProvider.this.assertContainsSingle( messageMatcher, stringifyer ); } - public void assertContainsMessageMatching( Matcher messageMatcher ) + public void assertContains( Matcher messageMatcher ) { - AssertableLogProvider.this.assertContainsMessageMatching( messageMatcher, stringifyer ); + AssertableLogProvider.this.assertContains( messageMatcher, stringifyer ); } - public void assertLogStringContains( String partOfMessage ) + public void assertContains( String partOfMessage ) { - AssertableLogProvider.this.assertLogStringContains( partOfMessage, stringifyer ); + AssertableLogProvider.this.assertContains( partOfMessage, stringifyer ); } - public void assertNoLogCallContaining( String partOfMessage ) + @SafeVarargs + public final void assertContains( int logSkipCount, Matcher... matchers ) { - AssertableLogProvider.this.assertNoLogCallContaining( partOfMessage, stringifyer ); + AssertableLogProvider.this.assertContains( logSkipCount, stringifyer, matchers ); } - public void assertNoMessagesContaining( String partOfMessage ) + public void assertNotContains( String partOfMessage ) { - AssertableLogProvider.this.assertNoMessagesContaining( partOfMessage, stringifyer ); + AssertableLogProvider.this.assertNotContains( partOfMessage, stringifyer ); } } } diff --git a/community/logging/src/test/java/org/neo4j/logging/internal/CappedLoggerTest.java b/community/logging/src/test/java/org/neo4j/logging/internal/CappedLoggerTest.java index 66e9f413bf038..e0c25a8380572 100644 --- a/community/logging/src/test/java/org/neo4j/logging/internal/CappedLoggerTest.java +++ b/community/logging/src/test/java/org/neo4j/logging/internal/CappedLoggerTest.java @@ -192,7 +192,7 @@ public void assertLoggedLines( String[] lines, int count, int skip ) matchers[i] = containsString( line ); } - logProvider.rawMessageMatcher().assertContainsLogCallsMatching( skip, matchers ); + logProvider.rawMessageMatcher().assertContains( skip, matchers ); } @Before @@ -221,9 +221,9 @@ public void mustLogExceptions() { logMethod.log( logger, "MESSAGE", new ArithmeticException( "EXCEPTION" ) ); AssertableLogProvider.MessageMatcher matcher = logProvider.internalToStringMessageMatcher(); - matcher.assertContainsLogCallContaining( "MESSAGE" ); - matcher.assertContainsLogCallContaining( "ArithmeticException" ); - matcher.assertContainsLogCallContaining( "EXCEPTION" ); + matcher.assertContains( "MESSAGE" ); + matcher.assertContains( "ArithmeticException" ); + matcher.assertContains( "EXCEPTION" ); } @Test( expected = IllegalArgumentException.class ) @@ -293,7 +293,7 @@ public void mustLogAfterResetWithCountLimit() String[] moreLines = logLines( 1, limit + 1 ); assertLoggedLines( ArrayUtils.addAll( ArrayUtils.subarray( lines, 0, limit ), moreLines ), 1 + limit ); logProvider.assertNone( currentLog( inLog( CappedLogger.class ), containsString( lines[limit] ) ) ); - logProvider.rawMessageMatcher().assertContainsMessageMatching( containsString( moreLines[0] ) ); + logProvider.rawMessageMatcher().assertContains( containsString( moreLines[0] ) ); } @Test @@ -321,9 +321,9 @@ public void mustNotLogMessagesWithinConfiguredTimeLimit() clock.forward( 1, TimeUnit.MILLISECONDS ); logMethod.log( logger, "### CCC ###" ); - logProvider.rawMessageMatcher().assertContainsMessageMatching( containsString( "### AAA ###" ) ); + logProvider.rawMessageMatcher().assertContains( containsString( "### AAA ###" ) ); logProvider.assertNone( currentLog( inLog( CappedLogger.class ), containsString( "### BBB ###" ) ) ); - logProvider.rawMessageMatcher().assertContainsMessageMatching( containsString( "### CCC ###" ) ); + logProvider.rawMessageMatcher().assertContains( containsString( "### CCC ###" ) ); } @Test @@ -339,11 +339,11 @@ public void unsettingTimeLimitMustLetMessagesThrough() logger.unsetTimeLimit(); // Note that we are not advancing the clock! logMethod.log( logger, "### EEE ###" ); - logProvider.rawMessageMatcher().assertContainsMessageMatching( containsString( "### AAA ###" ) ); + logProvider.rawMessageMatcher().assertContains( containsString( "### AAA ###" ) ); logProvider.assertNone( currentLog( inLog( CappedLogger.class ), containsString( "### BBB ###" ) ) ); - logProvider.rawMessageMatcher().assertContainsMessageMatching( containsString( "### CCC ###" ) ); + logProvider.rawMessageMatcher().assertContains( containsString( "### CCC ###" ) ); logProvider.assertNone( currentLog( inLog( CappedLogger.class ), containsString( "### DDD ###" ) ) ); - logProvider.rawMessageMatcher().assertContainsMessageMatching( containsString( "### EEE ###" ) ); + logProvider.rawMessageMatcher().assertContains( containsString( "### EEE ###" ) ); } @Test @@ -356,9 +356,9 @@ public void mustLogAfterResetWithTimeLimit() logger.reset(); logMethod.log( logger, "### CCC ###" ); - logProvider.rawMessageMatcher().assertContainsMessageMatching( containsString( "### AAA ###" ) ); + logProvider.rawMessageMatcher().assertContains( containsString( "### AAA ###" ) ); logProvider.assertNone( currentLog( inLog( CappedLogger.class ), containsString( "### BBB ###" ) ) ); - logProvider.rawMessageMatcher().assertContainsMessageMatching( containsString( "### CCC ###" ) ); + logProvider.rawMessageMatcher().assertContains( containsString( "### CCC ###" ) ); } @Test @@ -374,10 +374,10 @@ public void mustOnlyLogMessagesThatPassBothLimits() logger.reset(); logMethod.log( logger, "### DDD ###" ); - logProvider.rawMessageMatcher().assertContainsMessageMatching( containsString( "### AAA ###" ) ); + logProvider.rawMessageMatcher().assertContains( containsString( "### AAA ###" ) ); logProvider.assertNone( currentLog( inLog( CappedLogger.class ), containsString( "### BBB ###" ) ) ); logProvider.assertNone( currentLog( inLog( CappedLogger.class ), containsString( "### CCC ###" ) ) ); - logProvider.rawMessageMatcher().assertContainsMessageMatching( containsString( "### DDD ###" ) ); + logProvider.rawMessageMatcher().assertContains( containsString( "### DDD ###" ) ); } @Test diff --git a/community/neo4j/src/test/java/org/neo4j/kernel/impl/storemigration/StoreUpgraderTest.java b/community/neo4j/src/test/java/org/neo4j/kernel/impl/storemigration/StoreUpgraderTest.java index aed8a92dc9314..43e08da1e21b9 100644 --- a/community/neo4j/src/test/java/org/neo4j/kernel/impl/storemigration/StoreUpgraderTest.java +++ b/community/neo4j/src/test/java/org/neo4j/kernel/impl/storemigration/StoreUpgraderTest.java @@ -314,10 +314,10 @@ public void upgradeShouldGiveProgressMonitorProgressMessages() throws Exception // Then AssertableLogProvider.MessageMatcher messageMatcher = logProvider.rawMessageMatcher(); - messageMatcher.assertContainsLogCallContaining( "Store files" ); - messageMatcher.assertContainsLogCallContaining( "Indexes" ); - messageMatcher.assertContainsLogCallContaining( "Counts store" ); - messageMatcher.assertContainsLogCallContaining( "Successfully finished" ); + messageMatcher.assertContains( "Store files" ); + messageMatcher.assertContains( "Indexes" ); + messageMatcher.assertContains( "Counts store" ); + messageMatcher.assertContains( "Successfully finished" ); } @Test diff --git a/community/server/src/test/java/org/neo4j/server/NeoServerShutdownLoggingIT.java b/community/server/src/test/java/org/neo4j/server/NeoServerShutdownLoggingIT.java index 165a7fb53e5bd..cea2bc72ca41a 100644 --- a/community/server/src/test/java/org/neo4j/server/NeoServerShutdownLoggingIT.java +++ b/community/server/src/test/java/org/neo4j/server/NeoServerShutdownLoggingIT.java @@ -55,6 +55,6 @@ public void shutdownTheServer() public void shouldLogShutdown() { server.stop(); - logProvider.rawMessageMatcher().assertContainsMessageContaining( "Stopped." ); + logProvider.rawMessageMatcher().assertContains( "Stopped." ); } } diff --git a/community/server/src/test/java/org/neo4j/server/database/CypherExecutorTest.java b/community/server/src/test/java/org/neo4j/server/database/CypherExecutorTest.java index f3673993c264a..ce9d57e798a00 100644 --- a/community/server/src/test/java/org/neo4j/server/database/CypherExecutorTest.java +++ b/community/server/src/test/java/org/neo4j/server/database/CypherExecutorTest.java @@ -110,7 +110,7 @@ public void startDefaultTransactionWhenHeaderHasIncorrectValue() cypherExecutor.createTransactionContext( QUERY, VirtualValues.emptyMap(), request ); verify( databaseQueryService ).beginTransaction( KernelTransaction.Type.implicit, AUTH_DISABLED ); - logProvider.rawMessageMatcher().assertContainsMessageContaining( + logProvider.rawMessageMatcher().assertContains( "Fail to parse `max-execution-time` header with value: 'not a number'. Should be a positive number." ); } diff --git a/community/server/src/test/java/org/neo4j/server/web/HttpHeaderUtilsTest.java b/community/server/src/test/java/org/neo4j/server/web/HttpHeaderUtilsTest.java index 2c33c36f7a291..a5bc48c904156 100644 --- a/community/server/src/test/java/org/neo4j/server/web/HttpHeaderUtilsTest.java +++ b/community/server/src/test/java/org/neo4j/server/web/HttpHeaderUtilsTest.java @@ -76,7 +76,7 @@ public void defaultValueWhenCustomTransactionTimeoutNotANumber() Log log = logProvider.getLog( HttpServletRequest.class ); long transactionTimeout = getTransactionTimeout( request, log ); assertEquals( "Transaction timeout not specified.", 0, transactionTimeout ); - logProvider.rawMessageMatcher().assertContainsMessageContaining("Fail to parse `max-execution-time` " + + logProvider.rawMessageMatcher().assertContains("Fail to parse `max-execution-time` " + "header with value: 'aa'. Should be a positive number."); }