Skip to content

Code+tests to handle invalid timestamps from the Alexa test console #3

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

Open
andyhopp wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Code+tests to handle invalid timestamps from the Alexa test console #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 36 additions & 1 deletion Shared/Models/Requests/RequestTypes/RequestBundle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,34 @@ public class RequestBundle : IIntentRequest, ILaunchRequest, ISessionEndedReques
/// ISO 8601 formatted string (for example, 2015-05-13T12:34:56Z).
/// </summary>
[JsonProperty("timestamp")]
public DateTime Timestamp { get; set; }
private string TimeStampString { get; set; }

[JsonIgnore]
public DateTime Timestamp {
get
{
DateTime output;
var dateString = TimeStampString;
long temp;
if (long.TryParse(dateString, out temp))
{
output = new DateTime(1970, 1, 1).AddMilliseconds(temp);
}
else
{
try
{
output = (DateTime)Newtonsoft.Json.JsonConvert.DeserializeObject(dateString, typeof(DateTime));
}
catch (Exception e)
{
output = DateTime.MinValue;
}
}
return output;
}
set { TimeStampString = JsonConvert.SerializeObject(value); }
}

/// <summary>
/// An object that represents what the user wants.
Expand Down Expand Up @@ -59,5 +86,13 @@ public Type GetRequestType()
throw new ArgumentOutOfRangeException(nameof(Type), $"Unknown request type: {Type}.");
}
}

[Newtonsoft.Json.Serialization.OnError]
internal void OnError(
System.Runtime.Serialization.StreamingContext context,
Newtonsoft.Json.Serialization.ErrorContext errorContext)
{
errorContext.Handled = true;
}
}
}
50 changes: 50 additions & 0 deletions Slight.Alexa.Framework.Core.Tests/Slight.Alexa.Framework.Core.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Slight.Alexa.Framework.Core\Slight.Alexa.Framework.Core.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Remove="UnitTest1.cs" />
</ItemGroup>
<ItemGroup>
<None Update="ModelTests\Examples\GetUtterance.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="ModelTests\Examples\IntentRequest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="ModelTests\Examples\LaunchRequest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="ModelTests\Examples\NewVersionRequest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="ModelTests\Examples\Response.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="ModelTests\Examples\SessionEndedRequest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="ModelTests\Examples\IntentRequestWithInvalidTimestamp.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<Compile Include="..\Slight.Alexa.Framework.Tests\ModelTests\RequestTests.cs">
<Link>ModelTests\RequestTests.cs</Link>
</Compile>
<Compile Include="..\Slight.Alexa.Framework.Tests\ModelTests\ResponseTests.cs">
<Link>ModelTests\ResponseTests.cs</Link>
</Compile>
</ItemGroup>
</Project>
30 changes: 30 additions & 0 deletions Slight.Alexa.Framework.Core/Slight.Alexa.Framework.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>A set of managed C# models and helpers to integrate Amazon's Alexa skill services into your .NET Core stack.</Description>
<AssemblyTitle>Slight.Alexa.Core</AssemblyTitle>
<VersionPrefix>1.0.10-beta</VersionPrefix>
<Authors>Silvenga</Authors>
<TargetFramework>netstandard1.6</TargetFramework>
<AssemblyName>Slight.Alexa.Core</AssemblyName>
<PackageId>Slight.Alexa.Framework.Core</PackageId>
<PackageTags>amazon;alexa;echo</PackageTags>
<PackageProjectUrl>https://github.com/Silvenga/Slight.Alexa</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/Silvenga/Slight.Alexa/blob/master/LICENSE</PackageLicenseUrl>
<RepositoryUrl>https://github.com/Silvenga/Slight.Alexa</RepositoryUrl>
<NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
</PropertyGroup>

<ItemGroup>
<Compile Include="..\Shared\**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
</ItemGroup>

