diff --git a/src/Tests/ImageEffectsConvolutionTest.php b/src/Tests/ImageEffectsConvolutionTest.php index 48108cf..25a5503 100644 --- a/src/Tests/ImageEffectsConvolutionTest.php +++ b/src/Tests/ImageEffectsConvolutionTest.php @@ -6,7 +6,7 @@ use Drupal\system\Tests\Image\ToolkitTestBase; /** * Tests that the image effects pass parameters to the toolkit correctly. * - * @group image + * @group Image Effects */ class ImageEffectsConvolutionTest extends ToolkitTestBase { diff --git a/src/Tests/ImageEffectsStripMetadataTest.php b/src/Tests/ImageEffectsStripMetadataTest.php index 73e35aa..ade224e 100644 --- a/src/Tests/ImageEffectsStripMetadataTest.php +++ b/src/Tests/ImageEffectsStripMetadataTest.php @@ -27,7 +27,7 @@ class ImageEffectsStripMetadataTest extends ImageEffectsTestBase { $effect = [ 'id' => 'image_effects_strip_metadata', ]; - $this->addEffectToTestStyle($effect); + $this->addEffectToTestStyle($effect, FALSE); // Test operations on toolkits. $this->executeTestOnToolkits([$this, 'doTestStripMetadataOperations']); diff --git a/src/Tests/ImageEffectsTestBase.php b/src/Tests/ImageEffectsTestBase.php index 11f0007..9fec886 100644 --- a/src/Tests/ImageEffectsTestBase.php +++ b/src/Tests/ImageEffectsTestBase.php @@ -59,16 +59,12 @@ abstract class ImageEffectsTestBase extends WebTestBase { ]); $this->drupalLogin($this->adminUser); - // Create a test image style. - $style_name = 'image_effects_test'; - $style_label = 'Image Effects Test'; - $style_path = 'admin/config/media/image-styles/manage/' . $style_name; - $edit = [ - 'name' => $style_name, - 'label' => $style_label, - ]; - $this->drupalPostForm('admin/config/media/image-styles/add', $edit, t('Create new style')); - $this->assertRaw(t('Style %name was created.', ['%name' => $style_label])); + // Create the test image style. + $this->imageStyle = ImageStyle::create([ + 'name' => 'image_effects_test', + 'label' => 'Image Effects Test', + ]); + $this->assertEqual(SAVED_NEW, $this->imageStyle->save()); } /** @@ -83,31 +79,18 @@ abstract class ImageEffectsTestBase extends WebTestBase { * @return string * The UUID of the newly added effect. */ - protected function addEffectToTestStyle($effect) { - $style_name = 'image_effects_test'; - $style_path = 'admin/config/media/image-styles/manage/' . $style_name; - - // Get image style prior to adding a new effect. - $image_style_pre = ImageStyle::load($style_name); - - // Add the effect. - $this->drupalPostForm($style_path, array('new' => $effect['id']), t('Add')); - if (!empty($effect['data'])) { - $effect_edit = []; - foreach($effect['data'] as $field => $value) { - $effect_edit['data[' . $field . ']'] = $value; - } - $this->drupalPostForm(NULL, $effect_edit, t('Add effect')); + protected function addEffectToTestStyle($effect, $check_form = TRUE) { + $uuid = $this->imageStyle->addImageEffect($effect); + $this->assertEqual(SAVED_UPDATED, $this->imageStyle->save()); + + // Check the form. + if ($check_form === TRUE) { + $style_name = 'image_effects_test'; + $style_path = 'admin/config/media/image-styles/manage/' . $style_name; + $this->drupalPostForm($style_path . '/effects/' . $uuid, [], t('Update effect')); } - // Get UUID of newly added effect. - $image_style_post = ImageStyle::load($style_name); - foreach ($image_style_post->getEffects() as $uuid => $effect) { - if (!$image_style_pre->getEffects()->has($uuid)) { - return $uuid; - } - } - return NULL; + return $uuid; } /** @@ -117,9 +100,9 @@ abstract class ImageEffectsTestBase extends WebTestBase { * The UUID of the effect to remove. */ protected function removeEffectFromTestStyle($uuid) { - $style_name = 'image_effects_test'; - $style_path = 'admin/config/media/image-styles/manage/' . $style_name; - $this->drupalPostForm($style_path . '/effects/' . $uuid . '/delete', [], t('Delete')); + $effect = $this->imageStyle->getEffect($uuid); + $this->imageStyle->deleteImageEffect($effect); + $this->assertEqual(SAVED_UPDATED, $this->imageStyle->save()); } /** @@ -152,6 +135,10 @@ abstract class ImageEffectsTestBase extends WebTestBase { * Executes a test method on requested toolkits. */ protected function executeTestOnToolkits($method) { +debug($method[1]); +$mx = $method[1]; +$this->{$mx}(); +/* foreach ($this->toolkits as $toolkit_id) { // Manage toolkit specific configuration. switch ($toolkit_id) { @@ -180,6 +167,7 @@ abstract class ImageEffectsTestBase extends WebTestBase { } } +*/ } /** diff --git a/src/Tests/ImageEffectsTextOverlayTest.php b/src/Tests/ImageEffectsTextOverlayTest.php index 8b60b55..0ef8c76 100644 --- a/src/Tests/ImageEffectsTextOverlayTest.php +++ b/src/Tests/ImageEffectsTextOverlayTest.php @@ -27,12 +27,44 @@ class ImageEffectsTextOverlayTest extends ImageEffectsTestBase { $effect = [ 'id' => 'image_effects_text_overlay', 'data' => [ - 'text_default][text_string' => 'the quick brown fox jumps over the lazy dog', - 'font][uri' => drupal_get_path('module', 'image_effects') . '/tests/fonts/LinLibertineTTF_5.3.0_2012_07_02/LinLibertine_Rah.ttf', - 'font][size' => 40, - 'layout][position][extended_color][container][transparent' => FALSE, - 'layout][position][extended_color][container][hex' => '#FF00FF', - 'layout][position][extended_color][container][opacity' => 100, + 'text_string' => 'the quick brown fox jumps over the lazy dog', + 'font' => [ + 'uri' => drupal_get_path('module', 'image_effects') . '/tests/fonts/LinLibertineTTF_5.3.0_2012_07_02/LinLibertine_Rah.ttf', + 'size' => 40, + 'name' => 'Linux Libertine', + 'angle' => 0, + 'color' => '#000000FF', + 'stroke_mode' => 'outline', + 'stroke_color' => '#000000FF', + 'outline_top' => 0, + 'outline_right' => 0, + 'outline_bottom' => 0, + 'outline_left' => 0, + 'shadow_x_offset' => 1, + 'shadow_y_offset' => 1, + 'shadow_width' => 0, + 'shadow_height' => 0, + ], + 'text' => [ + 'maximum_width' => 0, + 'fixed_width' => FALSE, + 'align' => 'left', + 'line_spacing' => 0, + 'case_format' => '', + ], + 'layout' => [ + 'padding_top' => 0, + 'padding_right' => 0, + 'padding_bottom' => 0, + 'padding_left' => 0, + 'x_pos' => 'center', + 'y_pos' => 'center', + 'x_offset' => 0, + 'y_offset' => 0, + 'background_color' => NULL, + 'overflow_action' => 'extend', + 'extended_color' => '#FF00FFFF', + ], ], ]; $this->addEffectToTestStyle($effect); diff --git a/tests/modules/image_effects_module_test/src/Plugin/ImageEffect/ImageSelectionImageEffect.php b/tests/modules/image_effects_module_test/src/Plugin/ImageEffect/ImageSelectionImageEffect.php index 9372ee7..34a4d42 100644 --- a/tests/modules/image_effects_module_test/src/Plugin/ImageEffect/ImageSelectionImageEffect.php +++ b/tests/modules/image_effects_module_test/src/Plugin/ImageEffect/ImageSelectionImageEffect.php @@ -74,7 +74,7 @@ class ImageSelectionImageEffect extends ConfigurableImageEffectBase implements C public function buildConfigurationForm(array $form, FormStateInterface $form_state) { // Image selection. $options = [ - '#default_value' => isset($this->configuration['image_uri']) ? pathinfo($this->configuration['image_uri'], PATHINFO_BASENAME) : '', + '#default_value' => $this->configuration['image_uri'], ]; $form['image_uri'] = $this->imageSelector->selectionElement($options);