Added tests

Author: pookmish

composer.json

@@ -12,12 +12,25 @@
     "require": {
         "php": ">=8.1",
         "drupal/autologout": "^1 || ^2",
-        "drupal/core": "^10 || ^11",
+        "drupal/core": "^10.3 || ^11",
         "drupal/r4032login": "^2",
         "drupal/samlauth": "^3"
     },
+    "require-dev": {
+        "drupal/field_validation": "^3.0"
+    },
     "prefer-stable": true,
     "config": {
         "sort-packages": true
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\stanford_samlauth\\": "src"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Drupal\\Tests\\stanford_samlauth\\": "tests/src"
+        }
     }
 }

src/Drush/Commands/StanfordSamlAuthCommands.php renamed to src/Drush/Commands/StanfordSamlAuthDrushCommands.php

@@ -11,15 +11,17 @@
 use Drupal\stanford_samlauth\Form\SamlAuthCreateUserForm;
 use Drupal\user\RoleInterface;
 use Drush\Boot\DrupalBootLevels;
+use Drush\Commands\AutowireTrait;
 use Drush\Commands\DrushCommands;
 use Drush\Attributes as CLI;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Samlauth drush comamnds.
  */
 #[CLI\Bootstrap(DrupalBootLevels::FULL)]
-class StanfordSamlAuthCommands extends DrushCommands {
+class StanfordSamlAuthDrushCommands extends DrushCommands {
+
+  use AutowireTrait;
 
   /**
    * Config object of SAML settings.
@@ -29,29 +31,12 @@ class StanfordSamlAuthCommands extends DrushCommands {
   protected $samlConfig;
 
   /**
-   * A config object with stanford_ssp settings.
+   * A config object with stanford_samlauth settings.
    *
    * @var \Drupal\Core\Config\ImmutableConfig
    */
   protected $stanfordConfig;
 
-  /**
-   * Instantiates a new instance of the implementing class using autowiring.
-   *
-   * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
-   *   The service container this instance should use.
-   *
-   * @return static
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('externalauth.authmap'),
-      $container->get('form_builder'),
-      $container->get('config.factory'),
-      $container->get('entity_type.manager')
-    );
-  }
-
   /**
    * Drush command constructor.
    *

src/Form/SamlAuthCreateUserForm.php

@@ -106,7 +106,7 @@ public static function validateSunetId(array &$element, FormStateInterface $form
     }
 
     // Use the workgroup api to check for valid sunet.
-    /** @var \Drupal\stanford_ssp\Service\StanfordSSPWorkgroupApiInterface $workgroup_api */
+    /** @var \Drupal\stanford_samlauth\Service\WorkgroupApiInterface $workgroup_api */
     $workgroup_api = \Drupal::service('stanford_samlauth.workgroup_api');
     if ($workgroup_api->connectionSuccessful() && !$workgroup_api->isSunetValid($value)) {
       $form_state->setError($element, t('Invalid SunetID'));
@@ -186,7 +186,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->authmap->save($new_user, 'samlauth', $form_state->getValue('sunetid'));
     $this->messenger()
       ->addStatus($this->t('Successfully created SSO account for %user', ['%user' => $new_user->getAccountName()]));
-    $this->logger('stanford_ssp')
+    $this->logger('stanford_samlauth')
       ->info('Created User %name', ['%name' => $new_user->getAccountName()]);
 
     // Was the "notify" checkbox checked?

src/Plugin/FieldValidationRule/ValidSunetIDFieldValidationRule.php

@@ -37,6 +37,13 @@ public function defaultConfiguration() {
     return ['message' => 'This is not a valid SunetID.'] + parent::defaultConfiguration();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfiguration() {
+    return $this->configuration + parent::getConfiguration();
+  }
+
   /**
    * {@inheritdoc}
    */

src/Service/WorkgroupApiInterface.php

@@ -5,7 +5,7 @@
 /**
  * Interface StanfordSSPWorkgroupApiInterface.
  *
- * @package Drupal\stanford_ssp\Service
+ * @package Drupal\stanford_samlauth\Service
  */
 interface WorkgroupApiInterface {
 

stanford_samlauth.install

@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Migrate data from stanford_ssp module.
+ * Migrate data from stanford_samlauth module.
  */
 
 use Drupal\user\Entity\Role;

tests/src/Kernel/Drush/Commands/StanfordSspCommandsTest.php renamed to tests/src/Kernel/Drush/Commands/StanfordSamlAuthDrushCommandsTest.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\Tests\stanford_samlauth\Kernel\Drush\Commands;
 
-use Drupal\stanford_samlauth\Drush\Commands\StanfordSamlAuthCommands;
+use Drupal\stanford_samlauth\Drush\Commands\StanfordSamlAuthDrushCommands;
 use Drupal\stanford_samlauth\Service\WorkgroupApiInterface;
 use Drupal\Tests\stanford_samlauth\Kernel\StanfordSamlAuthTestBase;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -11,14 +11,14 @@
  * Class StanfordSspCommandsTest
  *
  * @package Drupal\Tests\stanford_samlauth\Kernel\Commands
- * @coversDefaultClass \Drupal\stanford_samlauth\Drush\Commands\StanfordSamlAuthCommands
+ * @coversDefaultClass \Drupal\stanford_samlauth\Drush\Commands\StanfordSamlAuthDrushCommands
  */
-class StanfordSspCommandsTest extends StanfordSamlAuthTestBase {
+class StanfordSamlAuthDrushCommandsTest extends StanfordSamlAuthTestBase {
 
   /**
    * Drush command service.
    *
-   * @var \Drupal\stanford_samlauth\Drush\Commands\StanfordSamlAuthCommands
+   * @var \Drupal\stanford_samlauth\Drush\Commands\StanfordSamlAuthDrushCommands
    */
   protected $commandObject;
 
@@ -40,7 +40,7 @@ public function setup(): void {
     $config_factory = \Drupal::configFactory();
     $entity_type_manager = \Drupal::entityTypeManager();
 
-    $this->commandObject = new StanfordSamlAuthCommands($authmap, $form_builder, $config_factory, $entity_type_manager);
+    $this->commandObject = new StanfordSamlAuthDrushCommands($authmap, $form_builder, $config_factory, $entity_type_manager);
     $this->commandObject->setLogger(\Drupal::logger('stanford_samlauth'));
     $this->commandObject->setOutput($this->createMock(OutputInterface::class));
 

tests/src/Kernel/StanfordSamlAuthTestBase.php

@@ -3,7 +3,7 @@
 namespace Drupal\Tests\stanford_samlauth\Kernel;
 
 use Drupal\KernelTests\KernelTestBase;
-use Drupal\stanford_samlauth\Drush\Commands\StanfordSamlAuthCommands;
+use Drupal\stanford_samlauth\Drush\Commands\StanfordSamlAuthDrushCommands;
 use Drupal\user\Entity\Role;
 use Symfony\Component\Console\Output\OutputInterface;
 

tests/src/Unit/Plugin/FieldValidationRule/ValidSunetIDFieldValidationRuleTest.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Drupal\Tests\stanford_samlauth\Unit\Plugin\Validation\Constraint;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\Form\FormState;
+use Drupal\Core\Logger\LoggerChannelFactoryInterface;
+use Drupal\Core\Logger\LoggerChannelInterface;
+use Drupal\Core\Utility\Token;
+use Drupal\stanford_samlauth\Plugin\FieldValidationRule\ValidSunetIDFieldValidationRule;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\stanford_samlauth\Plugin\FieldValidationRule\ValidSunetIDFieldValidationRule
+ */
+class ValidSunetIDFieldValidationRuleTest extends UnitTestCase {
+
+  protected $validationRule;
+
+  protected function setUp(): void {
+    parent::setUp();
+
+    $logger_channel = $this->createMock(LoggerChannelInterface::class);
+
+    $logger = $this->createMock(LoggerChannelFactoryInterface::class);
+    $logger->method('get')->willReturn($logger_channel);
+
+    $container = new ContainerBuilder();
+    $container->set('logger.factory', $logger);
+    $container->set('token', $this->createMock(Token::class));
+    $container->set('string_translation', $this->getStringTranslationStub());
+    \Drupal::setContainer($container);
+
+    $this->validationRule = ValidSunetIDFieldValidationRule::create($container, [], 'foo', []);
+  }
+
+  public function testFieldValidation() {
+    $this->assertEquals('ValidSunetID', $this->validationRule->getConstraintName());
+    $this->assertTrue($this->validationRule->isPropertyConstraint());
+
+    $form = [];
+    $form_state = new FormState();
+    $this->assertArrayHasKey('message', $this->validationRule->buildConfigurationForm($form, $form_state));
+
+    $form_state->setValue('message', 'foobarbaz');
+    $this->validationRule->submitConfigurationForm($form, $form_state);
+
+    $this->assertEquals('foobarbaz', $this->validationRule->getConfiguration()['message']);
+  }
+
+}

tests/src/Unit/Plugin/Validation/Constraint/ValidSunetIDConstraintValidatorTest.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Drupal\Tests\stanford_samlauth\Unit\Plugin\Validation\Constraint;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\stanford_samlauth\Plugin\Validation\Constraint\ValidSunetIDConstraint;
+use Drupal\stanford_samlauth\Plugin\Validation\Constraint\ValidSunetIDConstraintValidator;
+use Drupal\stanford_samlauth\Service\WorkgroupApiInterface;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\Validator\Context\ExecutionContextInterface;
+
+/**
+ * @coversDefaultClass \Drupal\stanford_samlauth\Plugin\Validation\Constraint\ValidSunetIDConstraintValidator
+ */
+class ValidSunetIDConstraintValidatorTest extends UnitTestCase {
+
+  protected $plugin;
+
+  protected function setUp(): void {
+    parent::setUp();
+
+    $workgroup_api = $this->createMock(WorkgroupApiInterface::class);
+    $workgroup_api->method('connectionSuccessful')->willReturn(TRUE);
+    $workgroup_api->method('isSunetValid')->willReturn(FALSE);
+
+    $container = new ContainerBuilder();
+    $container->set('stanford_samlauth.workgroup_api', $workgroup_api);
+    $this->plugin = ValidSunetIDConstraintValidator::create($container);
+
+    $context = $this->createMock(ExecutionContextInterface::class);
+    $this->plugin->initialize($context);
+  }
+
+  public function testValidation() {
+    $constraint = new ValidSunetIDConstraint();
+    $this->assertNull($this->plugin->validate('foobar', $constraint));
+  }
+
+}