Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,17 @@
"Qameta\\Allure\\PHPUnit\\": "src/"
}
},
"autoload-dev": {
"psr-0": {
"Yandex": "test/"
"autoload-dev": {
"psr-0": {
"Yandex": "test/"
},
"psr-4": {
"Qameta\\Allure\\PHPUnit\\Test\\Unit\\": "test/unit/",
"Qameta\\Allure\\PHPUnit\\Test\\Report\\": "test/report/",
"Qameta\\Allure\\PHPUnit\\Test\\Integration\\": "test/integration/",
"Qameta\\Allure\\PHPUnit\\Scripts\\": "scripts/"
}
},
"psr-4": {
"Qameta\\Allure\\PHPUnit\\Test\\Unit\\": "test/unit/",
"Qameta\\Allure\\PHPUnit\\Test\\Report\\": "test/report/",
"Qameta\\Allure\\PHPUnit\\Scripts\\": "scripts/"
}
},
"scripts": {
"test-cs": "vendor/bin/phpcs -sp",
"test-unit": "vendor/bin/phpunit --coverage-text",
Expand Down
3 changes: 3 additions & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
<testsuite name="unit">
<directory>test/unit/</directory>
</testsuite>
<testsuite name="integration">
<file>test/integration/HookFailureIntegrationTest.php</file>
</testsuite>
</testsuites>
<source>
<include>
Expand Down
10 changes: 10 additions & 0 deletions psalm.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
findUnusedCode="false"
findUnusedPsalmSuppress="false"
findUnusedVariablesAndParams="false"
findUnusedIssueHandlerSuppression="false"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd">
Expand All @@ -18,4 +19,13 @@
<plugins>
<pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
</plugins>
<issueHandlers>
<!-- Test helpers intentionally construct PHPUnit @internal event types.
Not reported on all PHPUnit versions, so unused-handler checks are off. -->
<InternalMethod>
<errorLevel type="suppress">
<file name="test/unit/Event/EventTestTrait.php"/>
</errorLevel>
</InternalMethod>
</issueHandlers>
</psalm>
125 changes: 125 additions & 0 deletions src/AllureAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,34 @@ final class AllureAdapter implements AllureAdapterInterface
*/
private array $lastRuns = [];

/**
* @var array<string, true>
*/
private array $startedTests = [];

/**
* @var array<string, true>
*/
private array $writtenTests = [];

/**
* @var array<string, string>
*/
private array $classContainers = [];

/**
* @var array<string, true>
*/
private array $emittedHookGlobals = [];

private ?Throwable $lastException = null;

private ?string $activeFixtureUuid = null;

private ?string $activeHookName = null;

private ?TestInfo $pendingFinalizeTest = null;

private function __construct()
{
}
Expand Down Expand Up @@ -73,6 +99,7 @@ public function registerStart(ContainerResult $containerResult, TestResult $test
containerId: $containerResult->getUuid(),
testId: $testResult->getUuid(),
);
unset($this->startedTests[$info->getTest()], $this->writtenTests[$info->getTest()]);

return $testResult->getUuid();
}
Expand Down Expand Up @@ -115,6 +142,104 @@ public function registerRun(TestResult $testResult, TestInfo $info): TestRunInfo
return $currentRunInfo;
}

#[\Override]
public function markTestStarted(TestInfo $info): void
{
$this->startedTests[$info->getTest()] = true;
}

#[\Override]
public function wasTestStarted(TestInfo $info): bool
{
return isset($this->startedTests[$info->getTest()]);
}

#[\Override]
public function markTestWritten(TestInfo $info): void
{
$this->writtenTests[$info->getTest()] = true;
}

#[\Override]
public function wasTestWritten(TestInfo $info): bool
{
return isset($this->writtenTests[$info->getTest()]);
}

#[\Override]
public function registerClassContainer(string $className, string $containerUuid): void
{
$this->classContainers[$className] = $containerUuid;
}

#[\Override]
public function getClassContainerId(string $className): ?string
{
return $this->classContainers[$className] ?? null;
}

#[\Override]
public function clearClassContainer(string $className): void
{
unset($this->classContainers[$className]);
}

#[\Override]
public function setActiveFixture(string $uuid, string $hookName): void
{
$this->activeFixtureUuid = $uuid;
$this->activeHookName = $hookName;
}

#[\Override]
public function getActiveFixtureUuid(): ?string
{
return $this->activeFixtureUuid;
}

#[\Override]
public function getActiveHookName(): ?string
{
return $this->activeHookName;
}

#[\Override]
public function clearActiveFixture(): void
{
$this->activeFixtureUuid = null;
$this->activeHookName = null;
}

#[\Override]
public function hasEmittedHookGlobalError(string $fixtureUuid): bool
{
return isset($this->emittedHookGlobals[$fixtureUuid]);
}

#[\Override]
public function markHookGlobalErrorEmitted(string $fixtureUuid): void
{
$this->emittedHookGlobals[$fixtureUuid] = true;
}

#[\Override]
public function markPendingFinalize(TestInfo $info): void
{
$this->pendingFinalizeTest = $info;
}

#[\Override]
public function getPendingFinalizeTest(): ?TestInfo
{
return $this->pendingFinalizeTest;
}

#[\Override]
public function clearPendingFinalize(): void
{
$this->pendingFinalizeTest = null;
}

/**
* @param TestResult $test
* @return list<Parameter>
Expand Down
32 changes: 32 additions & 0 deletions src/AllureAdapterInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,36 @@ public function resetLastException(): void;
public function setLastException(Throwable $e): void;

public function getLastException(): ?Throwable;

public function markTestStarted(TestInfo $info): void;

public function wasTestStarted(TestInfo $info): bool;

public function markTestWritten(TestInfo $info): void;

public function wasTestWritten(TestInfo $info): bool;

public function registerClassContainer(string $className, string $containerUuid): void;

public function getClassContainerId(string $className): ?string;

public function clearClassContainer(string $className): void;

public function setActiveFixture(string $uuid, string $hookName): void;

public function getActiveFixtureUuid(): ?string;

public function getActiveHookName(): ?string;

public function clearActiveFixture(): void;

public function hasEmittedHookGlobalError(string $fixtureUuid): bool;

public function markHookGlobalErrorEmitted(string $fixtureUuid): void;

public function markPendingFinalize(TestInfo $info): void;

public function getPendingFinalizeTest(): ?TestInfo;

public function clearPendingFinalize(): void;
}
Loading