Skip to content

Commit

Permalink
Add java.xml.bind to a list of accessible modules
Browse files Browse the repository at this point in the history 
Fix compilation errors in java 9 in several new bolt tests
  • Loading branch information
@MishaDemianenko
MishaDemianenko committed Mar 19, 2018
1 parent fd6ae5d commit 213fe45
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 27 deletions.
2 changes: 1 addition & 1 deletion community/bolt/src/test/java/org/neo4j/bolt/v1/messaging/util/MessageMatchers.java
View file
Expand Up @@ -187,7 +187,7 @@ public void describeTo( Description description )
};
}

public static Matcher<ResponseMessage> msgSuccess( final Matcher<Map<? extends String,?>> matcher )
public static Matcher<ResponseMessage> msgSuccess( final Matcher<Map<String,?>> matcher )
{
return new TypeSafeMatcher<ResponseMessage>()
{
Expand Down
18 changes: 10 additions & 8 deletions community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/ConcurrentAccessIT.java
View file
Expand Up @@ -20,11 +20,13 @@
package org.neo4j.bolt.v1.transport.integration;

import org.hamcrest.CoreMatchers;
import org.hamcrest.Matcher;
import org.junit.Rule;
import org.junit.Test;

import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
Expand Down Expand Up @@ -133,22 +135,22 @@ private void init( TransportConnection client ) throws Exception
private void createAndRollback( TransportConnection client ) throws Exception
{
client.send( createAndRollback );
Matcher<Map<? extends String,?>> entryMatcher = hasEntry( is( "fields" ), equalTo( emptyList() ) );
Matcher<Map<String,?>> messageMatcher =
CoreMatchers.allOf( entryMatcher, hasKey( "result_available_after" ) );
assertThat( client, util.eventuallyReceives(
msgSuccess( CoreMatchers.allOf( hasEntry( is( "fields" ), equalTo( emptyList() ) ),
hasKey( "result_available_after" ) ) ),
msgSuccess( messageMatcher ),
msgSuccess(),
msgSuccess( CoreMatchers.allOf( hasEntry( is( "fields" ), equalTo( emptyList() ) ),
hasKey( "result_available_after" ) ) ),
msgSuccess( messageMatcher ),
msgSuccess(),
msgSuccess( CoreMatchers.allOf( hasEntry( is( "fields" ), equalTo( emptyList() ) ),
hasKey( "result_available_after" ) ) ),
msgSuccess( messageMatcher ),
msgSuccess() ) );

// Verify no visible data
client.send( matchAll );
Matcher<Map<? extends String,?>> fieldsMatcher = hasEntry( is( "fields" ), equalTo( singletonList( "n" ) ) );
assertThat( client, util.eventuallyReceives(
msgSuccess(CoreMatchers.allOf( hasEntry( is( "fields" ), equalTo( singletonList( "n" ) ) ),
hasKey( "result_available_after" ) ) ),
msgSuccess(CoreMatchers.allOf( fieldsMatcher, hasKey( "result_available_after" ) ) ),
msgSuccess() ) );

}
Expand Down
39 changes: 22 additions & 17 deletions community/bolt/src/test/java/org/neo4j/bolt/v1/transport/integration/TransportSessionIT.java
View file
Expand Up @@ -20,12 +20,14 @@
package org.neo4j.bolt.v1.transport.integration;

import org.hamcrest.CoreMatchers;
import org.hamcrest.Matcher;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;

import java.util.HashMap;
import java.util.Map;

import org.neo4j.bolt.AbstractBoltTransportsTest;
import org.neo4j.bolt.v1.messaging.Neo4jPackV1;
Expand Down Expand Up @@ -110,14 +112,15 @@ public void shouldRunSimpleStatement() throws Throwable

// Then
assertThat( connection, util.eventuallyReceivesSelectedProtocolVersion() );
Matcher<Map<? extends String,?>> entryTypeMatcher = hasEntry( is( "type" ), equalTo( "r" ) );
Matcher<Map<? extends String,?>> entryFieldMatcher = hasEntry( is( "fields" ), equalTo( asList( "a", "a_squared" ) ) );
assertThat( connection, util.eventuallyReceives(
msgSuccess(),
msgSuccess( CoreMatchers.allOf( hasEntry( is( "fields" ),
equalTo( asList( "a", "a_squared" ) ) ), hasKey( "result_available_after" ) ) ),
msgSuccess( CoreMatchers.allOf( entryFieldMatcher, hasKey( "result_available_after" ) ) ),
msgRecord( eqRecord( equalTo( longValue( 1L ) ), equalTo( longValue( 1L ) ) ) ),
msgRecord( eqRecord( equalTo( longValue( 2L ) ), equalTo( longValue( 4L ) ) ) ),
msgRecord( eqRecord( equalTo( longValue( 3L ) ), equalTo( longValue( 9L ) ) ) ),
msgSuccess( CoreMatchers.allOf( hasEntry( is( "type" ), equalTo( "r" ) ),
msgSuccess( CoreMatchers.allOf( entryTypeMatcher,
hasKey( "result_consumed_after" ) ) ) ) );
}

Expand All @@ -134,13 +137,12 @@ public void shouldRespondWithMetadataToDiscardAll() throws Throwable

// Then
assertThat( connection, util.eventuallyReceivesSelectedProtocolVersion() );
Matcher<Map<? extends String,?>> entryFieldsMatcher = hasEntry( is( "fields" ), equalTo( asList( "a", "a_squared" ) ) );
Matcher<Map<? extends String,?>> entryTypeMatcher = hasEntry( is( "type" ), equalTo( "r" ) );
assertThat( connection, util.eventuallyReceives(
msgSuccess(),
msgSuccess(
CoreMatchers.allOf( hasEntry( is( "fields" ), equalTo( asList( "a", "a_squared" ) ) ),
hasKey( "result_available_after" ) ) ),
msgSuccess( CoreMatchers.allOf( hasEntry( is( "type" ), equalTo( "r" ) ),
hasKey( "result_consumed_after" ) ) ) ) );
msgSuccess( CoreMatchers.allOf( entryFieldsMatcher, hasKey( "result_available_after" ) ) ),
msgSuccess( CoreMatchers.allOf( entryTypeMatcher, hasKey( "result_consumed_after" ) ) ) ) );
}

