Skip to content

Commit 35f50f5

Browse files
jvydenjvyden
committed
The Great Formatting of 2022
1 parent 59cc7f0 commit 35f50f5

File tree

162 files changed

+6124
-6324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+6124
-6324
lines changed

‎ProjectLighthouse.Tests.GameApiTests/AuthenticationTests.cs

Lines changed: 45 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -6,62 +6,61 @@
66
using LBPUnion.ProjectLighthouse.Types.Settings;
77
using Xunit;
88

9-
namespace ProjectLighthouse.Tests.GameApiTests
9+
namespace ProjectLighthouse.Tests.GameApiTests;
10+
11+
public class AuthenticationTests : LighthouseServerTest
1012
{
11-
public class AuthenticationTests : LighthouseServerTest
13+
[Fact]
14+
public async Task ShouldReturnErrorOnNoPostData()
1215
{
13-
[Fact]
14-
public async Task ShouldReturnErrorOnNoPostData()
15-
{
16-
HttpResponseMessage response = await this.Client.PostAsync("/LITTLEBIGPLANETPS3_XML/login", null!);
17-
Assert.False(response.IsSuccessStatusCode);
18-
#if NET6_0_OR_GREATER
19-
Assert.True(response.StatusCode == HttpStatusCode.BadRequest);
20-
#else
16+
HttpResponseMessage response = await this.Client.PostAsync("/LITTLEBIGPLANETPS3_XML/login", null!);
17+
Assert.False(response.IsSuccessStatusCode);
18+
#if NET6_0_OR_GREATER
19+
Assert.True(response.StatusCode == HttpStatusCode.BadRequest);
20+
#else
2121
Assert.True(response.StatusCode == HttpStatusCode.NotAcceptable);
22-
#endif
23-
}
22+
#endif
23+
}
2424

25-
[DatabaseFact]
26-
public async Task ShouldReturnWithValidData()
27-
{
28-
HttpResponseMessage response = await this.AuthenticateResponse();
29-
Assert.True(response.IsSuccessStatusCode);
30-
string responseContent = await response.Content.ReadAsStringAsync();
31-
Assert.Contains("MM_AUTH=", responseContent);
32-
Assert.Contains(ServerStatics.ServerName, responseContent);
33-
}
25+
[DatabaseFact]
26+
public async Task ShouldReturnWithValidData()
27+
{
28+
HttpResponseMessage response = await this.AuthenticateResponse();
29+
Assert.True(response.IsSuccessStatusCode);
30+
string responseContent = await response.Content.ReadAsStringAsync();
31+
Assert.Contains("MM_AUTH=", responseContent);
32+
Assert.Contains(ServerStatics.ServerName, responseContent);
33+
}
3434

35-
[DatabaseFact]
36-
public async Task CanSerializeBack()
37-
{
38-
LoginResult loginResult = await this.Authenticate();
35+
[DatabaseFact]
36+
public async Task CanSerializeBack()
37+
{
38+
LoginResult loginResult = await this.Authenticate();
3939

40-
Assert.NotNull(loginResult);
41-
Assert.NotNull(loginResult.AuthTicket);
42-
Assert.NotNull(loginResult.LbpEnvVer);
40+
Assert.NotNull(loginResult);
41+
Assert.NotNull(loginResult.AuthTicket);
42+
Assert.NotNull(loginResult.LbpEnvVer);
4343

44-
Assert.Contains("MM_AUTH=", loginResult.AuthTicket);
45-
Assert.Equal(ServerStatics.ServerName, loginResult.LbpEnvVer);
46-
}
44+
Assert.Contains("MM_AUTH=", loginResult.AuthTicket);
45+
Assert.Equal(ServerStatics.ServerName, loginResult.LbpEnvVer);
46+
}
4747

48-
[DatabaseFact]
49-
public async Task CanUseToken()
50-
{
51-
LoginResult loginResult = await this.Authenticate();
48+
[DatabaseFact]
49+
public async Task CanUseToken()
50+
{
51+
LoginResult loginResult = await this.Authenticate();
5252

53-
HttpResponseMessage response = await this.AuthenticatedRequest("/LITTLEBIGPLANETPS3_XML/enterLevel/1", loginResult.AuthTicket);
54-
string responseContent = await response.Content.ReadAsStringAsync();
53+
HttpResponseMessage response = await this.AuthenticatedRequest("/LITTLEBIGPLANETPS3_XML/enterLevel/1", loginResult.AuthTicket);
54+
string responseContent = await response.Content.ReadAsStringAsync();
5555

56-
Assert.False(response.StatusCode == HttpStatusCode.Forbidden);
57-
}
56+
Assert.False(response.StatusCode == HttpStatusCode.Forbidden);
57+
}
5858

59-
[DatabaseFact]
60-
public async Task ShouldReturnForbiddenWhenNotAuthenticated()
61-
{
62-
HttpResponseMessage response = await this.Client.GetAsync("/LITTLEBIGPLANETPS3_XML/announce");
63-
Assert.False(response.IsSuccessStatusCode);
64-
Assert.True(response.StatusCode == HttpStatusCode.Forbidden);
65-
}
59+
[DatabaseFact]
60+
public async Task ShouldReturnForbiddenWhenNotAuthenticated()
61+
{
62+
HttpResponseMessage response = await this.Client.GetAsync("/LITTLEBIGPLANETPS3_XML/announce");
63+
Assert.False(response.IsSuccessStatusCode);
64+
Assert.True(response.StatusCode == HttpStatusCode.Forbidden);
6665
}
6766
}

