Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for Keys availability upon Session.RunAsync and Transaction.RunAsync #235

Merged
merged 3 commits into from
Sep 15, 2017
Merged

Fix for Keys availability upon Session.RunAsync and Transaction.RunAsync #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
756e4d6
Fix for Keys availability upon Session.RunAsync and Transaction.RunAsync
ali-ince Sep 15, 2017
cd272ae
make StatementResult.Keys behave same as Java Driver (i.e. ensure tha…
ali-ince Sep 15, 2017
e39d96c
merged two similar tests that behaved flaky locally
ali-ince Sep 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
175 changes: 175 additions & 0 deletions Neo4j.Driver/Neo4j.Driver.IntegrationTests/DirectDriver/SessionIT.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,5 +198,180 @@ public void ShouldNotThrowExceptionWhenDisposeSessionAfterDriver()
driver.Dispose();
session.Dispose();
}

[RequireServerFact]
public void KeysShouldBeAvailableAfterRun()
{
using (var driver = GraphDatabase.Driver(ServerEndPoint, AuthToken))
{
using (var session = driver.Session())
{
var result = session.Run("RETURN 1 As X");
result.Keys.Should().HaveCount(1);
result.Keys.Should().Contain("X");
}
}
}

[RequireServerFact]
public void KeysShouldBeAvailableAfterRunAndResultConsumption()
{
using (var driver = GraphDatabase.Driver(ServerEndPoint, AuthToken))
{
using (var session = driver.Session())
{
var result = session.Run("RETURN 1 As X");
result.Keys.Should().HaveCount(1);
result.Keys.Should().Contain("X");
result.Consume();
result.Keys.Should().HaveCount(1);
result.Keys.Should().Contain("X");
}
}
}

[RequireServerFact]
public void KeysShouldBeAvailableAfterConsecutiveRun()
{
using (var driver = GraphDatabase.Driver(ServerEndPoint, AuthToken))
{
using (var session = driver.Session())
{
var result1 = session.Run("RETURN 1 As X");
var result2 = session.Run("RETURN 1 As Y");

result1.Keys.Should().HaveCount(1);
result1.Keys.Should().Contain("X");
result2.Keys.Should().HaveCount(1);
result2.Keys.Should().Contain("Y");
}
}
}

[RequireServerFact]
public void KeysShouldBeAvailableAfterConsecutiveRunAndResultConsumption()
{
using (var driver = GraphDatabase.Driver(ServerEndPoint, AuthToken))
{
using (var session = driver.Session())
{
var result1 = session.Run("RETURN 1 As X");
var result2 = session.Run("RETURN 1 As Y");

result1.Keys.Should().HaveCount(1);
result1.Keys.Should().Contain("X");
result2.Keys.Should().HaveCount(1);
result2.Keys.Should().Contain("Y");

result1.Consume();
result2.Consume();

result1.Keys.Should().HaveCount(1);
result1.Keys.Should().Contain("X");
result2.Keys.Should().HaveCount(1);
result2.Keys.Should().Contain("Y");
}
}
}

[RequireServerFact]
public void KeysShouldBeAvailableAfterConsecutiveRunNoOrder()
{
using (var driver = GraphDatabase.Driver(ServerEndPoint, AuthToken))
{
using (var session = driver.Session())
{
var result1 = session.Run("RETURN 1 As X");
var result2 = session.Run("RETURN 1 As Y");

result2.Keys.Should().HaveCount(1);
result2.Keys.Should().Contain("Y");
result1.Keys.Should().HaveCount(1);
result1.Keys.Should().Contain("X");
}
}
}

[RequireServerFact]
public void KeysShouldBeAvailableAfterConsecutiveRunAndResultConsumptionNoOrder()
{
using (var driver = GraphDatabase.Driver(ServerEndPoint, AuthToken))
{
using (var session = driver.Session())
{
var result1 = session.Run("RETURN 1 As X");
var result2 = session.Run("RETURN 1 As Y");

result2.Keys.Should().HaveCount(1);
result2.Keys.Should().Contain("Y");
result1.Keys.Should().HaveCount(1);
result1.Keys.Should().Contain("X");

result2.Consume();
result1.Consume();

result2.Keys.Should().HaveCount(1);
result2.Keys.Should().Contain("Y");
result1.Keys.Should().HaveCount(1);
result1.Keys.Should().Contain("X");
}
}
}


