From 7c1cfabbb44f94ba9cb175ea9a4b203348746466 Mon Sep 17 00:00:00 2001 From: Anton Persson Date: Wed, 10 Oct 2018 12:22:02 +0200 Subject: [PATCH] Revert changes to AssertableLogProvider from 7b267c6d905 "IndexingService log when deprecated IndexProviders are used" And simply use Matchers.allOf instead where needed. --- .../test/java/recovery/RecoveryCleanupIT.java | 2 +- .../impl/api/index/IndexingServiceTest.java | 24 +++++++++++-------- .../neo4j/logging/AssertableLogProvider.java | 24 ++++--------------- .../catchup/storecopy/StoreCopyClientIT.java | 4 ++-- .../diagnostics/CoreMonitorTest.java | 4 ++-- 5 files changed, 23 insertions(+), 35 deletions(-) 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 0f2f9ea1a25b..255f3217f44f 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 @@ -188,7 +188,7 @@ private void nativeIndexMustLogCrashPointerCleanupDuringRecovery( GraphDatabaseS matchers.add( indexRecoveryFinishedLogMatcher( subType ) ); matchers.add( indexRecoveryLogMatcher( "Schema index cleanup job closed", subType ) ); } - matchers.forEach( logProvider::assertContainsExactlyOneMessageMatchingInAnyOrder ); + matchers.forEach( logProvider::assertContainsExactlyOneMessageMatching ); } private Matcher indexRecoveryLogMatcher( String logMessage, String subIndexProviderKey ) 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 99d25274594c..f0d47c853265 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 @@ -574,11 +574,13 @@ public void shouldLogDeprecatedIndexesOnInit() throws IOException indexingService.init(); // then - userLogProvider.assertContainsExactlyOneMessageMatchingInAnyOrder( - Matchers.containsString( "IndexingService.init: Deprecated index providers in use:" ), - Matchers.containsString( lucene10Descriptor.name() + " (1 index)" ), - Matchers.containsString( native10Descriptor.name() + " (1 index)" ), - Matchers.containsString( native20Descriptor.name() + " (2 indexes)" ) + userLogProvider.assertContainsExactlyOneMessageMatching( + Matchers.allOf( + Matchers.containsString( "IndexingService.init: Deprecated index providers in use:" ), + Matchers.containsString( lucene10Descriptor.name() + " (1 index)" ), + Matchers.containsString( native10Descriptor.name() + " (1 index)" ), + Matchers.containsString( native20Descriptor.name() + " (2 indexes)" ) + ) ); onBothLogProviders( logProvider -> internalLogProvider.assertNoMessagesContaining( nativeBtree10Descriptor.name() ) ); onBothLogProviders( logProvider -> internalLogProvider.assertNoMessagesContaining( fulltextDescriptor.name() ) ); @@ -625,11 +627,13 @@ public void shouldLogDeprecatedIndexesOnStart() throws IOException indexingService.start(); // then - userLogProvider.assertContainsExactlyOneMessageMatchingInAnyOrder( - Matchers.containsString( "IndexingService.start: Deprecated index providers in use:" ), - Matchers.containsString( lucene10Descriptor.name() + " (1 index)" ), - Matchers.containsString( native10Descriptor.name() + " (1 index)" ), - Matchers.containsString( native20Descriptor.name() + " (2 indexes)" ) + userLogProvider.assertContainsExactlyOneMessageMatching( + Matchers.allOf( + Matchers.containsString( "IndexingService.start: Deprecated index providers in use:" ), + Matchers.containsString( lucene10Descriptor.name() + " (1 index)" ), + Matchers.containsString( native10Descriptor.name() + " (1 index)" ), + Matchers.containsString( native20Descriptor.name() + " (2 indexes)" ) + ) ); onBothLogProviders( logProvider -> internalLogProvider.assertNoMessagesContaining( nativeBtree10Descriptor.name() ) ); onBothLogProviders( logProvider -> internalLogProvider.assertNoMessagesContaining( fulltextDescriptor.name() ) ); 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 80c13e748c80..a2476d3f7848 100644 --- a/community/logging/src/test/java/org/neo4j/logging/AssertableLogProvider.java +++ b/community/logging/src/test/java/org/neo4j/logging/AssertableLogProvider.java @@ -764,24 +764,14 @@ public void assertContainsMessageMatching( Matcher messageMatcher ) } } - @SafeVarargs - public final void assertContainsExactlyOneMessageMatchingInAnyOrder( Matcher... messageMatchers ) + public final void assertContainsExactlyOneMessageMatching( Matcher messageMatcher ) { boolean found = false; synchronized ( logCalls ) { for ( LogCall logCall : logCalls ) { - boolean match = true; - for ( Matcher messageMatcher : messageMatchers ) - { - if ( !messageMatcher.matches( logCall.message ) ) - { - match = false; - break; - } - } - if ( match ) + if ( messageMatcher.matches( logCall.message ) ) { if ( !found ) { @@ -790,10 +780,7 @@ public final void assertContainsExactlyOneMessageMatchingInAnyOrder( Matcher messageMatcher : messageMatchers ) - { - description.appendDescriptionOf( messageMatcher ); - } + description.appendDescriptionOf( messageMatcher ); fail( format( "Expected exactly one log statement with message as %s, but multiple found. Actual log calls were:%n%s", description.toString(), serialize( logCalls.iterator() ) ) ); } @@ -802,10 +789,7 @@ public final void assertContainsExactlyOneMessageMatchingInAnyOrder( Matcher messageMatcher : messageMatchers ) - { - description.appendDescriptionOf( messageMatcher ); - } + description.appendDescriptionOf( messageMatcher ); fail( format( "Expected at least one log statement with message as %s, but none found. Actual log calls were:\n%s", description.toString(), serialize( logCalls.iterator() ) ) ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyClientIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyClientIT.java index 75e410212f2a..da8c48877b5d 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyClientIT.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/catchup/storecopy/StoreCopyClientIT.java @@ -326,7 +326,7 @@ public AdvertisedSocketAddress secondary() } catch ( StoreCopyFailedException e ) { - assertableLogProvider.assertContainsExactlyOneMessageMatchingInAnyOrder( + assertableLogProvider.assertContainsExactlyOneMessageMatching( both( containsString( "Connection refused:" ) ).and( containsString( "localhost/127.0.0.1:" + port ) ) ); } } @@ -356,7 +356,7 @@ public AdvertisedSocketAddress secondary() throws CatchupAddressResolutionExcept } catch ( StoreCopyFailedException e ) { - assertableLogProvider.assertContainsExactlyOneMessageMatchingInAnyOrder( startsWith( "Unable to resolve address for" ) ); + assertableLogProvider.assertContainsExactlyOneMessageMatching( startsWith( "Unable to resolve address for" ) ); assertableLogProvider.assertLogStringContains(catchupAddressResolutionException.getMessage() ); } } diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/diagnostics/CoreMonitorTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/diagnostics/CoreMonitorTest.java index 37e6a52f67ec..a7bf49f7aaa4 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/diagnostics/CoreMonitorTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/diagnostics/CoreMonitorTest.java @@ -52,7 +52,7 @@ public void shouldNotDuplicateToAnyLog() ClusterId clusterId = new ClusterId( UUID.randomUUID() ); monitor.boundToCluster( clusterId ); - user.assertContainsExactlyOneMessageMatchingInAnyOrder( Matchers.equalToIgnoringCase( "Bound to cluster with id " + clusterId.uuid() ) ); - debug.assertContainsExactlyOneMessageMatchingInAnyOrder( Matchers.equalToIgnoringCase( "Bound to cluster with id " + clusterId.uuid() ) ); + user.assertContainsExactlyOneMessageMatching( Matchers.equalToIgnoringCase( "Bound to cluster with id " + clusterId.uuid() ) ); + debug.assertContainsExactlyOneMessageMatching( Matchers.equalToIgnoringCase( "Bound to cluster with id " + clusterId.uuid() ) ); } }