Skip to content

Commit bc3daa2

Browse files
fix: add otlp test changes
1 parent 54030d3 commit bc3daa2

3 files changed

Lines changed: 22 additions & 10 deletions

File tree

tests/OpenTelemetry/Formatters/SummitAttendeeBadgeAuditLogFormatterTest.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ class SummitAttendeeBadgeAuditLogFormatterTest extends TestCase
1414
private const TICKET_ID = 789;
1515
private const TICKET_NUMBER = 'TICKET-2024-001';
1616
private const SUMMIT_NAME = 'OpenStack Summit 2024';
17+
private const OWNER_FIRST_NAME = 'John';
18+
private const OWNER_LAST_NAME = 'Doe';
1719

1820
private mixed $mockSubject;
1921

@@ -37,10 +39,15 @@ private function createMockSubject(): mixed
3739
$mockOrder = Mockery::mock('models\summit\SummitOrder');
3840
$mockOrder->shouldReceive('getSummit')->andReturn($mockSummit);
3941

42+
$mockOwner = Mockery::mock('models\summit\SummitAttendee');
43+
$mockOwner->shouldReceive('getFirstName')->andReturn(self::OWNER_FIRST_NAME);
44+
$mockOwner->shouldReceive('getSurname')->andReturn(self::OWNER_LAST_NAME);
45+
4046
$mockTicket = Mockery::mock('models\summit\SummitAttendeeTicket');
4147
$mockTicket->shouldReceive('getId')->andReturn(self::TICKET_ID);
4248
$mockTicket->shouldReceive('getNumber')->andReturn(self::TICKET_NUMBER);
4349
$mockTicket->shouldReceive('getOrder')->andReturn($mockOrder);
50+
$mockTicket->shouldReceive('getOwner')->andReturn($mockOwner);
4451

4552
$mock = Mockery::mock('models\summit\SummitAttendeeBadge');
4653
$mock->shouldReceive('getId')->andReturn(self::BADGE_ID);
@@ -58,8 +65,8 @@ public function testSubjectCreationAuditMessage(): void
5865

5966
$this->assertNotNull($result);
6067
$this->assertStringContainsString('created', $result);
61-
$this->assertStringContainsString(self::TICKET_NUMBER, $result);
62-
$this->assertStringContainsString((string)self::TICKET_ID, $result);
68+
$this->assertStringContainsString(self::OWNER_FIRST_NAME . ' ' . self::OWNER_LAST_NAME, $result);
69+
$this->assertStringContainsString((string)self::BADGE_ID, $result);
6370
}
6471

6572
public function testSubjectUpdateAuditMessage(): void

tests/OpenTelemetry/Formatters/SummitAttendeeNoteAuditLogFormatterTest.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ class SummitAttendeeNoteAuditLogFormatterTest extends TestCase
1515
private const ATTENDEE_EMAIL = 'attendee@example.com';
1616
private const NOTE_CONTENT = 'This is a test note content';
1717
private const SUMMIT_NAME = 'OpenStack Summit 2024';
18+
private const ATTENDEE_FIRST_NAME = 'Jane';
19+
private const ATTENDEE_LAST_NAME = 'Smith';
1820

1921
private mixed $mockSubject;
2022

@@ -39,6 +41,8 @@ private function createMockSubject(): mixed
3941
$mockAttendee->shouldReceive('getId')->andReturn(self::ATTENDEE_ID);
4042
$mockAttendee->shouldReceive('getEmail')->andReturn(self::ATTENDEE_EMAIL);
4143
$mockAttendee->shouldReceive('getSummit')->andReturn($mockSummit);
44+
$mockAttendee->shouldReceive('getFirstName')->andReturn(self::ATTENDEE_FIRST_NAME);
45+
$mockAttendee->shouldReceive('getSurname')->andReturn(self::ATTENDEE_LAST_NAME);
4246

