lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Added negative tests for DefaultDateFormatter. Corrected some namespaces.

Browse Source
This commit is contained in:
Daniel Stolt
2014-07-28 17:30:40 +02:00
parent 3afae3d538
commit adf900fb09
9 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Tests/Localization/DateTimePartsTests.cs
View File

@@ -1,6 +1,6 @@
using System;
using NUnit.Framework;
using Orchard.Framework.Localization.Models;
using Orchard.Localization.Models;
namespace Orchard.Framework.Tests.Localization {

30
src/Orchard.Tests/Localization/DefaultDateFormatterTests.cs
View File

@@ -9,8 +9,7 @@ using System.Threading.Tasks;
using Autofac;
using Moq;
using NUnit.Framework;
using Orchard.Framework.Localization.Models;
using Orchard.Framework.Localization.Services;
using Orchard.Localization.Models;
using Orchard.Localization.Services;
namespace Orchard.Framework.Tests.Localization {
@@ -116,6 +115,15 @@ namespace Orchard.Framework.Tests.Localization {
}
}
[Test]
[Description("Date/time parsing throws a FormatException for unparsable date/time strings.")]
[ExpectedException(typeof(FormatException))]
public void ParseDateTimeTest03() {
var container = InitializeContainer("en-US", null);
var target = container.Resolve<IDateFormatter>();
target.ParseDateTime("BlaBlaBla");
}
[Test]
[Description("Date parsing works correctly for all combinations of months, format strings and cultures.")]
public void ParseDateTest01() {
@@ -165,6 +173,15 @@ namespace Orchard.Framework.Tests.Localization {
}
}
[Test]
[Description("Date parsing throws a FormatException for unparsable date strings.")]
[ExpectedException(typeof(FormatException))]
public void ParseDateTest02() {
var container = InitializeContainer("en-US", null);
var target = container.Resolve<IDateFormatter>();
target.ParseDate("BlaBlaBla");
}
[Test]
[Description("Time parsing works correctly for all combinations of hours, format strings and cultures.")]
public void ParseTimeTest01() {
@@ -210,6 +227,15 @@ namespace Orchard.Framework.Tests.Localization {
}
}
[Test]
[Description("Time parsing throws a FormatException for unparsable time strings.")]
[ExpectedException(typeof(FormatException))]
public void ParseTimeTest02() {
var container = InitializeContainer("en-US", null);
var target = container.Resolve<IDateFormatter>();
target.ParseTime("BlaBlaBla");
}
private DateTimeParts GetExpectedDateTimeParts(DateTime dateTime, string format) {
return new DateTimeParts(
GetExpectedDateParts(dateTime, format),

2
src/Orchard/Localization/Models/DateParts.cs
View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
namespace Orchard.Framework.Localization.Models {
namespace Orchard.Localization.Models {
public struct DateParts {
public DateParts(int year, int month, int day) {

2
src/Orchard/Localization/Models/DateTimeParts.cs
View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
namespace Orchard.Framework.Localization.Models {
namespace Orchard.Localization.Models {
public struct DateTimeParts {
public DateTimeParts(int year, int month, int day, int hour, int minute, int second, int millisecond) {

2
src/Orchard/Localization/Models/TimeParts.cs
View File

@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
namespace Orchard.Framework.Localization.Models {
namespace Orchard.Localization.Models {
public struct TimeParts {
public TimeParts(int hour, int minute, int second, int millisecond) {

4
src/Orchard/Localization/Services/DefaultDateFormatter.cs
View File

@@ -3,11 +3,11 @@ using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text.RegularExpressions;
using Orchard.Framework.Localization.Models;
using Orchard.Localization.Models;
using Orchard.Localization.Services;
using Orchard.Utility.Extensions;
namespace Orchard.Framework.Localization.Services {
namespace Orchard.Localization.Services {
public class DefaultDateFormatter : IDateFormatter {

2
src/Orchard/Localization/Services/DefaultDateLocalizationServices.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Globalization;
using Orchard.ContentManagement;
using Orchard.Framework.Localization.Models;
using Orchard.Localization.Models;
using Orchard.Settings;
namespace Orchard.Localization.Services {

4
src/Orchard/Localization/Services/IDateFormatter.cs
View File

@@ -2,9 +2,9 @@
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using Orchard.Framework.Localization.Models;
using Orchard.Localization.Models;
namespace Orchard.Framework.Localization.Services {
namespace Orchard.Localization.Services {
public interface IDateFormatter : IDependency {
DateTimeParts ParseDateTime(string dateTimeString);
DateTimeParts ParseDateTime(string dateTimeString, string format);

2
src/Orchard/Localization/Services/IDateLocalizationServices.cs
View File

@@ -1,5 +1,5 @@
using System;
using Orchard.Framework.Localization.Models;
using Orchard.Localization.Models;
namespace Orchard.Localization.Services {