@Test
Expand Down Expand Up @@ -185,10 +187,10 @@ public void shouldRunProcedure() throws Throwable
pullAll() ) );

assertThat( connection, util.eventuallyReceivesSelectedProtocolVersion() );
Matcher<Map<? extends String,?>> ageMatcher = hasEntry( is( "fields" ), equalTo( singletonList( "age" ) ) );
assertThat( connection, util.eventuallyReceives(
msgSuccess(),
msgSuccess( CoreMatchers.allOf( hasEntry( is( "fields" ), equalTo( singletonList( "age" ) ) ),
hasKey( "result_available_after" ) ) ),
msgSuccess( CoreMatchers.allOf( ageMatcher, hasKey( "result_available_after" ) ) ),
msgRecord( eqRecord( equalTo( longValue( 2L ) ) ) ),
msgSuccess() ) );

Expand All @@ -198,8 +200,9 @@ public void shouldRunProcedure() throws Throwable
pullAll() ) );

// Then
Matcher<Map<? extends String,?>> entryFieldsMatcher = hasEntry( is( "fields" ), equalTo( singletonList( "label" ) ) );
assertThat( connection, util.eventuallyReceives(
msgSuccess( CoreMatchers.allOf( hasEntry( is( "fields" ), equalTo( singletonList( "label" ) ) ),
msgSuccess( CoreMatchers.allOf( entryFieldsMatcher,
hasKey( "result_available_after" ) ) ),
msgRecord( eqRecord( Matchers.equalTo( stringValue( "Test" ) ) ) ),
msgSuccess()
Expand All @@ -219,9 +222,10 @@ public void shouldHandleDeletedNodes() throws Throwable

// Then
assertThat( connection, util.eventuallyReceivesSelectedProtocolVersion() );
Matcher<Map<? extends String,?>> entryFieldsMatcher = hasEntry( is( "fields" ), equalTo( singletonList( "n" ) ) );
assertThat( connection, util.eventuallyReceives(
msgSuccess(),
msgSuccess( CoreMatchers.allOf( hasEntry( is( "fields" ), equalTo( singletonList( "n" ) ) ),
msgSuccess( CoreMatchers.allOf( entryFieldsMatcher,
hasKey( "result_available_after" ) ) ) ) );

//
Expand Down Expand Up @@ -250,9 +254,10 @@ public void shouldHandleDeletedRelationships() throws Throwable

// Then
assertThat( connection, util.eventuallyReceivesSelectedProtocolVersion() );
Matcher<Map<? extends String,?>> entryFieldsMatcher = hasEntry( is( "fields" ), equalTo( singletonList( "r" ) ) );
assertThat( connection, util.eventuallyReceives(
msgSuccess(),
msgSuccess( CoreMatchers.allOf( hasEntry( is( "fields" ), equalTo( singletonList( "r" ) ) ),
msgSuccess( CoreMatchers.allOf( entryFieldsMatcher,
hasKey( "result_available_after" ) ) ) ) );

//
Expand Down Expand Up @@ -293,11 +298,11 @@ public void shouldNotLeakStatsToNextStatement() throws Throwable
pullAll() ) );

// Then
Matcher<Map<? extends String,?>> typeMatcher = hasEntry( is( "type" ), equalTo( "r" ) );
assertThat( connection, util.eventuallyReceives(
msgSuccess(),
msgRecord( eqRecord( equalTo( longValue( 1L ) ) ) ),
msgSuccess( CoreMatchers.allOf( hasEntry( is( "type" ), equalTo( "r" ) ),
hasKey( "result_consumed_after" ) ) ) ) );
msgSuccess( CoreMatchers.allOf( typeMatcher, hasKey( "result_consumed_after" ) ) ) ) );
}

@Test
Expand Down Expand Up @@ -343,10 +348,10 @@ public void shouldFailNicelyOnPointsWhenProtocolDoesNotSupportThem() throws Thro

// Then
assertThat( connection, util.eventuallyReceivesSelectedProtocolVersion() );
Matcher<Map<? extends String,?>> fieldsMatcher = hasEntry( is( "fields" ), equalTo( singletonList( "p" ) ) );
assertThat( connection, util.eventuallyReceives(
msgSuccess(),
msgSuccess( CoreMatchers.allOf( hasEntry( is( "fields" ), equalTo( singletonList( "p" ) ) ),
hasKey( "result_available_after" ) ) ),
msgSuccess( CoreMatchers.allOf( fieldsMatcher, hasKey( "result_available_after" ) ) ),
msgRecord( eqRecord( equalTo( NO_VALUE ) ) ),
msgFailure( Status.Request.Invalid, "Point is not yet supported as a return type in Bolt" ) ) );
}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -919,7 +919,7 @@
<jdk>9</jdk>
</activation>
<properties>
<java9.exports>--add-exports=java.base/sun.nio.ch=ALL-UNNAMED</java9.exports>
<java9.exports>--add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-modules java.xml.bind</java9.exports>
<maven.javadoc.skip>true</maven.javadoc.skip>
<scala.java9.arg>-nobootcp</scala.java9.arg>
</properties>
Expand Down

0 comments on commit 213fe45

Please sign in to comment.