lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Updating obsolete code due to NUnit upgrade

Browse Source
This commit is contained in:
Benedek Farkas
2025-09-19 22:57:28 +02:00
parent ab986ad0a3
commit c3f6beea4c
38 changed files with 149 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Tests.Modules/CodeGeneration/Commands/CodeGenerationCommandsTests.cs
View File

@@ -69,7 +69,7 @@ namespace Orchard.Tests.Modules.CodeGeneration.Commands {
codeGenerationCommands.Context = new CommandContext { Output = textWriterOutput };
codeGenerationCommands.CreateDataMigration("feature");
Assert.That(textWriterOutput.ToString(), Is.StringContaining("Creating data migration failed"));
Assert.That(textWriterOutput.ToString(), Does.Contain("Creating data migration failed"));
}
}
}

4
src/Orchard.Tests.Modules/DatabaseEnabledTestsBase.cs
View File

@@ -28,11 +28,11 @@ namespace Orchard.Tests.Modules {
protected StubClock _clock;
[TestFixtureSetUp]
[OneTimeSetUp]
public void InitFixture() {
}
[TestFixtureTearDown]
[OneTimeTearDown]
public void TearDownFixture() {
File.Delete(_databaseFilePath);
}

2
src/Orchard.Tests.Modules/ImportExport/Services/ImportExportServiceTests.cs
View File

@@ -35,7 +35,7 @@ namespace Orchard.Tests.Modules.ImportExport.Services {
private ISessionFactory _sessionFactory;
private ISession _session;
[TestFixtureSetUp]
[OneTimeSetUp]
public void InitFixture() {
var databaseFileName = System.IO.Path.GetTempFileName();
_sessionFactory = DataUtility.CreateSessionFactory(

2
src/Orchard.Tests.Modules/Indexing/IndexingTaskExecutorTests.cs
View File

@@ -43,7 +43,7 @@ namespace Orchard.Tests.Modules.Indexing {
private const string IndexName = "Search";
private readonly string _basePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
[TestFixtureTearDown]
[OneTimeTearDown]
public void Clean() {
if (Directory.Exists(_basePath)) {
Directory.Delete(_basePath, true);

2
src/Orchard.Tests.Modules/Indexing/LuceneIndexProviderTests.cs
View File

@@ -19,7 +19,7 @@ namespace Orchard.Tests.Modules.Indexing {
private ShellSettings _shellSettings;
private readonly string _basePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
[TestFixtureTearDown]
[OneTimeTearDown]
public void Clean() {
if (Directory.Exists(_basePath)) {
Directory.Delete(_basePath, true);

2
src/Orchard.Tests.Modules/Indexing/LuceneSearchBuilderTests.cs
View File

@@ -18,7 +18,7 @@ namespace Orchard.Tests.Modules.Indexing {
private ShellSettings _shellSettings;
private readonly string _basePath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
[TestFixtureTearDown]
[OneTimeTearDown]
public void Clean() {
if (Directory.Exists(_basePath)) {
Directory.Delete(_basePath, true);

4
src/Orchard.Tests.Modules/Migrations/SchemaCommandGeneratorTests.cs
View File

@@ -47,7 +47,7 @@ namespace Orchard.Tests.Modules.Migrations {
private readonly Path _tempFixtureFolderName = Path.Get(System.IO.Path.GetTempPath()).Combine("Orchard.Tests.Modules.Migrations");
private Path _tempFolderName;
[TestFixtureSetUp]
[OneTimeSetUp]
public void CreateDb() {
var types = new[] {
typeof(BlogRecord),
@@ -111,7 +111,7 @@ Features:
");
}
[TestFixtureTearDown]
[OneTimeTearDown]
public void Term() {
try { _tempFixtureFolderName.Delete(true); }
catch { }

2
src/Orchard.Tests.Modules/Packaging/Services/FileBasedProjectSystemTests.cs
View File

@@ -54,7 +54,7 @@ namespace Orchard.Tests.Modules.Packaging.Services {
Directory.CreateDirectory(_basePath);
}
[TestFixtureTearDown]
[OneTimeTearDown]
public void Clean() {
if (Directory.Exists(_basePath)) {
Directory.Delete(_basePath, true);

2
src/Orchard.Tests.Modules/Packaging/Services/FolderUpdaterTests.cs
View File

@@ -28,7 +28,7 @@ namespace Orchard.Tests.Modules.Packaging.Services {
_container = builder.Build();
}
[TestFixtureTearDown]
[OneTimeTearDown]
public void Clean() {
if (Directory.Exists(_basePath)) {
Directory.Delete(_basePath, true);

2
src/Orchard.Tests.Modules/Packaging/Services/PackageInstallerTests.cs
View File

@@ -54,7 +54,7 @@ namespace Orchard.Tests.Modules.Packaging.Services {
Directory.CreateDirectory(_basePath);
}
[TestFixtureTearDown]
[OneTimeTearDown]
public void Clean() {
if (Directory.Exists(_basePath)) {
Directory.Delete(_basePath, true);

6
src/Orchard.Tests.Modules/Themes/Services/ThemeServiceTests.cs
View File

@@ -54,7 +54,7 @@ namespace Orchard.Tests.Modules.Themes.Services {
private ISession _session;
private IFeatureManager _featureManager;
[TestFixtureSetUp]
[OneTimeSetUp]
public void InitFixture() {
var databaseFileName = System.IO.Path.GetTempFileName();
_sessionFactory = DataUtility.CreateSessionFactory(databaseFileName,
@@ -65,7 +65,7 @@ namespace Orchard.Tests.Modules.Themes.Services {
typeof(ContentTypeRecord));
}
[TestFixtureTearDown]
[OneTimeTearDown]
public void TermFixture() { }
[SetUp]
@@ -138,7 +138,7 @@ namespace Orchard.Tests.Modules.Themes.Services {
try {
_siteThemeService.SetSiteTheme("ThemeFourBasedOnFive");
} catch (InvalidOperationException ex) {
Assert.That(ex.Message, Is.StringMatching("ThemeFiveBasedOnFour"));
Assert.That(ex.Message, Does.Match("ThemeFiveBasedOnFour"));
}
var siteTheme = _siteThemeService.GetSiteTheme();
Assert.That(siteTheme.Name, Is.EqualTo("ThemeOne"));

4
src/Orchard.Tests.Modules/Users/Services/MembershipServiceTests.cs
View File

@@ -47,7 +47,7 @@ namespace Orchard.Tests.Modules.Users.Services
private StubClock _clock;
private Mock<WorkContext> _workContext;
[TestFixtureSetUp]
[OneTimeSetUp]
public void InitFixture() {
var databaseFileName = System.IO.Path.GetTempFileName();
_sessionFactory = DataUtility.CreateSessionFactory(
@@ -63,7 +63,7 @@ namespace Orchard.Tests.Modules.Users.Services
typeof(ContentTypePartDefinitionRecord));
}
[TestFixtureTearDown]
[OneTimeTearDown]
public void TermFixture() {
}

4
src/Orchard.Tests.Modules/Users/Services/UserServiceTests.cs
View File

@@ -51,7 +51,7 @@ namespace Orchard.Tests.Modules.Users.Services
private CultureInfo _currentCulture;
private Mock<WorkContext> _workContext;
[TestFixtureSetUp]
[OneTimeSetUp]
public void InitFixture() {
_currentCulture = Thread.CurrentThread.CurrentCulture;
var databaseFileName = System.IO.Path.GetTempFileName();
@@ -68,7 +68,7 @@ namespace Orchard.Tests.Modules.Users.Services
typeof(ContentTypePartDefinitionRecord));
}
[TestFixtureTearDown]
[OneTimeTearDown]
public void TermFixture() {
Thread.CurrentThread.CurrentCulture = _currentCulture;
}

2
src/Orchard.Tests.Modules/Warmup/WarmupUpdaterTests.cs
View File

@@ -37,7 +37,7 @@ namespace Orchard.Tests.Modules.Warmup {
private const string WarmupFolder = "Warmup";
private const string TenantFolder = "Sites/Default";
[TestFixtureTearDown]
[OneTimeTearDown]
public void Clean() {
if (Directory.Exists(_basePath)) {
Directory.Delete(_basePath, true);

6
src/Orchard.Tests.Modules/XmlRpc/Controllers/LiveWriterControllerTests.cs
View File

@@ -27,9 +27,9 @@ namespace Orchard.Tests.Modules.XmlRpc.Controllers {
var controller = container.Resolve<LiveWriterController>();
var result = controller.Manifest() as ContentResult;
Assert.That(result, Is.Not.Null);
Assert.That(result.Content, Is.StringContaining("<supportsGetTags>No</supportsGetTags>"));
Assert.That(result.Content, Is.StringContaining("<keywordsAsTags>Yes</keywordsAsTags>"));
Assert.That(result.Content, Is.StringContaining("<supportsKeywords>Maybe</supportsKeywords>"));
Assert.That(result.Content, Does.Contain("<supportsGetTags>No</supportsGetTags>"));
Assert.That(result.Content, Does.Contain("<keywordsAsTags>Yes</keywordsAsTags>"));
Assert.That(result.Content, Does.Contain("<supportsKeywords>Maybe</supportsKeywords>"));
}