‎ProjectLighthouse.Tests.GameApiTests/DatabaseTests.cs

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,22 @@
66
using LBPUnion.ProjectLighthouse.Types;
77
using Xunit;
88

9-
namespace ProjectLighthouse.Tests.GameApiTests
9+
namespace ProjectLighthouse.Tests.GameApiTests;
10+
11+
public class DatabaseTests : LighthouseServerTest
1012
{
11-
public class DatabaseTests : LighthouseServerTest
13+
[DatabaseFact]
14+
public async Task CanCreateUserTwice()
1215
{
13-
[DatabaseFact]
14-
public async Task CanCreateUserTwice()
15-
{
16-
await using Database database = new();
17-
int rand = new Random().Next();
16+
await using Database database = new();
17+
int rand = new Random().Next();
1818

19-
User userA = await database.CreateUser("createUserTwiceTest" + rand, HashHelper.GenerateAuthToken());
20-
User userB = await database.CreateUser("createUserTwiceTest" + rand, HashHelper.GenerateAuthToken());
19+
User userA = await database.CreateUser("createUserTwiceTest" + rand, HashHelper.GenerateAuthToken());
20+
User userB = await database.CreateUser("createUserTwiceTest" + rand, HashHelper.GenerateAuthToken());
2121

22-
Assert.NotNull(userA);
23-
Assert.NotNull(userB);
22+
Assert.NotNull(userA);
23+
Assert.NotNull(userB);
2424

25-
await database.RemoveUser(userA); // Only remove userA since userA and userB are the same user
26-
}
25+
await database.RemoveUser(userA); // Only remove userA since userA and userB are the same user
2726
}
2827
}

‎ProjectLighthouse.Tests.GameApiTests/MatchTests.cs

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,55 +8,54 @@
88
using LBPUnion.ProjectLighthouse.Types;
99
using Xunit;
1010