[RequireServerFact]
public async void KeysShouldBeAvailableJustAfterRunAsync()
{
using (var driver = GraphDatabase.Driver(ServerEndPoint, AuthToken))
{
using (var session = driver.Session())
{
var cursor = await session.RunAsync("RETURN 1 As X");
cursor.Keys.Should().HaveCount(1);
cursor.Keys.Should().Contain("X");
}
}
}

[RequireServerFact]
public async void KeysShouldBeAvailableJustAfterConsecutiveRunAsync()
{
using (var driver = GraphDatabase.Driver(ServerEndPoint, AuthToken))
{
using (var session = driver.Session())
{
var cursor1 = await session.RunAsync("RETURN 1 As X");
var cursor2 = await session.RunAsync("RETURN 1 As Y");

cursor1.Keys.Should().HaveCount(1);
cursor1.Keys.Should().Contain("X");

cursor2.Keys.Should().HaveCount(1);
cursor2.Keys.Should().Contain("Y");
}
}
}

[RequireServerFact]
public async void KeysShouldBeAvailableJustAfterConsecutiveRunAsyncWithConsumptionInBetween()
{
using (var driver = GraphDatabase.Driver(ServerEndPoint, AuthToken))
{
using (var session = driver.Session())
{
var cursor1 = await session.RunAsync("RETURN 1 As X");
var cursor2 = await session.RunAsync("RETURN 1 As Y");

await cursor1.ConsumeAsync();

cursor1.Keys.Should().HaveCount(1);
cursor1.Keys.Should().Contain("X");

cursor2.Keys.Should().HaveCount(1);
cursor2.Keys.Should().Contain("Y");
}
}
}

}
}
202 changes: 202 additions & 0 deletions Neo4j.Driver/Neo4j.Driver.IntegrationTests/DirectDriver/TransactionIT.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,5 +126,207 @@ public void ShouldNotCommitIfError()
matchResult.Should().Be(0);
}
}

[RequireServerFact]
public void KeysShouldBeAvailableAfterRun()
{
using (var driver = GraphDatabase.Driver(ServerEndPoint, AuthToken))
{
using (var session = driver.Session())
{
using (var txc = session.BeginTransaction())
{
var result = txc.Run("RETURN 1 As X");
result.Keys.Should().HaveCount(1);
result.Keys.Should().Contain("X");
}
}
}
}

[RequireServerFact]
public void KeysShouldBeAvailableAfterRunAndResultConsumption()
{
using (var driver = GraphDatabase.Driver(ServerEndPoint, AuthToken))
{
using (var session = driver.Session())
{
using (var txc = session.BeginTransaction())
{
var result = txc.Run("RETURN 1 As X");
result.Keys.Should().HaveCount(1);
result.Keys.Should().Contain("X");
result.Consume();
result.Keys.Should().HaveCount(1);
result.Keys.Should().Contain("X");
}
}
}
}

[RequireServerFact]
public void KeysShouldBeAvailableAfterConsecutiveRun()
{
using (var driver = GraphDatabase.Driver(ServerEndPoint, AuthToken))
{
using (var session = driver.Session())
{
using (var txc = session.BeginTransaction())
{
var result1 = txc.Run("RETURN 1 As X");
var result2 = txc.Run("RETURN 1 As Y");

result1.Keys.Should().HaveCount(1);
result1.Keys.Should().Contain("X");
result2.Keys.Should().HaveCount(1);
result2.Keys.Should().Contain("Y");
}
}
}
}

