Skip to content

[V4] Update DynamoDB tests to use async operations #4203

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

Merged
dscpinheiro merged 11 commits into from
Dec 10, 2025
Merged

[V4] Update DynamoDB tests to use async operations #4203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c0d13a3
refactor: Update csproj to ignore CS0618
dscpinheiro Dec 3, 2025
dfacda3
refactor: Remove test that does not run
dscpinheiro Dec 3, 2025
669fb53
refactor: Update cache tests
dscpinheiro Dec 3, 2025
9c24842
refactor: Update TTL tests
dscpinheiro Dec 3, 2025
b9cb293
refactor: Update service tests
dscpinheiro Dec 3, 2025
3b300d8
refactor: Update JSON tests
dscpinheiro Dec 4, 2025
5367245
refactor: Update document tests
dscpinheiro Dec 4, 2025
423df31
refactor: Update base tests class
dscpinheiro Dec 4, 2025
76ae02b
refactor: Update data model tests
dscpinheiro Dec 5, 2025
4f47cf2
refactor: Re-introduce test for regression
dscpinheiro Dec 5, 2025
8f56d57
fix: Update ListTables to async as well
dscpinheiro Dec 8, 2025
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
2 changes: 1 addition & 1 deletion ...rvices/DynamoDBv2/IntegrationTests/AWSSDK.IntegrationTests.DynamoDBv2.NetFramework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<NoWarn>CS1591</NoWarn>
<NoWarn>CS1591;CS0618</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
54 changes: 0 additions & 54 deletions sdk/test/Services/DynamoDBv2/IntegrationTests/CSMTest.cs
View file
Open in desktop
Copy link
Contributor Author

@dscpinheiro dscpinheiro Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This class is not marked with the TestClass attribute so the test never runs... I deleted it since it wasn't doing anything special, we have a separate project for CSM tests: https://github.com/aws/aws-sdk-net/tree/main/sdk/test/CSMTest

This file was deleted.

95 changes: 40 additions & 55 deletions sdk/test/Services/DynamoDBv2/IntegrationTests/Cache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,61 @@
using System;
using System.Linq;
using System.Threading;
using Microsoft.VisualStudio.TestTools.UnitTesting;

using Amazon;
using Amazon.Runtime;
using Amazon.Runtime.Internal.Util;
using Amazon.DynamoDBv2.Model;
using Amazon;
using Amazon.DynamoDBv2;
using System.Collections.Generic;
using Amazon.DynamoDBv2.DocumentModel;
using Amazon.DynamoDBv2.Model;
using Amazon.Runtime.Internal.Util;
using AWSSDK_DotNet.IntegrationTests.Utils;
using System.Text;
using System.IO;
using AWSSDK_DotNet.IntegrationTests.Tests.DynamoDB;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;

namespace AWSSDK_DotNet.IntegrationTests.Tests
namespace AWSSDK_DotNet.IntegrationTests.Tests.DynamoDB
{
[TestClass]
public class CacheTests
{
private const string TABLENAME = "cache-test-table";
private string testTableName = null;
private static AmazonDynamoDBClient client = AWSSDK_DotNet.IntegrationTests.Tests.DynamoDB.DynamoDBTests.Client;
private static AmazonDynamoDBClient client = DynamoDBTests.Client;
private static bool lastUseSdkCacheValue;

[TestInitialize]
public void Init()
public async Task Init()
{
lastUseSdkCacheValue = AWSConfigs.UseSdkCache;
AWSConfigs.UseSdkCache = true;
SdkCache.Clear();

testTableName = UtilityMethods.GenerateName("CacheTest");
CreateTable(testTableName, true);
await CreateTable(testTableName, true);
}

[TestCleanup]
public void Cleanup()
public async Task Cleanup()
{
var tableExists = true;

//var status = AWSSDK_DotNet.IntegrationTests.Tests.DynamoDB.DynamoDBTests.GetStatus(tableName);
//tableExists = (status != null);

var allTables = AWSSDK_DotNet.IntegrationTests.Tests.DynamoDB.DynamoDBTests.Client.ListTables().TableNames;
tableExists = allTables.Contains(TABLENAME);

if (tableExists)
DeleteTable(TABLENAME);
var allTables = (await DynamoDBTests.Client.ListTablesAsync()).TableNames;

if (allTables.Contains(TABLENAME))
{
await DeleteTable(TABLENAME);
}

if (allTables.Contains(testTableName))
DeleteTable(testTableName);
{
await DeleteTable(testTableName);
}

AWSConfigs.UseSdkCache = lastUseSdkCacheValue;
SdkCache.Clear();
}


#if NETFRAMEWORK
[TestMethod]
[TestCategory("DynamoDBv2")]
public void TestCache()
{
Func<string, TableDescription> creator = tn => client.DescribeTable(tn).Table;
TableDescription creator(string tn) => client.DescribeTable(tn).Table;

var tableName = testTableName;
var tableCache = SdkCache.GetCache<string, TableDescription>(client, DynamoDBTests.TableCacheIdentifier, StringComparer.Ordinal);
Expand Down Expand Up @@ -92,6 +85,7 @@ public void TestCache()
Assert.AreEqual(1, tableCache.ItemCount);
}
}
#endif

[TestMethod]
[TestCategory("DynamoDBv2")]
Expand All @@ -103,20 +97,16 @@ public void MultipleClientsTest()
ITable table;
using (var nc = new AmazonDynamoDBClient())
{
#pragma warning disable CS0618 // Disable the warning for the deprecated DynamoDBContext constructors
table = Table.LoadTable(nc, tableName);
#pragma warning restore CS0618 // Re-enable the warning
}

Table.ClearTableCache();
#pragma warning disable CS0618 // Disable the warning for the deprecated DynamoDBContext constructors
table = Table.LoadTable(client, tableName);
#pragma warning restore CS0618 // Re-enable the warning
}

