Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mtokar3v
mtokar3v committed Mar 18, 2023
2 parents 5ef947d + 113b326 commit 95cc45a
Show file tree
Hide file tree
Showing 92 changed files with 2,524 additions and 533 deletions.
6 changes: 2 additions & 4 deletions ReversoAPI.Web.Examples/Program.cs
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
using ReversoAPI.Web.Shared.Domain.ValueObjects;

namespace ReversoAPI.Web.Examples
namespace ReversoAPI.Web.Examples
{
internal class Program
{
private static readonly IReversoClient _reversoClient = new ReversoClient();

static async Task Main(string[] args)
static async Task Main()
{
var text = "run";
var source = Language.English;
Expand Down
3 changes: 0 additions & 3 deletions ReversoAPI.Web.Tests/Clients/SpellingClientTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@
using System.Threading;
using System.Threading.Tasks;
using System.Collections.Generic;
using ReversoAPI.Web.GrammarCheckFeature.Domain.Entities;
using ReversoAPI.Web.GrammarCheckFeature.Domain.ValueObjects;
using ReversoAPI.Web.GrammarCheckFeature.Application.DTOs;
using ReversoAPI.Web.GrammarCheckFeature.Application.Interfaces.Services;
using ReversoAPI.Web.GrammarCheckFeature.Application.Services;
using ReversoAPI.Web.Shared.Domain.ValueObjects;
using ReversoAPI.Web.Shared.Infrastructure.Http;
using ReversoAPI.Web.Shared.Infrastructure.Http.Interfaces;

Expand Down
3 changes: 0 additions & 3 deletions ReversoAPI.Web.Tests/Clients/TranslationClientTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
using ReversoAPI.Web.TranslationFeature.Application.DTOs;
using ReversoAPI.Web.TranslationFeature.Application.Interfaces.Services;
using ReversoAPI.Web.TranslationFeature.Application.Services;
using ReversoAPI.Web.TranslationFeature.Domain.Entities;
using ReversoAPI.Web.TranslationFeature.Domain.ValueObjects;
using ReversoAPI.Web.Shared.Domain.ValueObjects;
using ReversoAPI.Web.Shared.Infrastructure.Http;
using ReversoAPI.Web.Shared.Infrastructure.Http.Interfaces;

Expand Down
14 changes: 13 additions & 1 deletion ReversoAPI.Web.Tests/Extensions/ParseExtesionsTests.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Xunit;
using ReversoAPI.Web.Shared.Domain.ValueObjects;
using ReversoAPI.Web.Shared.Domain.Extensions;

namespace ReversoAPI.Web.Tests.Extensions
Expand Down Expand Up @@ -84,5 +83,18 @@ public void RemoveHtmlTags_Test(string textWithHtml, string textWithoutHtml)
// Assert
Assert.Equal(textWithoutHtml, result);
}

[Theory]

[InlineData("בָּרַחְתְּ/בָּרַחַתְּ", "בָּרַחְתְּ")]
[InlineData("בָּרַחַתְּ", "בָּרַחַתְּ")]
public void RemoveAlternativeWord_Test(string textWithAlternative, string textWithoutAlternative)
{
// Act
var result = textWithAlternative.RemoveAlternativeWord();

// Assert
Assert.Equal(textWithoutAlternative, result);
}
}
}
152 changes: 141 additions & 11 deletions ReversoAPI.Web.Tests/Parsers/ConjugationResponseParserTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
using System.IO;
using System.Text;
using System.Collections.Generic;
using ReversoAPI.Web.ConjugationFeature.Domain.Core.Entities;
using ReversoAPI.Web.ConjugationFeature.Domain.Core.Interfaces.ValueObjects;
using ReversoAPI.Web.ConjugationFeature.Domain.Core.Services;
using ReversoAPI.Web.ConjugationFeature.Domain.Core.ValueObjects;
using ReversoAPI.Web.Shared.Domain.ValueObjects;