11-
namespace ProjectLighthouse.Tests.GameApiTests
11+
namespace ProjectLighthouse.Tests.GameApiTests;
12+
13+
public class MatchTests : LighthouseServerTest
1214
{
13-
public class MatchTests : LighthouseServerTest
14-
{
15-
private static readonly SemaphoreSlim semaphore = new(1, 1);
15+
private static readonly SemaphoreSlim semaphore = new(1, 1);
1616

17-
[DatabaseFact]
18-
public async Task ShouldRejectEmptyData()
19-
{
20-
LoginResult loginResult = await this.Authenticate();
21-
await semaphore.WaitAsync();
17+
[DatabaseFact]
18+
public async Task ShouldRejectEmptyData()
19+
{
20+
LoginResult loginResult = await this.Authenticate();
21+
await semaphore.WaitAsync();
2222

23-
HttpResponseMessage result = await this.AuthenticatedUploadDataRequest("LITTLEBIGPLANETPS3_XML/match", Array.Empty<byte>(), loginResult.AuthTicket);
23+
HttpResponseMessage result = await this.AuthenticatedUploadDataRequest("LITTLEBIGPLANETPS3_XML/match", Array.Empty<byte>(), loginResult.AuthTicket);
2424

25-
semaphore.Release();
26-
Assert.False(result.IsSuccessStatusCode);
27-
}
25+
semaphore.Release();
26+
Assert.False(result.IsSuccessStatusCode);
27+
}
2828

29-
[DatabaseFact]
30-
public async Task ShouldReturnOk()
31-
{
32-
LoginResult loginResult = await this.Authenticate();
33-
await semaphore.WaitAsync();
29+
[DatabaseFact]
30+
public async Task ShouldReturnOk()
31+
{
32+
LoginResult loginResult = await this.Authenticate();
33+
await semaphore.WaitAsync();
3434

35-
HttpResponseMessage result = await this.AuthenticatedUploadDataRequest
36-
("LITTLEBIGPLANETPS3_XML/match", Encoding.ASCII.GetBytes("[UpdateMyPlayerData,[\"Player\":\"1984\"]]"), loginResult.AuthTicket);
35+
HttpResponseMessage result = await this.AuthenticatedUploadDataRequest
36+
("LITTLEBIGPLANETPS3_XML/match", Encoding.ASCII.GetBytes("[UpdateMyPlayerData,[\"Player\":\"1984\"]]"), loginResult.AuthTicket);
3737

38-
semaphore.Release();
39-
Assert.True(result.IsSuccessStatusCode);
40-
}
38+
semaphore.Release();
39+
Assert.True(result.IsSuccessStatusCode);
40+
}
4141

42-
[DatabaseFact]
43-
public async Task ShouldIncrementPlayerCount()
44-
{
45-
LoginResult loginResult = await this.Authenticate(new Random().Next());
42+
[DatabaseFact]
43+
public async Task ShouldIncrementPlayerCount()
44+
{
45+
LoginResult loginResult = await this.Authenticate(new Random().Next());
4646

47-
await semaphore.WaitAsync();
47+
await semaphore.WaitAsync();
4848

49-
int oldPlayerCount = await StatisticsHelper.RecentMatches();
49+
int oldPlayerCount = await StatisticsHelper.RecentMatches();
5050

51-
HttpResponseMessage result = await this.AuthenticatedUploadDataRequest
52-
("LITTLEBIGPLANETPS3_XML/match", Encoding.ASCII.GetBytes("[UpdateMyPlayerData,[\"Player\":\"1984\"]]"), loginResult.AuthTicket);
51+
HttpResponseMessage result = await this.AuthenticatedUploadDataRequest
52+
("LITTLEBIGPLANETPS3_XML/match", Encoding.ASCII.GetBytes("[UpdateMyPlayerData,[\"Player\":\"1984\"]]"), loginResult.AuthTicket);
5353

54-
Assert.True(result.IsSuccessStatusCode);
54+
Assert.True(result.IsSuccessStatusCode);
5555

56-
int playerCount = await StatisticsHelper.RecentMatches();
56+
int playerCount = await StatisticsHelper.RecentMatches();
5757

58-
semaphore.Release();
59-
Assert.Equal(oldPlayerCount + 1, playerCount);
60-
}
58+
semaphore.Release();
59+
Assert.Equal(oldPlayerCount + 1, playerCount);
6160
}
6261
}

‎ProjectLighthouse.Tests.GameApiTests/SlotTests.cs

Lines changed: 63 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -9,85 +9,84 @@
99
using LBPUnion.ProjectLighthouse.Types.Profiles;
1010
using Xunit;
1111

12-
namespace ProjectLighthouse.Tests.GameApiTests
12+
namespace ProjectLighthouse.Tests.GameApiTests;
13+
14+
public class SlotTests : LighthouseServerTest
1315
{
14-
public class SlotTests : LighthouseServerTest
16+
[DatabaseFact]
17+
public async Task ShouldOnlyShowUsersLevels()
1518
{
16-
[DatabaseFact]
17-
public async Task ShouldOnlyShowUsersLevels()
19+
await using Database database = new();
20+
21+
Random r = new();
22+
23+
User userA = await database.CreateUser($"unitTestUser{r.Next()}", HashHelper.GenerateAuthToken());
24+
User userB = await database.CreateUser($"unitTestUser{r.Next()}", HashHelper.GenerateAuthToken());
25+
26+
Location l = new()
1827
{
19-
await using Database database = new();
20-
21-
Random r = new();
22-
23-
User userA = await database.CreateUser($"unitTestUser{r.Next()}", HashHelper.GenerateAuthToken());
24-
User userB = await database.CreateUser($"unitTestUser{r.Next()}", HashHelper.GenerateAuthToken());
25-
26-
Location l = new()
27-
{
28-
X = 0,
29-
Y = 0,
30-
};
31-
database.Locations.Add(l);
32-
await database.SaveChangesAsync();
33-
34-
Slot slotA = new()
35-
{
36-
Creator = userA,
37-
CreatorId = userA.UserId,
38-
Name = "slotA",
39-
Location = l,
40-
LocationId = l.Id,
41-
ResourceCollection = "",
42-
};
43-
44-
Slot slotB = new()
45-
{
46-
Creator = userB,
47-
CreatorId = userB.UserId,
48-
Name = "slotB",
49-
Location = l,
50-
LocationId = l.Id,
51-
ResourceCollection = "",
52-
};
53-
54-
database.Slots.Add(slotA);
55-
database.Slots.Add(slotB);
56-
57-
await database.SaveChangesAsync();
28+
X = 0,
29+
Y = 0,
30+
};
31+
database.Locations.Add(l);
32+
await database.SaveChangesAsync();
33+
34+
Slot slotA = new()
35+
{
36+
Creator = userA,
37+
CreatorId = userA.UserId,
38+
Name = "slotA",
39+
Location = l,
40+
LocationId = l.Id,
41+
ResourceCollection = "",
42+
};
43+
44+
Slot slotB = new()
45+
{
46+
Creator = userB,
47+
CreatorId = userB.UserId,
48+
Name = "slotB",
49+
Location = l,
50+
LocationId = l.Id,
51+
ResourceCollection = "",
52+
};
53+
54+
database.Slots.Add(slotA);
55+
database.Slots.Add(slotB);
56+
57+
await database.SaveChangesAsync();
5858

5959
// XmlSerializer serializer = new(typeof(Slot));
6060
// Slot slot = (Slot)serializer.Deserialize(new StringReader(bodyString));
6161

62-
LoginResult loginResult = await this.Authenticate();
62+
LoginResult loginResult = await this.Authenticate();
6363

64-
HttpResponseMessage respMessageA = await this.AuthenticatedRequest
65-
($"LITTLEBIGPLANETPS3_XML/slots/by?u={userA.Username}&pageStart=1&pageSize=1", loginResult.AuthTicket);
66-
HttpResponseMessage respMessageB = await this.AuthenticatedRequest
67-
($"LITTLEBIGPLANETPS3_XML/slots/by?u={userB.Username}&pageStart=1&pageSize=1", loginResult.AuthTicket);
64+
HttpResponseMessage respMessageA = await this.AuthenticatedRequest
65+
($"LITTLEBIGPLANETPS3_XML/slots/by?u={userA.Username}&pageStart=1&pageSize=1", loginResult.AuthTicket);
66+
HttpResponseMessage respMessageB = await this.AuthenticatedRequest
67+
($"LITTLEBIGPLANETPS3_XML/slots/by?u={userB.Username}&pageStart=1&pageSize=1", loginResult.AuthTicket);
6868

69-
Assert.True(respMessageA.IsSuccessStatusCode);
70-
Assert.True(respMessageB.IsSuccessStatusCode);
69+
Assert.True(respMessageA.IsSuccessStatusCode);
70+
Assert.True(respMessageB.IsSuccessStatusCode);
7171

72-
string respA = await respMessageA.Content.ReadAsStringAsync();
73-
string respB = await respMessageB.Content.ReadAsStringAsync();
72+
string respA = await respMessageA.Content.ReadAsStringAsync();
73+
string respB = await respMessageB.Content.ReadAsStringAsync();
7474

75-
Assert.False(string.IsNullOrEmpty(respA));
76-
Assert.False(string.IsNullOrEmpty(respB));
75+
Assert.False(string.IsNullOrEmpty(respA));
76+
Assert.False(string.IsNullOrEmpty(respB));
7777

78-
Assert.NotEqual(respA, respB);
79-
Assert.DoesNotContain(respA, "slotB");
80-
Assert.DoesNotContain(respB, "slotA");
78+
Assert.NotEqual(respA, respB);
79+
Assert.DoesNotContain(respA, "slotB");
80+
Assert.DoesNotContain(respB, "slotA");
8181

82-
// Cleanup
82+
// Cleanup
8383

84-
database.Slots.Remove(slotA);
85-
database.Slots.Remove(slotB);
84+
database.Slots.Remove(slotA);
85+
database.Slots.Remove(slotB);
8686

87-
await database.RemoveUser(userA);
88-
await database.RemoveUser(userB);
87+
await database.RemoveUser(userA);
88+
await database.RemoveUser(userB);
8989

90-
await database.SaveChangesAsync();
91-
}
90+
await database.SaveChangesAsync();
9291
}
9392
}

0 commit comments

Comments
 (0)