Skip to content

Commit b10855d

Browse files
author
CIS Guru
committed
Phase 1.C and 1.D - Migrate razor components and test complete.
1 parent 4c398f3 commit b10855d

11 files changed

Lines changed: 55 additions & 141 deletions

File tree

Aquiis.Tests/Core/Validation/GuidValidationAttributeTests.cs renamed to Aquiis.SimpleStart.Tests/Core/Validation/GuidValidationAttributeTests.cs

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
using Aquiis.SimpleStart.Core.Validation;
2+
using System;
23
using System.ComponentModel.DataAnnotations;
3-
using NUnit.Framework;
4+
using Xunit;
45

5-
namespace Aquiis.Tests.Core.Validation;
6+
namespace Aquiis.SimpleStart.Tests.Core.Validation;
67

78
public class RequiredGuidAttributeTests
89
{
9-
[Test]
10+
[Fact]
1011
public void RequiredGuid_GuidEmpty_ReturnsFalse()
1112
{
1213
// Arrange
@@ -17,10 +18,10 @@ public void RequiredGuid_GuidEmpty_ReturnsFalse()
1718
var result = attribute.IsValid(value);
1819

1920
// Assert
20-
Assert.That(result, Is.False);
21+
Assert.False(result);
2122
}
2223

23-
[Test]
24+
[Fact]
2425
public void RequiredGuid_ValidGuid_ReturnsTrue()
2526
{
2627
// Arrange
@@ -31,10 +32,10 @@ public void RequiredGuid_ValidGuid_ReturnsTrue()
3132
var result = attribute.IsValid(value);
3233

3334
// Assert
34-
Assert.That(result, Is.True);
35+
Assert.True(result);
3536
}
3637

37-
[Test]
38+
[Fact]
3839
public void RequiredGuid_Null_ReturnsFalse()
3940
{
4041
// Arrange
@@ -45,10 +46,10 @@ public void RequiredGuid_Null_ReturnsFalse()
4546
var result = attribute.IsValid(value);
4647

4748
// Assert
48-
Assert.That(result, Is.False);
49+
Assert.False(result);
4950
}
5051

51-
[Test]
52+
[Fact]
5253
public void RequiredGuid_WithContext_GuidEmpty_ReturnsValidationError()
5354
{
5455
// Arrange
@@ -60,11 +61,11 @@ public void RequiredGuid_WithContext_GuidEmpty_ReturnsValidationError()
6061
var result = attribute.GetValidationResult(Guid.Empty, context);
6162

6263
// Assert
63-
Assert.That(result, Is.Not.Null);
64-
Assert.That(result, Is.Not.EqualTo(ValidationResult.Success));
64+
Assert.NotNull(result);
65+
Assert.NotEqual(ValidationResult.Success, result);
6566
}
6667

67-
[Test]
68+
[Fact]
6869
public void RequiredGuid_WithContext_ValidGuid_ReturnsSuccess()
6970
{
7071
// Arrange
@@ -76,10 +77,10 @@ public void RequiredGuid_WithContext_ValidGuid_ReturnsSuccess()
7677
var result = attribute.GetValidationResult(model.Id, context);
7778

7879
// Assert
79-
Assert.That(result, Is.EqualTo(ValidationResult.Success));
80+
Assert.Equal(ValidationResult.Success, result);
8081
}
8182

82-
[Test]
83+
[Fact]
8384
public void RequiredGuid_CustomErrorMessage_UsesCustomMessage()
8485
{
8586
// Arrange
@@ -92,8 +93,8 @@ public void RequiredGuid_CustomErrorMessage_UsesCustomMessage()
9293
var result = attribute.GetValidationResult(Guid.Empty, context);
9394

9495
// Assert
95-
Assert.That(result, Is.Not.Null);
96-
Assert.That(result!.ErrorMessage, Is.EqualTo(customMessage));
96+
Assert.NotNull(result);
97+
Assert.Equal(customMessage, result!.ErrorMessage);
9798
}
9899

99100
private class TestModel
@@ -104,7 +105,7 @@ private class TestModel
104105

105106
public class OptionalGuidAttributeTests
106107
{
107-
[Test]
108+
[Fact]
108109
public void OptionalGuid_Null_ReturnsTrue()
109110
{
110111
// Arrange
@@ -115,10 +116,10 @@ public void OptionalGuid_Null_ReturnsTrue()
115116
var result = attribute.IsValid(value);
116117

117118
// Assert
118-
Assert.That(result, Is.True);
119+
Assert.True(result);
119120
}
120121

121-
[Test]
122+
[Fact]
122123
public void OptionalGuid_GuidEmpty_ReturnsFalse()
123124
{
124125
// Arrange
@@ -129,10 +130,10 @@ public void OptionalGuid_GuidEmpty_ReturnsFalse()
129130
var result = attribute.IsValid(value);
130131

131132
// Assert
132-
Assert.That(result, Is.False);
133+
Assert.False(result);
133134
}
134135

135-
[Test]
136+
[Fact]
136137
public void OptionalGuid_ValidGuid_ReturnsTrue()
137138
{
138139
// Arrange
@@ -143,10 +144,10 @@ public void OptionalGuid_ValidGuid_ReturnsTrue()
143144
var result = attribute.IsValid(value);
144145

145146
// Assert
146-
Assert.That(result, Is.True);
147+
Assert.True(result);
147148
}
148149

149-
[Test]
150+
[Fact]
150151
public void OptionalGuid_WithContext_Null_ReturnsSuccess()
151152
{
152153
// Arrange
@@ -158,10 +159,10 @@ public void OptionalGuid_WithContext_Null_ReturnsSuccess()
158159
var result = attribute.GetValidationResult(null, context);
159160

160161
// Assert
161-
Assert.That(result, Is.EqualTo(ValidationResult.Success));
162+
Assert.Equal(ValidationResult.Success, result);
162163
}
163164

164-
[Test]
165+
[Fact]
165166
public void OptionalGuid_WithContext_GuidEmpty_ReturnsValidationError()
166167
{
167168
// Arrange
@@ -173,11 +174,11 @@ public void OptionalGuid_WithContext_GuidEmpty_ReturnsValidationError()
173174
var result = attribute.GetValidationResult(Guid.Empty, context);
174175

175176
// Assert
176-
Assert.That(result, Is.Not.Null);
177-
Assert.That(result, Is.Not.EqualTo(ValidationResult.Success));
177+
Assert.NotNull(result);
178+
Assert.NotEqual(ValidationResult.Success, result);
178179
}
179180

180-
[Test]
181+
[Fact]
181182
public void OptionalGuid_WithContext_ValidGuid_ReturnsSuccess()
182183
{
183184
// Arrange
@@ -190,7 +191,7 @@ public void OptionalGuid_WithContext_ValidGuid_ReturnsSuccess()
190191
var result = attribute.GetValidationResult(validGuid, context);
191192

192193
// Assert
193-
Assert.That(result, Is.EqualTo(ValidationResult.Success));
194+
Assert.Equal(ValidationResult.Success, result);
194195
}
195196

196197
private class TestModel

‎Aquiis.SimpleStart.Tests/MaintenanceServiceTests.cs‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -385,18 +385,36 @@ public async Task CreateAsync_InvalidPropertyOrganization_ThrowsException()
385385
CreatedOn = DateTime.UtcNow
386386
};
387387
_context.Organizations.Add(otherOrg);
388+
389+
var otherProperty = new Property
390+
{
391+
Id = Guid.NewGuid(),
392+
OrganizationId = otherOrg.Id,
393+
Address = "999 Other St",
394+
City = "Other City",
395+
State = "OT",
396+
ZipCode = "99999",
397+
PropertyType = "Apartment",
398+
Bedrooms = 2,
399+
Bathrooms = 1,
400+
SquareFeet = 900,
401+
IsAvailable = true,
402+
CreatedBy = _testUser.Id,
403+
CreatedOn = DateTime.UtcNow
404+
};
405+
_context.Properties.Add(otherProperty);
388406
await _context.SaveChangesAsync();
389407

390408
var maintenanceRequest = new MaintenanceRequest
391409
{
392-
PropertyId = _testProperty.Id,
410+
PropertyId = otherProperty.Id, // Property from different org
393411
Title = "Test Request",
394412
Description = "Test Description",
395413
RequestType = ApplicationConstants.MaintenanceRequestTypes.Plumbing,
396414
Priority = ApplicationConstants.MaintenanceRequestPriorities.Medium,
397415
Status = ApplicationConstants.MaintenanceRequestStatuses.Submitted,
398-
RequestedOn = DateTime.Today,
399-
OrganizationId = otherOrg.Id // Different org than property
416+
RequestedOn = DateTime.Today
417+
// OrganizationId will be auto-set from user context, which won't match property's org
400418
};
401419

402420
// Act & Assert

Aquiis.Tests/.runsettings renamed to Aquiis.SimpleStart.UI.Tests/.runsettings

File renamed without changes.

Aquiis.Tests/Aquiis.Tests.csproj renamed to Aquiis.SimpleStart.UI.Tests/Aquiis.SimpleStart.UI.Tests.csproj

File renamed without changes.

Aquiis.Tests/AccountTests.cs renamed to Aquiis.SimpleStart.UI.Tests/NewSetupUITests.cs

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
using Microsoft.Playwright.NUnit;
22
using Microsoft.Playwright;
3-
using NUnit.Framework;
4-
using System.IO;
5-
using System.Threading.Tasks;
63

7-
namespace Aquiis.Tests;
4+
namespace Aquiis.SimpleStart.UI.Tests;
85

96
[Parallelizable(ParallelScope.Self)]
107
[TestFixture]
118

12-
public class AccountManagementTests : PageTest
9+
public class NewSetupUITests : PageTest
1310
{
1411

1512
private const string BaseUrl = "http://localhost:5197";
@@ -65,9 +62,7 @@ public async Task CreateNewAccount()
6562

6663
await Page.GetByRole(AriaRole.Heading, new() { Name = "Property Management Dashboard", Exact= true }).ClickAsync();
6764

68-
//Keep browser open for review/recording
69-
// if (KeepBrowserOpenSeconds > 0)
70-
// await Task.Delay(KeepBrowserOpenSeconds * 1000);
65+
7166
}
7267

7368
[Test, Order(2)]
@@ -221,9 +216,6 @@ public async Task ScheduleAndCompleteTour()
221216

222217
await Page.GetByText("Interested", new() { Exact = true }).ClickAsync();
223218

224-
await Page.GetByRole(AriaRole.Textbox, new() { Name = "Enter value" }).Nth(1).ClickAsync();
225-
await Page.GetByRole(AriaRole.Textbox, new() { Name = "Enter value" }).Nth(1).FillAsync("None");
226-
227219
await Page.GetByRole(AriaRole.Button, new() { Name = " Save Progress" }).ClickAsync();
228220

229221
await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
@@ -236,8 +228,6 @@ public async Task ScheduleAndCompleteTour()
236228

237229
await Page.WaitForLoadStateAsync(LoadState.DOMContentLoaded);
238230

239-
//await Task.Delay(5000); // Wait for PDF generation
240-
241231
var page1 = await Page.RunAndWaitForPopupAsync(async () =>
242232
{
243233
await Page.GetByRole(AriaRole.Button, new() { Name = " View PDF" }).ClickAsync();

Aquiis.Tests/README.md renamed to Aquiis.SimpleStart.UI.Tests/README.md

File renamed without changes.

Aquiis.Tests/UnitTest1.cs.bak renamed to Aquiis.SimpleStart.UI.Tests/UnitTest1.cs.bak

File renamed without changes.

Aquiis.Tests/run-tests-debug.sh renamed to Aquiis.SimpleStart.UI.Tests/run-tests-debug.sh

File renamed without changes.

Aquiis.Tests/run-tests.sh renamed to Aquiis.SimpleStart.UI.Tests/run-tests.sh

File renamed without changes.

‎Aquiis.Tests/ApplicationTests.cs‎

Lines changed: 0 additions & 95 deletions
This file was deleted.

0 commit comments

Comments
 (0)