Skip to content

Commit

Permalink
Fix up test data
Browse files Browse the repository at this point in the history
  • Loading branch information
stevejgordon committed Feb 23, 2024
1 parent 0660837 commit 2d3261a
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class AdoNetTestData : IEnumerable<object[]>
public IEnumerator<object[]> GetEnumerator()
{
// TODO: Add x64/x86 options. macOS and Linux do not support x86
yield return new object[] { "net7.0" };
yield return new object[] { "net8.0" };
yield return new object[] { "net6.0" };
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ public static IEnumerable<object[]> TestParameters
var npgSqlVersion = "5.0.7";

// TODO: Add x64/x86 options. macOS and Linux do not support x86
yield return new object[] { "net7.0", npgSqlVersion };
yield return new object[] { "net8.0", npgSqlVersion };

if (TestEnvironment.IsWindows)
yield return new object[] { "net462", npgSqlVersion };

npgSqlVersion = "6.0.2";
yield return new object[] { "net7.0", npgSqlVersion };
yield return new object[] { "net8.0", npgSqlVersion };

npgSqlVersion = "7.0.2";
yield return new object[] { "net7.0", npgSqlVersion };
yield return new object[] { "net8.0", npgSqlVersion };
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class AspNetCoreTests
/// </summary>
/// <param name="framework"></param>
[Theory]
[InlineData("net7.0")]
[InlineData("net8.0")]
public async void AspNetCoreTest(string framework)
{
var apmLogger = new InMemoryBlockingLogger(Logging.LogLevel.Error);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public KafkaTests(KafkaFixture fixture, ITestOutputHelper output)
}

[DockerTheory]
[InlineData("net7.0")]
[InlineData("net8.0")]
public async Task CaptureAutoInstrumentedSpans(string targetFramework)
{
var apmLogger = new InMemoryBlockingLogger(Logging.LogLevel.Error);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public RabbitMqTests(RabbitMqFixture fixture, ITestOutputHelper output)
}

[DockerTheory]
[InlineData("net7.0")]
[InlineData("net8.0")]
public async Task CaptureAutoInstrumentedSpans(string targetFramework)
{
var apmLogger = new InMemoryBlockingLogger(Logging.LogLevel.Error);
Expand Down
7 changes: 2 additions & 5 deletions test/startuphook/Elastic.Apm.StartupHook.Sample/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@
This sample application is a default ASP.NET (Core) application
configured to run with

- `netcoreapp3.0`
- `netcoreapp3.1`
- `net5.0`
- `net6.0`
- `net7.0`
- `net8.0`

target frameworks that can be used to try out the [Elastic APM
startup hooks implementation](../../src/ElasticApmAgentStartupHook).
Expand All @@ -33,6 +30,6 @@ startup hooks implementation](../../src/ElasticApmAgentStartupHook).
4. Start the sample application with the specified target framework. From the `sample/Elastic.Apm.StartupHook.Sample` directory

```
dotnet run -f net7.0
dotnet run -f net8.0
```
5. Observe APM data collected.

0 comments on commit 2d3261a

Please sign in to comment.