[RequireServerFact]
public void KeysShouldBeAvailableAfterConsecutiveRunAndResultConsumption()
{
using (var driver = GraphDatabase.Driver(ServerEndPoint, AuthToken))
{
using (var session = driver.Session())
{
using (var txc = session.BeginTransaction())
{
var result1 = txc.Run("RETURN 1 As X");
var result2 = txc.Run("RETURN 1 As Y");

result1.Keys.Should().HaveCount(1);
result1.Keys.Should().Contain("X");
result2.Keys.Should().HaveCount(1);
result2.Keys.Should().Contain("Y");

result1.Consume();
result2.Consume();

result1.Keys.Should().HaveCount(1);
result1.Keys.Should().Contain("X");
result2.Keys.Should().HaveCount(1);
result2.Keys.Should().Contain("Y");
}
}
}
}

[RequireServerFact]
public void KeysShouldBeAvailableAfterConsecutiveRunNoOrder()
{
using (var driver = GraphDatabase.Driver(ServerEndPoint, AuthToken))
{
using (var session = driver.Session())
{
using (var txc = session.BeginTransaction())
{
var result1 = txc.Run("RETURN 1 As X");
var result2 = txc.Run("RETURN 1 As Y");

result2.Keys.Should().HaveCount(1);
result2.Keys.Should().Contain("Y");
result1.Keys.Should().HaveCount(1);
result1.Keys.Should().Contain("X");
}
}
}
}

[RequireServerFact]
public void KeysShouldBeAvailableAfterConsecutiveRunAndResultConsumptionNoOrder()
{
using (var driver = GraphDatabase.Driver(ServerEndPoint, AuthToken))
{
using (var session = driver.Session())
{
using (var txc = session.BeginTransaction())
{
var result1 = txc.Run("RETURN 1 As X");
var result2 = txc.Run("RETURN 1 As Y");

result2.Keys.Should().HaveCount(1);
result2.Keys.Should().Contain("Y");
result1.Keys.Should().HaveCount(1);
result1.Keys.Should().Contain("X");

result2.Consume();
result1.Consume();

result2.Keys.Should().HaveCount(1);
result2.Keys.Should().Contain("Y");
result1.Keys.Should().HaveCount(1);
result1.Keys.Should().Contain("X");
}
}
}
}

[RequireServerFact]
public async void KeysShouldBeAvailableJustAfterRunAsync()
{
using (var driver = GraphDatabase.Driver(ServerEndPoint, AuthToken))
{
using (var session = driver.Session())
{
using (var txc = await session.BeginTransactionAsync())
{
var cursor = await txc.RunAsync("RETURN 1 As X");
cursor.Keys.Should().HaveCount(1);
cursor.Keys.Should().Contain("X");
}
}
}
}

[RequireServerFact]
public async void KeysShouldBeAvailableJustAfterConsecutiveRunAsync()
{
using (var driver = GraphDatabase.Driver(ServerEndPoint, AuthToken))
{
using (var session = driver.Session())
{
using (var txc = await session.BeginTransactionAsync())
{
var cursor1 = await txc.RunAsync("RETURN 1 As X");
var cursor2 = await txc.RunAsync("RETURN 1 As Y");

cursor1.Keys.Should().HaveCount(1);
cursor1.Keys.Should().Contain("X");

cursor2.Keys.Should().HaveCount(1);
cursor2.Keys.Should().Contain("Y");
}
}
}
}

[RequireServerFact]
public async void KeysShouldBeAvailableJustAfterConsecutiveRunAsyncWithConsumptionInBetween()
{
using (var driver = GraphDatabase.Driver(ServerEndPoint, AuthToken))
{
using (var session = driver.Session())
{
using (var txc = await session.BeginTransactionAsync())
{
var cursor1 = await txc.RunAsync("RETURN 1 As X");
var cursor2 = await txc.RunAsync("RETURN 1 As Y");

await cursor1.ConsumeAsync();

cursor1.Keys.Should().HaveCount(1);
cursor1.Keys.Should().Contain("X");

cursor2.Keys.Should().HaveCount(1);
cursor2.Keys.Should().Contain("Y");
}
}
}
}


}
}
Loading