</Project>
34 changes: 34 additions & 0 deletions Slight.Alexa.Framework.Tests/ModelTests/Examples/IntentRequestWithInvalidTimestamp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"version": "1.0",
"session": {
"new": false,
"sessionId": "amzn1.echo-api.session.0000000-0000-0000-0000-00000000000",
"application": {
"applicationId": "amzn1.echo-sdk-ams.app.000000-d0ed-0000-ad00-000000d00ebe"
},
"attributes": {
"supportedHoroscopePeriods": {
"daily": true,
"weekly": false,
"monthly": false
}
},
"user": {
"userId": "amzn1.account.AM3B00000000000000000000000"
}
},
"request": {
"type": "IntentRequest",
"requestId": " amzn1.echo-api.request.0000000-0000-0000-0000-00000000000",
"timestamp": "1499894026307",
"intent": {
"name": "GetZodiacHoroscopeIntent",
"slots": {
"ZodiacSign": {
"name": "ZodiacSign",
"value": "virgo"
}
}
}
}
}
18 changes: 17 additions & 1 deletion Slight.Alexa.Framework.Tests/ModelTests/RequestTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,23 @@ namespace Slight.Alexa.Framework.Tests.ModelTests
{
public class RequestTests
{
private const string ExamplesPath = @"ModelTests\Examples\";
private readonly string ExamplesPath = @"ModelTests" + System.IO.Path.DirectorySeparatorChar + "Examples";

// The Alexa test console (as of 2017-07-13) sends the request timestamp in an invalid format:
// instead of an ISO 8601 date, it sends the milliseconds since 1970-1-1 (such as what's used
// for the Date object's ctor.
[Fact]
public void Can_handle_Test_Console_Invalid_Date()
{
const string example = "IntentRequestWithInvalidTimestamp.json";
var json = File.ReadAllText(Path.Combine(ExamplesPath, example));
var convertedObj = JsonConvert.DeserializeObject<SkillRequest>(json);

Assert.NotNull(convertedObj);
Assert.Equal(typeof(IIntentRequest), convertedObj.Request.GetRequestType());
Assert.Equal(typeof(IIntentRequest), convertedObj.GetRequestType());
Assert.NotEqual(System.DateTime.MinValue, convertedObj.Request.Timestamp);
}

[Fact]
public void Can_read_IntentRequest_example()
Expand Down
3 changes: 2 additions & 1 deletion Slight.Alexa.Framework.Tests/ModelTests/ResponseTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Slight.Alexa.Framework.Tests.ModelTests
{
public class ResponseTests
{
private const string ExamplesPath = @"ModelTests\Examples\";
private readonly string ExamplesPath = @"ModelTests" + System.IO.Path.DirectorySeparatorChar + "Examples";

[Fact]
public void Should_create_same_json_response_as_example()
Expand Down Expand Up @@ -55,6 +55,7 @@ public void Should_create_same_json_response_as_example()
});

const string example = "Response.json";

var workingJson = File.ReadAllText(Path.Combine(ExamplesPath, example));

workingJson = Regex.Replace(workingJson, @"\s", "");
Expand Down
18 changes: 12 additions & 6 deletions Slight.Alexa.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,17 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Slight.Alexa.Framework", "S
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Slight.Alexa.Framework.Tests", "Slight.Alexa.Framework.Tests\Slight.Alexa.Framework.Tests.csproj", "{77836C05-6D66-4D93-BE54-55867F60CBC9}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Slight.Alexa.Framework.Core", "Slight.Alexa.Framework.Core\Slight.Alexa.Framework.Core.xproj", "{833E0D67-4325-4901-91CC-8588C2D28B26}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4BC0E6D4-3CA0-4CEB-9E3B-5B665177F6BE}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
EndProjectSection
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Shared", "Shared\Shared.shproj", "{BEDCF7DE-8146-4187-AFEC-8B93EF15B6D6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Slight.Alexa.Framework.Core", "Slight.Alexa.Framework.Core\Slight.Alexa.Framework.Core.csproj", "{BDB7F2ED-E783-4F84-A975-1A2AA4202348}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Slight.Alexa.Framework.Core.Tests", "Slight.Alexa.Framework.Core.Tests\Slight.Alexa.Framework.Core.Tests.csproj", "{5E08693F-5986-4FB5-81FC-45DD17F0FF1C}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
Shared\Shared.projitems*{bedcf7de-8146-4187-afec-8b93ef15b6d6}*SharedItemsImports = 13
Expand All @@ -34,10 +36,14 @@ Global
{77836C05-6D66-4D93-BE54-55867F60CBC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{77836C05-6D66-4D93-BE54-55867F60CBC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{77836C05-6D66-4D93-BE54-55867F60CBC9}.Release|Any CPU.Build.0 = Release|Any CPU
{833E0D67-4325-4901-91CC-8588C2D28B26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{833E0D67-4325-4901-91CC-8588C2D28B26}.Debug|Any CPU.Build.0 = Debug|Any CPU
{833E0D67-4325-4901-91CC-8588C2D28B26}.Release|Any CPU.ActiveCfg = Release|Any CPU
{833E0D67-4325-4901-91CC-8588C2D28B26}.Release|Any CPU.Build.0 = Release|Any CPU
{BDB7F2ED-E783-4F84-A975-1A2AA4202348}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BDB7F2ED-E783-4F84-A975-1A2AA4202348}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BDB7F2ED-E783-4F84-A975-1A2AA4202348}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BDB7F2ED-E783-4F84-A975-1A2AA4202348}.Release|Any CPU.Build.0 = Release|Any CPU
{5E08693F-5986-4FB5-81FC-45DD17F0FF1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5E08693F-5986-4FB5-81FC-45DD17F0FF1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5E08693F-5986-4FB5-81FC-45DD17F0FF1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5E08693F-5986-4FB5-81FC-45DD17F0FF1C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down