Skip to content

Commit

Permalink
Merge branch 'master' into factory-create-with-guid
Browse files Browse the repository at this point in the history
  • Loading branch information
JakeOliver28 authored Oct 23, 2024
2 parents fc2d984 + 93d7e90 commit 0808a6a
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 17 deletions.
2 changes: 1 addition & 1 deletion tests/SIL.LCModel.Tests/DomainImpl/ScrImportSetTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Collections;
using System.Collections.Generic;
using NUnit.Framework;
using Rhino.Mocks;
using SIL.LCModel.Tests.Rhino.Mocks;
using SIL.LCModel.Core.Scripture;
using SIL.LCModel.DomainServices;
using SIL.LCModel.Utils;
Expand Down
2 changes: 1 addition & 1 deletion tests/SIL.LCModel.Tests/DomainImpl/ScrMappingListTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System;
using System.IO;
using NUnit.Framework;
using Rhino.Mocks;
using SIL.LCModel.Tests.Rhino.Mocks;
using SIL.LCModel.Core.KernelInterfaces;
using SIL.LCModel.Core.Scripture;
using SIL.LCModel.DomainServices;
Expand Down
2 changes: 1 addition & 1 deletion tests/SIL.LCModel.Tests/DomainImpl/VectorTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using System;
using System.Linq;
using NUnit.Framework;
using Rhino.Mocks;
using SIL.LCModel.Tests.Rhino.Mocks;
using SIL.LCModel.Core.Scripture;
using SIL.LCModel.Core.Text;
using SIL.LCModel.Infrastructure;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Moq;
using NUnit.Framework;
using Rhino.Mocks;
using SIL.LCModel.Tests.Rhino.Mocks;
using SIL.LCModel.Core.KernelInterfaces;
using SIL.LCModel.Core.Scripture;
using SIL.LCModel.Core.Text;
using SIL.LCModel.DomainImpl;
using SIL.LCModel.Utils;
using MockRepository = Rhino.Mocks.MockRepository;

namespace SIL.LCModel.DomainServices
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

using System.Collections.Generic;
using NUnit.Framework;
using Rhino.Mocks;
using SIL.LCModel.Tests.Rhino.Mocks;
using SIL.LCModel.Core.Scripture;
using SIL.LCModel.DomainImpl;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using System.Collections.Generic;
using System.Linq;
using NUnit.Framework;
using Rhino.Mocks;
using SIL.LCModel.Tests.Rhino.Mocks;
using SIL.LCModel.Application;
using SIL.LCModel.Core.Cellar;
using SIL.LCModel.Core.KernelInterfaces;
Expand Down
4 changes: 2 additions & 2 deletions tests/SIL.LCModel.Tests/RhinoMocksToMoq/Expect.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System;
using System;
using System.Linq.Expressions;
using Moq;

namespace Rhino.Mocks
namespace SIL.LCModel.Tests.Rhino.Mocks
{
public interface IExpect<T> where T : class
{
Expand Down
4 changes: 2 additions & 2 deletions tests/SIL.LCModel.Tests/RhinoMocksToMoq/MockExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System;
using System;
using System.Linq.Expressions;
using Moq;

namespace Rhino.Mocks
namespace SIL.LCModel.Tests.Rhino.Mocks
{
public static class MockExtensions
{
Expand Down
4 changes: 2 additions & 2 deletions tests/SIL.LCModel.Tests/RhinoMocksToMoq/MockRepository.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Moq;
using Moq;

namespace Rhino.Mocks
namespace SIL.LCModel.Tests.Rhino.Mocks
{
public static class MockRepository
{
Expand Down
2 changes: 1 addition & 1 deletion tests/SIL.LCModel.Tests/RhinoMocksToMoq/MoqAdapter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Linq.Expressions;
using Moq;

namespace Rhino.Mocks
namespace SIL.LCModel.Tests.Rhino.Mocks
{
class MoqAdapter<T, TR> where T : class
{
Expand Down
4 changes: 2 additions & 2 deletions tests/SIL.LCModel.Tests/RhinoMocksToMoq/MoqExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Moq.Language.Flow;

namespace Rhino.Mocks
namespace SIL.LCModel.Tests.Rhino.Mocks
{
public static class MoqExtensions
{
Expand Down

0 comments on commit 0808a6a

Please sign in to comment.