Skip to content

Commit

Permalink
Move base classes into Infrastructure, change a namespace, only use C…
Browse files Browse the repository at this point in the history
…osmosDbEmulatorFixture.
  • Loading branch information
danielcweber committed Aug 8, 2024
1 parent 28e0a1a commit c50ca93
Show file tree
Hide file tree
Showing 44 changed files with 25 additions and 78 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;
using ExRam.Gremlinq.Tests.Infrastructure;

namespace ExRam.Gremlinq.Core.Tests
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;
using ExRam.Gremlinq.Tests.Infrastructure;
using Gremlin.Net.Process.Traversal;

namespace ExRam.Gremlinq.Core.Tests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;
using ExRam.Gremlinq.Tests.Infrastructure;
using Gremlin.Net.Process.Traversal;

namespace ExRam.Gremlinq.Core.Tests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using ExRam.Gremlinq.Providers.Core;
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

namespace ExRam.Gremlinq.Core.Tests
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using ExRam.Gremlinq.Providers.Core;
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

namespace ExRam.Gremlinq.Core.Tests
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using ExRam.Gremlinq.Core.Serialization;
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

namespace ExRam.Gremlinq.Core.Tests
{
Expand Down
2 changes: 0 additions & 2 deletions test/Core.Tests/Serialization/OuterProjectionTest.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using System.Runtime.CompilerServices;
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

namespace ExRam.Gremlinq.Core.Tests
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;
using ExRam.Gremlinq.Tests.Infrastructure;

using Gremlin.Net.Driver.Messages;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

using Gremlin.Net.Driver.Messages;

namespace ExRam.Gremlinq.Core.Tests
Expand Down
5 changes: 2 additions & 3 deletions test/Providers.CosmosDb.Tests/DebugTests.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

namespace ExRam.Gremlinq.Providers.CosmosDb.Tests
{
public class DebugTests : QueryExecutionTest, IClassFixture<CosmosDbFixture>
public class DebugTests : QueryExecutionTest, IClassFixture<CosmosDbEmulatorFixture>
{
public DebugTests(CosmosDbFixture fixture) : base(
public DebugTests(CosmosDbEmulatorFixture fixture) : base(
fixture,
new DebugGremlinQueryVerifier())
{
Expand Down
5 changes: 2 additions & 3 deletions test/Providers.CosmosDb.Tests/DeserializationTests.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

namespace ExRam.Gremlinq.Providers.CosmosDb.Tests
{
public class DeserializationTests : QueryExecutionTest, IClassFixture<CosmosDbFixture>
public class DeserializationTests : QueryExecutionTest, IClassFixture<CosmosDbEmulatorFixture>
{
public DeserializationTests(CosmosDbFixture fixture, ITestOutputHelper testOutputHelper) : base(
public DeserializationTests(CosmosDbEmulatorFixture fixture, ITestOutputHelper testOutputHelper) : base(
fixture,
new DeserializingGremlinqVerifier<IntegrationTests>(testOutputHelper))
{
Expand Down
1 change: 0 additions & 1 deletion test/Providers.CosmosDb.Tests/IntegrationTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

namespace ExRam.Gremlinq.Providers.CosmosDb.Tests
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;
using Gremlin.Net.Driver.Messages;

namespace ExRam.Gremlinq.Providers.CosmosDb.Tests
{
public class RequestMessageSerializationTests : QueryExecutionTest, IClassFixture<CosmosDbFixture>
public class RequestMessageSerializationTests : QueryExecutionTest, IClassFixture<CosmosDbEmulatorFixture>
{
public RequestMessageSerializationTests(CosmosDbFixture fixture) : base(
public RequestMessageSerializationTests(CosmosDbEmulatorFixture fixture) : base(
fixture,
new SerializingVerifier<RequestMessage>())
{
Expand Down
5 changes: 2 additions & 3 deletions test/Providers.CosmosDb.Tests/SerializationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
using ExRam.Gremlinq.Tests.Entities;
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

namespace ExRam.Gremlinq.Providers.CosmosDb.Tests
{
public class SerializationTests : QueryExecutionTest, IClassFixture<CosmosDbFixture>
public class SerializationTests : QueryExecutionTest, IClassFixture<CosmosDbEmulatorFixture>
{
public SerializationTests(CosmosDbFixture fixture) : base(
public SerializationTests(CosmosDbEmulatorFixture fixture) : base(
fixture,
new SerializingVerifier<GroovyGremlinScript>())
{
Expand Down
1 change: 0 additions & 1 deletion test/Providers.GremlinServer.Tests/DebugTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

namespace ExRam.Gremlinq.Providers.GremlinServer.Tests
{
Expand Down
1 change: 0 additions & 1 deletion test/Providers.GremlinServer.Tests/DeserializationTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

namespace ExRam.Gremlinq.Providers.GremlinServer.Tests
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

namespace ExRam.Gremlinq.Providers.GremlinServer.Tests
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

namespace ExRam.Gremlinq.Providers.GremlinServer.Tests
{
Expand Down
1 change: 0 additions & 1 deletion test/Providers.GremlinServer.Tests/IntegrationTests.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using ExRam.Gremlinq.Core;
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

using FluentAssertions;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

namespace ExRam.Gremlinq.Providers.GremlinServer.Tests
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

namespace ExRam.Gremlinq.Providers.GremlinServer.Tests
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

namespace ExRam.Gremlinq.Providers.GremlinServer.Tests
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;
using Gremlin.Net.Driver.Messages;

namespace ExRam.Gremlinq.Providers.GremlinServer.Tests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;
using Gremlin.Net.Driver.Messages;

namespace ExRam.Gremlinq.Providers.GremlinServer.Tests
Expand Down
1 change: 0 additions & 1 deletion test/Providers.GremlinServer.Tests/SerializationTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

using Gremlin.Net.Process.Traversal;

Expand Down
1 change: 0 additions & 1 deletion test/Providers.JanusGraph.Tests/IntegrationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using System.Text.RegularExpressions;
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

namespace ExRam.Gremlinq.Providers.JanusGraph.Tests
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;
using Gremlin.Net.Driver.Messages;

namespace ExRam.Gremlinq.Providers.JanusGraph.Tests
Expand Down
1 change: 0 additions & 1 deletion test/Providers.JanusGraph.Tests/SerializationTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;
using Gremlin.Net.Process.Traversal;

namespace ExRam.Gremlinq.Providers.JanusGraph.Tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using ExRam.Gremlinq.Tests.Entities;
using Gremlin.Net.Process.Traversal;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

namespace ExRam.Gremlinq.Providers.Neptune.Tests
{
Expand Down
1 change: 0 additions & 1 deletion test/Providers.Neptune.Tests/IntegrationTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;

namespace ExRam.Gremlinq.Providers.Neptune.Tests
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;
using Gremlin.Net.Driver.Messages;

namespace ExRam.Gremlinq.Providers.Neptune.Tests
Expand Down
1 change: 0 additions & 1 deletion test/Providers.Neptune.Tests/SerializationTests.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Tests.TestCases;
using Gremlin.Net.Process.Traversal;

namespace ExRam.Gremlinq.Providers.Neptune.Tests
Expand Down
1 change: 1 addition & 0 deletions test/Tests.Fixtures/CosmosDbEmulatorFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using ExRam.Gremlinq.Providers.CosmosDb;
using ExRam.Gremlinq.Tests.Entities;
using ExRam.Gremlinq.Support.NewtonsoftJson;
using ExRam.Gremlinq.Tests.Infrastructure;
using System.Text.Json;
using Microsoft.Azure.Cosmos;
using Polly;
Expand Down
21 changes: 0 additions & 21 deletions test/Tests.Fixtures/CosmosDbFixture.cs

This file was deleted.

1 change: 1 addition & 0 deletions test/Tests.Fixtures/ElasticSearchNeptuneFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using ExRam.Gremlinq.Providers.Core;
using ExRam.Gremlinq.Tests.Entities;
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;

namespace ExRam.Gremlinq.Providers.Neptune.Tests
{
Expand Down
1 change: 0 additions & 1 deletion test/Tests.Fixtures/ExRam.Gremlinq.Tests.Fixtures.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<ProjectReference Include="..\..\src\Providers.GremlinServer\ExRam.Gremlinq.Providers.GremlinServer.csproj" />
<ProjectReference Include="..\..\src\Providers.JanusGraph\ExRam.Gremlinq.Providers.JanusGraph.csproj" />
<ProjectReference Include="..\..\src\Providers.Neptune\ExRam.Gremlinq.Providers.Neptune.csproj" />
<ProjectReference Include="..\..\src\Support.NewtonsoftJson\ExRam.Gremlinq.Support.NewtonsoftJson.csproj" />
<ProjectReference Include="..\Tests.Entities\ExRam.Gremlinq.Tests.Entities.csproj" />
<ProjectReference Include="..\Tests.Infrastructure\ExRam.Gremlinq.Tests.Infrastructure.csproj" />

Expand Down
1 change: 1 addition & 0 deletions test/Tests.Fixtures/GremlinServerFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using ExRam.Gremlinq.Tests.Entities;
using ExRam.Gremlinq.Support.NewtonsoftJson;
using ExRam.Gremlinq.Providers.GremlinServer;
using ExRam.Gremlinq.Tests.Infrastructure;

namespace ExRam.Gremlinq.Tests.Fixtures
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using ExRam.Gremlinq.Core;
using ExRam.Gremlinq.Core.Serialization;
using ExRam.Gremlinq.Core.Transformation;
using ExRam.Gremlinq.Tests.Infrastructure;

using Gremlin.Net.Driver.Messages;
using Gremlin.Net.Process.Traversal;
Expand Down
1 change: 1 addition & 0 deletions test/Tests.Fixtures/NeptuneFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using ExRam.Gremlinq.Tests.Entities;
using ExRam.Gremlinq.Support.NewtonsoftJson;
using ExRam.Gremlinq.Providers.Neptune;
using ExRam.Gremlinq.Tests.Infrastructure;

namespace ExRam.Gremlinq.Tests.Fixtures
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using ExRam.Gremlinq.Providers.Core;
using ExRam.Gremlinq.Tests.Entities;
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Tests.Infrastructure;

namespace ExRam.Gremlinq.Providers.GremlinServer.Tests
{
Expand Down
1 change: 1 addition & 0 deletions test/Tests.Fixtures/TestContainerFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using DotNet.Testcontainers.Images;

using ExRam.Gremlinq.Core;
using ExRam.Gremlinq.Tests.Infrastructure;

namespace ExRam.Gremlinq.Tests.Fixtures
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@

<ItemGroup>
<ProjectReference Include="..\..\src\Core\ExRam.Gremlinq.Core.csproj" />
<ProjectReference Include="..\..\src\Providers.Core\ExRam.Gremlinq.Providers.Core.csproj" />
<ProjectReference Include="..\..\src\Support.NewtonsoftJson\ExRam.Gremlinq.Support.NewtonsoftJson.csproj" />

<ProjectReference Include="..\Tests.Entities\ExRam.Gremlinq.Tests.Entities.csproj" />

<PackageReference Include="System.Interactive.Async" Version="6.0.1" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

using static ExRam.Gremlinq.Core.GremlinQuerySource;

namespace ExRam.Gremlinq.Tests.Fixtures
namespace ExRam.Gremlinq.Tests.Infrastructure
{
public class GremlinqFixture : IAsyncLifetime
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@
using ExRam.Gremlinq.Core.Steps;
using ExRam.Gremlinq.Tests.Entities;
using static ExRam.Gremlinq.Core.Transformation.ConverterFactory;
using ExRam.Gremlinq.Tests.Infrastructure;
using ExRam.Gremlinq.Core;
using ExRam.Gremlinq.Tests.Fixtures;
using ExRam.Gremlinq.Support.NewtonsoftJson;
using Newtonsoft.Json.Linq;

namespace ExRam.Gremlinq.Tests.TestCases
namespace ExRam.Gremlinq.Tests.Infrastructure
{
public abstract class QueryExecutionTest : GremlinqTestBase
{
Expand Down

0 comments on commit c50ca93

Please sign in to comment.