namespace ReversoAPI.Web.Tests.Parsers
{
Expand All @@ -18,7 +14,7 @@ public class ConjugationResponseParserTest
public void Invoke_Test(ConjugationData expectedResult, Stream html)
{
// Arrange
var parser = new ConjugationParser();
var parser = new ConjugationParserService();

// Act
var result = parser.Invoke(html);
Expand All @@ -38,9 +34,9 @@ public static IEnumerable<object[]> HtmlResponsesForTest()
{
Text = "run",
Language = Language.English,
Conjugations = new Dictionary<string, IEnumerable<IConjugation>>
Conjugations = new Dictionary<string, IEnumerable<Conjugation>>
{
{ "Indicative Present", new[]
{ "Indicative Present", new[]
{
new Conjugation("Indicative Present", "run", Language.English),
new Conjugation("Indicative Present", "runs", Language.English),
Expand Down Expand Up @@ -78,7 +74,7 @@ public static IEnumerable<object[]> HtmlResponsesForTest()
{
Text = "бежать",
Language = Language.Russian,
Conjugations = new Dictionary<string, IEnumerable<IConjugation>>
Conjugations = new Dictionary<string, IEnumerable<Conjugation>>
{
{ "настоящее", new[]
{
Expand Down Expand Up @@ -138,12 +134,12 @@ public static IEnumerable<object[]> HtmlResponsesForTest()
};

yield return new object[]
{
{
new ConjugationData
{
Text = "cair",
Language = Language.Portuguese,
Conjugations = new Dictionary<string, IEnumerable<IConjugation>>
Conjugations = new Dictionary<string, IEnumerable<Conjugation>>
{
{ "Indicativo Presente", new[]
{
Expand Down Expand Up @@ -298,7 +294,141 @@ public static IEnumerable<object[]> HtmlResponsesForTest()
}
},
new MemoryStream(Encoding.UTF8.GetBytes(Resource.Conjugation_Parse_Test_Portuguese)),
};
};

yield return new object[]
{
new ConjugationData
{
Text = "逃げる",
Language = Language.Japanese,
Conjugations = new Dictionary<string, IEnumerable<Conjugation>>
{
{ "Present Positive Informal", new[]
{
new Conjugation("Present Positive Informal", "逃げる", Language.Japanese),
new Conjugation("Present Positive Informal", "逃げます", Language.Japanese),
new Conjugation("Present Positive Informal", "逃げない", Language.Japanese),
new Conjugation("Present Positive Informal", "逃げません", Language.Japanese),
}},
{ "Past Positive Informal", new[]
{
new Conjugation("Past Positive Informal", "逃げた", Language.Japanese),
new Conjugation("Past Positive Informal", "逃げました", Language.Japanese),
new Conjugation("Past Positive Informal", "逃げなかった", Language.Japanese),
new Conjugation("Past Positive Informal", "逃げませんでした", Language.Japanese),
}},
{ "Te Form Positive Informal", new[]
{
new Conjugation("Te Form Positive Informal", "逃げて", Language.Japanese),
new Conjugation("Te Form Positive Informal", "逃げなくて", Language.Japanese),
}},
{ "Volitional Positive Informal", new[]
{
new Conjugation("Volitional Positive Informal", "逃げよう", Language.Japanese),
new Conjugation("Volitional Positive Informal", "逃げましょう", Language.Japanese),
}},
{ "Potential Positive Informal", new[]
{
new Conjugation("Potential Positive Informal", "逃げられる", Language.Japanese),
new Conjugation("Potential Positive Informal", "逃げられます", Language.Japanese),
new Conjugation("Potential Positive Informal", "逃げられない", Language.Japanese),
new Conjugation("Potential Positive Informal", "逃げられません", Language.Japanese),
}},
{ "Passive Positive Informal", new[]
{
new Conjugation("Passive Positive Informal", "逃げられる", Language.Japanese),
new Conjugation("Passive Positive Informal", "逃げられます", Language.Japanese),
new Conjugation("Passive Positive Informal", "逃げられない", Language.Japanese),
new Conjugation("Passive Positive Informal", "逃げられません", Language.Japanese),
}},
{ "Causative Positive Informal", new[]
{
new Conjugation("Causative Positive Informal", "逃げさせる", Language.Japanese),
new Conjugation("Causative Positive Informal", "逃げさせます", Language.Japanese),
new Conjugation("Causative Positive Informal", "逃げさせない", Language.Japanese),
new Conjugation("Causative Positive Informal", "逃げさせません", Language.Japanese),
}},
{ "Imperative Positive Informal", new[]
{
new Conjugation("Imperative Positive Informal", "逃げよ/逃げろ", Language.Japanese),
new Conjugation("Imperative Positive Informal", "逃げてください", Language.Japanese),
new Conjugation("Imperative Positive Informal", "逃げるな", Language.Japanese),
new Conjugation("Imperative Positive Informal", "逃げないでください", Language.Japanese),
}},
{ "Conditional Positive Informal", new[]
{
new Conjugation("Conditional Positive Informal", "逃げれば", Language.Japanese),
new Conjugation("Conditional Positive Informal", "逃げなければ", Language.Japanese),
}},
{ "Conditional (-tara) Positive Informal", new[]
{
new Conjugation("Conditional (-tara) Positive Informal", "逃げたら", Language.Japanese),
new Conjugation("Conditional (-tara) Positive Informal", "逃げなかったら", Language.Japanese),
}},
}
},
new MemoryStream(Encoding.UTF8.GetBytes(Resource.Conjugation_Parse_Test_Japanese)),
};

yield return new object[]
{
new ConjugationData
{
Text = "לברוח",
Language = Language.Hebrew,
Conjugations = new Dictionary<string, IEnumerable<Conjugation>>
{
{ "Present", new[]
{
new Conjugation("Present", "בּוֹרַחַת", Language.Hebrew),
new Conjugation("Present", "בּוֹרְחוֹת", Language.Hebrew),
new Conjugation("Present", "בּוֹרֵחַ", Language.Hebrew),
new Conjugation("Present", "בּוֹרְחִים", Language.Hebrew),
}},
{ "Past", new[]
{
new Conjugation("Past", "בָּרַחְתִּי", Language.Hebrew),
new Conjugation("Past", "בָּרַחְתְּ", Language.Hebrew),
new Conjugation("Past", "בָּרְחָה", Language.Hebrew),
new Conjugation("Past", "בָּרַחְתָּ", Language.Hebrew),
new Conjugation("Past", "בָּרַח", Language.Hebrew),
new Conjugation("Past", "בָּרַחְנוּ", Language.Hebrew),
new Conjugation("Past", "בְּרַחְתֶּן", Language.Hebrew),
new Conjugation("Past", "בָּרְחוּ", Language.Hebrew),
new Conjugation("Past", "בְּרַחְתֶּם", Language.Hebrew),
}},
{ "Future", new[]
{
new Conjugation("Future", "אֶבְרַח", Language.Hebrew),
new Conjugation("Future", "תִּבְרְחִי", Language.Hebrew),
new Conjugation("Future", "תִּבְרַח", Language.Hebrew),
new Conjugation("Future", "יִבְרַח", Language.Hebrew),
new Conjugation("Future", "נִבְרַח", Language.Hebrew),
new Conjugation("Future", "תִּבְרְחוּ", Language.Hebrew),
new Conjugation("Future", "יִבְרְחוּ", Language.Hebrew),
}},
{ "Imperative", new[]
{
new Conjugation("Imperative", "בִּרְחִי", Language.Hebrew),
new Conjugation("Imperative", "בִּרְחוּ", Language.Hebrew),
new Conjugation("Imperative", "בְּרַח", Language.Hebrew),
}},
{ "Passive Participle", new[]
{
new Conjugation("Passive Participle", "בְּרוּחָה", Language.Hebrew),
new Conjugation("Passive Participle", "בְּרוּחוֹת", Language.Hebrew),
new Conjugation("Passive Participle", "בָּרוּחַ", Language.Hebrew),
new Conjugation("Passive Participle", "בְּרוּחִים", Language.Hebrew),
}},
{ "Infinitive", new[]
{
new Conjugation("Infinitive", "לִבְרוֹחַ", Language.Hebrew),
}}
}
},
new MemoryStream(Encoding.UTF8.GetBytes(Resource.Conjugation_Parse_Test_Hebrew)),
};
}

#endregion
Expand Down
5 changes: 1 addition & 4 deletions ReversoAPI.Web.Tests/Parsers/ContextResponseParserTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
using System.IO;
using System.Text;
using System.Collections.Generic;
using ReversoAPI.Web.ContextFeature.Domain.Core.Enities;
using ReversoAPI.Web.ContextFeature.Domain.Core.Services;
using ReversoAPI.Web.ContextFeature.Domain.Core.ValueObjects;
using ReversoAPI.Web.Shared.Domain.ValueObjects;

namespace ReversoAPI.Web.Tests.Parsers
{
Expand All @@ -17,7 +14,7 @@ public class ContextResponseParserTest
public void Invoke_Test(ContextData expectedResult, Stream html)
{
// Arrange
var parser = new ContextParser();
var parser = new ContextParserService();

// Act
var result = parser.Invoke(html);
Expand Down
5 changes: 1 addition & 4 deletions ReversoAPI.Web.Tests/Parsers/SynonymsResponseParserTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
using System.IO;
using System.Text;
using System.Collections.Generic;
using ReversoAPI.Web.SynonymsFeature.Domain.Core.Entities;
using ReversoAPI.Web.SynonymsFeature.Domain.Core.Services;
using ReversoAPI.Web.SynonymsFeature.Domain.Core.ValueObjects;
using ReversoAPI.Web.Shared.Domain.ValueObjects;

namespace ReversoAPI.Web.Tests.Parsers
{
Expand All @@ -17,7 +14,7 @@ public class SynonymsResponseParserTest
public void Invoke_Test(SynonymsData expectedResult, Stream html)
{
// Arrange
var parser = new SynonymsParser();
var parser = new SynonymsParserService();

// Act
var result = parser.Invoke(html);
Expand Down
34 changes: 34 additions & 0 deletions ReversoAPI.Web.Tests/Resource.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 95cc45a

Please sign in to comment.