fix(maintenance): v0.19.4 — composer GD-rung tests, layout-key cleanup, carried P3s
Items completed:
1. GD-rung tests (QA P2, verdict 2026-06-11-6f76df1.md P2-1):
- New ImageComposerEditorTest.php: 7 tests covering wp_get_image_editor WP_Error,
resize WP_Error, upscale size-mismatch guard, save WP_Error, zero-width geometry
guard, missing-role guard, and successful OG resize happy path.
- Orchestrator gd-rung test added to ImageComposerTest.php: forces capability='gd'
via filter, asserts Imagick renderer is never called, pass-through featured is
always first.
2. Dead layout keys removed (QA P3, same verdict P3-3):
- Removed caption_margin_right (og) and caption_side_padding (square) from
Layout::defaults(). The Imagick renderer never reads them: og text is
left-anchored from logo_x+logo_w+caption_gap; square text is center-anchored
at floor(width/2). Right-edge geometry is enforced by caption_chars_per_line.
Decision: remove (not consume) — no renderer geometry to wire them to.
3. Amortized pv/role (P3 carried, phase-1 thread seq 49 + seq 50):
- Post_Assembler::amortize_research_costs() SELECT now includes prompt_version
and agent_role; INSERT carries them forward so amortized llm_research rows are
no longer stamped with NULL/empty audit fields.
4. fetch_page() error body (P3 carried, phase-1 thread seq 50):
- Runware_Catalog_Fetcher::fetch_page() non-200 exceptions now include up to
200 chars of the response body for log-based diagnosis.
5. cto-review.yml isinstance guard: ALREADY FIXED at HEAD (line 454 uses
c.get("severity", "UNKNOWN")). Noted in CHANGELOG; no code change.
Agent-Session: engineer-prab-maint-20260612
This commit is contained in:
peptiderepo
236
tests/unit/Core/ImageComposerEditorTest.php
Normal file
236
tests/unit/Core/ImageComposerEditorTest.php
Normal file
@@ -0,0 +1,236 @@
|
||||
<?php
|
||||
/**
|
||||
* Tests for PRAutoBlogger_Image_Composer_Editor (GD/WP-editor rung).
|
||||
*
|
||||
* Validates the three main branches of cover_crop():
|
||||
* - wp_get_image_editor() returns WP_Error → null returned.
|
||||
* - Resize returns WP_Error → null returned.
|
||||
* - Exact size not reachable (would upscale) → null returned.
|
||||
* - Happy path: successful resize/save returns the expected shape.
|
||||
* And compose_variants() iteration:
|
||||
* - Roles with bad geometry (0-width target) are skipped.
|
||||
* - Null cover_crop result for a role skips that role with a debug log.
|
||||
*
|
||||
* Brain Monkey stubs wp_get_image_editor, get_temp_dir so no filesystem or
|
||||
* WP runtime is needed.
|
||||
*
|
||||
* @package PRAutoBlogger\Tests\Core
|
||||
*/
|
||||
|
||||
namespace PRAutoBlogger\Tests\Core;
|
||||
|
||||
use PRAutoBlogger\Tests\BaseTestCase;
|
||||
use Brain\Monkey\Functions;
|
||||
|
||||
class ImageComposerEditorTest extends BaseTestCase {
|
||||
|
||||
/** Minimal layout geometry mirroring Layout::defaults() relevant keys. */
|
||||
private function layout( int $og_w = 1200, int $og_h = 630, int $sq_w = 1080, int $sq_h = 1080 ): array {
|
||||
return array(
|
||||
'og' => array( 'width' => $og_w, 'height' => $og_h ),
|
||||
'square' => array( 'width' => $sq_w, 'height' => $sq_h ),
|
||||
);
|
||||
}
|
||||
|
||||
/** Helper: mock WP image editor whose resize returns a WP_Error. */
|
||||
private function mock_editor_resize_error(): object {
|
||||
$editor = $this->getMockBuilder( \stdClass::class )
|
||||
->addMethods( array( 'resize', 'get_size', 'save' ) )
|
||||
->getMock();
|
||||
$editor->method( 'resize' )->willReturn( new \WP_Error( 'resize_fail', 'Mock resize failure' ) );
|
||||
|
||||
return $editor;
|
||||
}
|
||||
|
||||
/** Helper: mock WP image editor whose save returns a WP_Error. */
|
||||
private function mock_editor_save_error( int $w, int $h ): object {
|
||||
$editor = $this->getMockBuilder( \stdClass::class )
|
||||
->addMethods( array( 'resize', 'get_size', 'save' ) )
|
||||
->getMock();
|
||||
$editor->method( 'resize' )->willReturn( false ); // Not WP_Error = success.
|
||||
$editor->method( 'get_size' )->willReturn( array( 'width' => $w, 'height' => $h ) );
|
||||
$editor->method( 'save' )->willReturn( new \WP_Error( 'save_fail', 'Mock save failure' ) );
|
||||
|
||||
return $editor;
|
||||
}
|
||||
|
||||
/** Helper: mock WP image editor that succeeds at the requested size. */
|
||||
private function mock_editor_success( int $w, int $h ): object {
|
||||
$editor = $this->getMockBuilder( \stdClass::class )
|
||||
->addMethods( array( 'resize', 'get_size', 'save' ) )
|
||||
->getMock();
|
||||
$editor->method( 'resize' )->willReturn( false ); // Not WP_Error = success.
|
||||
$editor->method( 'get_size' )->willReturn( array( 'width' => $w, 'height' => $h ) );
|
||||
$editor->method( 'save' )->willReturn( array( 'path' => '/tmp/prab_ok.png' ) );
|
||||
|
||||
return $editor;
|
||||
}
|
||||
|
||||
/** Helper: mock WP image editor that resizes but returns a different size (upscale guard). */
|
||||
private function mock_editor_wrong_size( int $requested_w, int $requested_h, int $actual_w, int $actual_h ): object {
|
||||
$editor = $this->getMockBuilder( \stdClass::class )
|
||||
->addMethods( array( 'resize', 'get_size', 'save' ) )
|
||||
->getMock();
|
||||
$editor->method( 'resize' )->willReturn( false ); // Not WP_Error = success.
|
||||
$editor->method( 'get_size' )->willReturn( array( 'width' => $actual_w, 'height' => $actual_h ) );
|
||||
|
||||
return $editor;
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
// cover_crop() failure paths (tested via compose_variants interface).
|
||||
// ------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* wp_get_image_editor() returns WP_Error → role skipped,
|
||||
* no variants emitted.
|
||||
*/
|
||||
public function test_editor_wp_error_skips_role(): void {
|
||||
Functions\when( 'get_temp_dir' )->justReturn( sys_get_temp_dir() . '/' );
|
||||
Functions\when( 'wp_get_image_editor' )->justReturn(
|
||||
new \WP_Error( 'no_editor', 'No image editor available' )
|
||||
);
|
||||
Functions\when( 'is_wp_error' )->alias( static function ( $val ) {
|
||||
return $val instanceof \WP_Error;
|
||||
} );
|
||||
|
||||
$editor = new \PRAutoBlogger_Image_Composer_Editor();
|
||||
$variants = $editor->compose_variants( 'fake_bytes', array( 'og' ), $this->layout() );
|
||||
|
||||
$this->assertSame( array(), $variants, 'wp_get_image_editor WP_Error must yield no variants' );
|
||||
}
|
||||
|
||||
/**
|
||||
* Resize step returns WP_Error → role skipped.
|
||||
*/
|
||||
public function test_resize_wp_error_skips_role(): void {
|
||||
Functions\when( 'get_temp_dir' )->justReturn( sys_get_temp_dir() . '/' );
|
||||
Functions\when( 'wp_get_image_editor' )->justReturn( $this->mock_editor_resize_error() );
|
||||
Functions\when( 'is_wp_error' )->alias( static function ( $val ) {
|
||||
return $val instanceof \WP_Error;
|
||||
} );
|
||||
|
||||
$editor = new \PRAutoBlogger_Image_Composer_Editor();
|
||||
$variants = $editor->compose_variants( 'fake_bytes', array( 'og' ), $this->layout() );
|
||||
|
||||
$this->assertSame( array(), $variants, 'Resize WP_Error must yield no variants' );
|
||||
}
|
||||
|
||||
/**
|
||||
* Exact size not reachable (WP editor silently gives a different size
|
||||
* instead of upscaling) → role skipped via the size-mismatch guard.
|
||||
*/
|
||||
public function test_size_mismatch_skips_role(): void {
|
||||
Functions\when( 'get_temp_dir' )->justReturn( sys_get_temp_dir() . '/' );
|
||||
// Editor resizes to 900×473 when 1080×1080 square was requested (would upscale).
|
||||
Functions\when( 'wp_get_image_editor' )->justReturn(
|
||||
$this->mock_editor_wrong_size( 1080, 1080, 900, 473 )
|
||||
);
|
||||
Functions\when( 'is_wp_error' )->alias( static function ( $val ) {
|
||||
return $val instanceof \WP_Error;
|
||||
} );
|
||||
|
||||
$editor = new \PRAutoBlogger_Image_Composer_Editor();
|
||||
$variants = $editor->compose_variants( 'fake_bytes', array( 'square' ), $this->layout() );
|
||||
|
||||
$this->assertSame( array(), $variants, 'Size mismatch (upscale guard) must yield no variants' );
|
||||
}
|
||||
|
||||
/**
|
||||
* Save step returns WP_Error → role skipped.
|
||||
*/
|
||||
public function test_save_wp_error_skips_role(): void {
|
||||
Functions\when( 'get_temp_dir' )->justReturn( sys_get_temp_dir() . '/' );
|
||||
Functions\when( 'wp_get_image_editor' )->justReturn(
|
||||
$this->mock_editor_save_error( 1200, 630 )
|
||||
);
|
||||
Functions\when( 'is_wp_error' )->alias( static function ( $val ) {
|
||||
return $val instanceof \WP_Error;
|
||||
} );
|
||||
|
||||
$editor = new \PRAutoBlogger_Image_Composer_Editor();
|
||||
$variants = $editor->compose_variants( 'fake_bytes', array( 'og' ), $this->layout() );
|
||||
|
||||
$this->assertSame( array(), $variants, 'Save WP_Error must yield no variants' );
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
// Happy path — OG resizes successfully.
|
||||
// ------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Successful cover_crop for 'og': variant shape matches expectations.
|
||||
* file_put_contents and file_get_contents are exercised via temp file
|
||||
* in the test runner's writable temp dir; the editor mock does not
|
||||
* actually modify the file, but the class reads it back and returns its
|
||||
* bytes.
|
||||
*/
|
||||
public function test_successful_og_resize_returns_correct_shape(): void {
|
||||
$temp_dir = sys_get_temp_dir() . '/';
|
||||
Functions\when( 'get_temp_dir' )->justReturn( $temp_dir );
|
||||
|
||||
$og_w = 1200;
|
||||
$og_h = 630;
|
||||
|
||||
Functions\when( 'wp_get_image_editor' )->alias(
|
||||
function () use ( $og_w, $og_h ) {
|
||||
return $this->mock_editor_success( $og_w, $og_h );
|
||||
}
|
||||
);
|
||||
Functions\when( 'is_wp_error' )->alias( static function ( $val ) {
|
||||
return $val instanceof \WP_Error;
|
||||
} );
|
||||
|
||||
$editor = new \PRAutoBlogger_Image_Composer_Editor();
|
||||
$variants = $editor->compose_variants( 'fake_source_bytes', array( 'og' ), $this->layout() );
|
||||
|
||||
$this->assertCount( 1, $variants, 'Successful resize must emit exactly one variant' );
|
||||
$variant = $variants[0];
|
||||
$this->assertSame( 'og', $variant['role'] );
|
||||
$this->assertSame( 'image/png', $variant['mime_type'] );
|
||||
$this->assertSame( $og_w, $variant['width'] );
|
||||
$this->assertSame( $og_h, $variant['height'] );
|
||||
$this->assertIsString( $variant['bytes'] );
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------
|
||||
// compose_variants() geometry guard.
|
||||
// ------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* A role whose layout target has width=0 is skipped before any I/O —
|
||||
* no editor call, no variant emitted.
|
||||
*/
|
||||
public function test_zero_width_target_skips_role_before_editor(): void {
|
||||
// Make the 'og' slot have zero width so the guard fires before any I/O.
|
||||
$layout = array(
|
||||
'og' => array( 'width' => 0, 'height' => 630 ),
|
||||
);
|
||||
|
||||
// wp_get_image_editor must never be called.
|
||||
Functions\expect( 'wp_get_image_editor' )->never();
|
||||
Functions\when( 'is_wp_error' )->alias( static function ( $val ) {
|
||||
return $val instanceof \WP_Error;
|
||||
} );
|
||||
|
||||
$editor = new \PRAutoBlogger_Image_Composer_Editor();
|
||||
$variants = $editor->compose_variants( 'fake_bytes', array( 'og' ), $layout );
|
||||
|
||||
$this->assertSame( array(), $variants );
|
||||
}
|
||||
|
||||
/**
|
||||
* Role not present in layout skips cleanly.
|
||||
*/
|
||||
public function test_missing_role_in_layout_emits_no_variant(): void {
|
||||
Functions\expect( 'wp_get_image_editor' )->never();
|
||||
Functions\when( 'is_wp_error' )->alias( static function ( $val ) {
|
||||
return $val instanceof \WP_Error;
|
||||
} );
|
||||
|
||||
$editor = new \PRAutoBlogger_Image_Composer_Editor();
|
||||
$variants = $editor->compose_variants( 'fake_bytes', array( 'nonexistent_role' ), array() );
|
||||
|
||||
$this->assertSame( array(), $variants );
|
||||
}
|
||||
}
|
||||
@@ -322,4 +322,30 @@ class ImageComposerTest extends BaseTestCase {
|
||||
$this->assertStringStartsWith( 'prautoblogger_', $key );
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Ladder rung 2 forced via the override filter ('gd'): compose() emits the
|
||||
* pass-through featured variant as first element, and fires exactly one WARNING.
|
||||
* The Imagick renderer must never be called on this rung.
|
||||
*
|
||||
* Source: QA verdict 2026-06-11-6f76df1.md P2-1 and CTO handoff
|
||||
* convo/prautoblogger/threads/2026-06-maintenance-v0194/01-cto-maintenance-handoff.md item 1.
|
||||
*/
|
||||
public function test_gd_rung_emits_passthrough_featured_and_single_warning(): void {
|
||||
Filters\expectApplied( 'prautoblogger_image_compose_capability' )->andReturn( 'gd' );
|
||||
|
||||
// Imagick renderer must not be invoked on the gd rung.
|
||||
$renderer = $this->createMock( \PRAutoBlogger_Image_Composer_Imagick::class );
|
||||
$renderer->expects( $this->never() )->method( 'compose_featured' );
|
||||
$renderer->expects( $this->never() )->method( 'compose_og' );
|
||||
$renderer->expects( $this->never() )->method( 'compose_square' );
|
||||
|
||||
$composer = new \PRAutoBlogger_Image_Composer( $renderer );
|
||||
$variants = $composer->compose( $this->image_data, $this->context() );
|
||||
|
||||
// Pass-through featured variant is always first.
|
||||
$this->assertNotEmpty( $variants );
|
||||
$this->assertSame( 'featured', $variants[0]['role'] );
|
||||
$this->assertSame( 'raw_base_bytes', $variants[0]['bytes'] );
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user