4347
$mock = Mockery::mock('models\summit\SummitAttendeeNote');
4448
$mock->shouldReceive('getId')->andReturn(self::NOTE_ID);
@@ -56,8 +60,8 @@ public function testSubjectCreationAuditMessage(): void
5660

5761
$this->assertNotNull($result);
5862
$this->assertStringContainsString('created', $result);
59-
$this->assertStringContainsString(self::ATTENDEE_EMAIL, $result);
60-
$this->assertStringContainsString((string)self::ATTENDEE_ID, $result);
63+
$this->assertStringContainsString(self::ATTENDEE_FIRST_NAME . ' ' . self::ATTENDEE_LAST_NAME, $result);
64+
$this->assertStringContainsString((string)self::NOTE_ID, $result);
6165
}
6266

6367
public function testSubjectUpdateAuditMessage(): void

tests/OpenTelemetry/Formatters/SummitAttendeeTicketAuditLogFormatterTest.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ class SummitAttendeeTicketAuditLogFormatterTest extends TestCase
1919
private const OWNER_EMAIL = 'owner@example.com';
2020
private const SUMMIT_NAME = 'OpenStack Summit 2024';
2121
private const NEW_STATUS = 'Cancelled';
22+
private const OWNER_FIRST_NAME = 'John';
23+
private const OWNER_LAST_NAME = 'Doe';
2224

2325
private mixed $mockSubject;
2426

@@ -39,14 +41,14 @@ private function createMockSubject(): mixed
3941
$mockSummit = Mockery::mock('models\summit\Summit');
4042
$mockSummit->shouldReceive('getName')->andReturn(self::SUMMIT_NAME);
4143

42-
$mockOwner = Mockery::mock('models\main\Member');
43-
$mockOwner->shouldReceive('getEmail')->andReturn(self::OWNER_EMAIL);
44+
$mockOwner = Mockery::mock('models\summit\SummitAttendee');
45+
$mockOwner->shouldReceive('getFirstName')->andReturn(self::OWNER_FIRST_NAME);
46+
$mockOwner->shouldReceive('getSurname')->andReturn(self::OWNER_LAST_NAME);
4447

4548
$mockOrder = Mockery::mock('models\summit\SummitOrder');
4649
$mockOrder->shouldReceive('getId')->andReturn(self::ORDER_ID);
4750
$mockOrder->shouldReceive('getNumber')->andReturn(self::ORDER_NUMBER);
4851
$mockOrder->shouldReceive('getSummit')->andReturn($mockSummit);
49-
$mockOrder->shouldReceive('getOwner')->andReturn($mockOwner);
5052

5153
$mockTicketType = Mockery::mock('models\summit\SummitTicketType');
5254
$mockTicketType->shouldReceive('getName')->andReturn(self::TICKET_TYPE);
@@ -57,6 +59,7 @@ private function createMockSubject(): mixed
5759
$mock->shouldReceive('getOrder')->andReturn($mockOrder);
5860
$mock->shouldReceive('getTicketType')->andReturn($mockTicketType);
5961
$mock->shouldReceive('getStatus')->andReturn(self::TICKET_STATUS);
62+
$mock->shouldReceive('getOwner')->andReturn($mockOwner);
6063

6164
return $mock;
6265
}
@@ -69,10 +72,8 @@ public function testSubjectCreationAuditMessage(): void
6972

7073
$this->assertNotNull($result);
7174
$this->assertStringContainsString('created', $result);
72-
$this->assertStringContainsString(self::TICKET_NUMBER, $result);
75+
$this->assertStringContainsString(self::OWNER_FIRST_NAME . ' ' . self::OWNER_LAST_NAME, $result);
7376
$this->assertStringContainsString((string)self::TICKET_ID, $result);
74-
$this->assertStringContainsString(self::TICKET_TYPE, $result);
75-
$this->assertStringContainsString(self::ORDER_NUMBER, $result);
7677
}
7778

7879
public function testSubjectUpdateAuditMessage(): void

0 commit comments

Comments
 (0)