[TestMethod]
[TestCategory("DynamoDBv2")]
public void ChangingTableTest()
public async Task ChangingTableTest()
{
var item = new Document(new Dictionary<string, DynamoDBEntry>
{
Expand All @@ -126,56 +116,50 @@ public void ChangingTableTest()
});
var tableCache = SdkCache.GetCache<string, TableDescription>(client, DynamoDBTests.TableCacheIdentifier, StringComparer.Ordinal);

CreateTable(TABLENAME, defaultKeys: true);
#pragma warning disable CS0618 // Disable the warning for the deprecated DynamoDBContext constructors
await CreateTable(TABLENAME, defaultKeys: true);
var table = Table.LoadTable(client, TABLENAME);
#pragma warning restore CS0618 // Re-enable the warning
table.PutItem(item);
await table.PutItemAsync(item);

using (var counter = new ServiceResponseCounter(client))
{
var doc = table.GetItem(42, "Floyd");
var doc = await table.GetItemAsync(42, "Floyd");
Assert.IsNotNull(doc);
Assert.AreNotEqual(0, doc.Count);
Assert.AreEqual(1, counter.ResponseCount);
AssertExtensions.ExpectException(() => table.GetItem("Floyd", 42));

var oldTableDescription = tableCache.GetValue(TABLENAME, null);

DeleteTable(TABLENAME);
CreateTable(TABLENAME, defaultKeys: false);
await DeleteTable(TABLENAME);
await CreateTable(TABLENAME, defaultKeys: false);

table.PutItem(item);
await table.PutItemAsync(item);
AssertExtensions.ExpectException(() => table.GetItem(42, "Yes"));

counter.Reset();
Table.ClearTableCache();
#pragma warning disable CS0618 // Disable the warning for the deprecated DynamoDBContext constructors
table = Table.LoadTable(client, TABLENAME);
#pragma warning restore CS0618 // Re-enable the warning
doc = table.GetItem(42, "Yes");
doc = await table.GetItemAsync(42, "Yes");
Assert.IsNotNull(doc);
Assert.AreNotEqual(0, doc.Count);
Assert.AreEqual(2, counter.ResponseCount);

counter.Reset();
Table.ClearTableCache();
PutItem(tableCache, TABLENAME, oldTableDescription);
#pragma warning disable CS0618 // Disable the warning for the deprecated DynamoDBContext constructors
table = Table.LoadTable(client, TABLENAME);
doc = tableCache.UseCache(TABLENAME,
() => table.GetItem(42, "Yes"),
() => table = Table.LoadTable(client, TABLENAME),
shouldRetryForException: null);
#pragma warning restore CS0618 // Re-enable the warning

Assert.IsNotNull(doc);
Assert.AreNotEqual(0, doc.Count);
Assert.AreEqual(2, counter.ResponseCount);
}
}

private void CreateTable(string name, bool defaultKeys)
private async Task CreateTable(string name, bool defaultKeys)
{
var keySchema = new List<KeySchemaElement>
{
Expand Down Expand Up @@ -205,20 +189,21 @@ private void CreateTable(string name, bool defaultKeys)
}
};

client.CreateTable(new CreateTableRequest
await client.CreateTableAsync(new CreateTableRequest
{
TableName = name,
KeySchema = keySchema,
AttributeDefinitions = attributes,
BillingMode = BillingMode.PAY_PER_REQUEST
});

AWSSDK_DotNet.IntegrationTests.Tests.DynamoDB.DynamoDBTests.WaitForTableStatus(name, TableStatus.ACTIVE);
await DynamoDBTests.WaitForTableStatus(name, TableStatus.ACTIVE);
}
private void DeleteTable(string name)

private async Task DeleteTable(string name)
{
client.DeleteTable(name);
AWSSDK_DotNet.IntegrationTests.Tests.DynamoDB.DynamoDBTests.WaitForTableStatus(name, null);
await client.DeleteTableAsync(name);
await DynamoDBTests.WaitForTableStatus(name, null);
}

private void PutItem<TKey,TValue>(ICache<TKey,TValue> cache, TKey key, TValue value)
Expand Down
Loading