From 7a745f0869d0fc4abeb8667960715847e6faa74b Mon Sep 17 00:00:00 2001
From: Akanksha <akankshasingh.viet@gmail.com>
Date: Thu, 15 Aug 2024 15:50:03 -0300
Subject: [PATCH] DDST-454: Clean up

---
 .../Traits/IslandoraContentTypeTestTraits.php | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/tests/src/Traits/IslandoraContentTypeTestTraits.php b/tests/src/Traits/IslandoraContentTypeTestTraits.php
index 1cb2426..60c24a3 100644
--- a/tests/src/Traits/IslandoraContentTypeTestTraits.php
+++ b/tests/src/Traits/IslandoraContentTypeTestTraits.php
@@ -22,7 +22,7 @@
 use Drupal\Tests\user\Traits\UserCreationTrait;
 
 /**
- * Useful test traits for Islandora. Creates Islanodra node, media and files.
+ * Useful test traits for Islandora. Creates Islandora node, media and files.
  */
 trait IslandoraContentTypeTestTraits {
   use EntityReferenceFieldCreationTrait;
@@ -55,7 +55,7 @@ trait IslandoraContentTypeTestTraits {
   protected VocabularyInterface $modelsVocabulary;
 
   /**
-   * {@inheritDoc}
+   * Creates a node type, media type, and vocabulary for Islandora.
    */
   protected function prepareIslandoraContentType() : void {
     // Create content required for creating islandora-esque data.
@@ -84,8 +84,6 @@ protected function prepareIslandoraContentType() : void {
    *
    * @return \Drupal\node\NodeInterface
    *   A created (and saved) node entity.
-   *
-   * @throws \Drupal\Core\Entity\EntityStorageException
    */
   protected function createNode() : NodeInterface {
     if (empty($this->contentType)) {
@@ -104,8 +102,6 @@ protected function createNode() : NodeInterface {
    *
    * @return \Drupal\file\FileInterface
    *   A created (and saved) file entity.
-   *
-   * @throws \Drupal\Core\Entity\EntityStorageException
    */
   protected function createFile() : FileInterface {
     /** @var \Drupal\file\FileInterface $entity */
@@ -121,7 +117,7 @@ protected function createFile() : FileInterface {
    * @return string
    *   File URI.
    */
-  protected function createUri() {
+  protected function createUri(): string {
     $filepath = 'test file ' . $this->randomMachineName();
     $scheme = 'public';
     $filepath = $scheme . '://' . $filepath;
@@ -175,12 +171,17 @@ protected function getMediaFieldName() : string {
 
   /**
    * Helper; Creates the islandora models vocabulary.
+   *
+   * @return \Drupal\taxonomy\VocabularyInterface
+   *   The created vocabulary.
+   *
+   * @throws \Drupal\Core\Entity\EntityStorageException
    */
   protected function createModelsVocabulary() : Vocabulary {
     $vocabulary = $this->createVocabulary(['vid' => 'islandora_models']);
 
     // Create link type field on vocabulary for external uri.
-    $field_name = 'field_external_uri';
+    $field_name = IslandoraUtils::EXTERNAL_URI_FIELD;
 
     // Create a field with settings to validate.
     $storage_definition = [
@@ -206,6 +207,9 @@ protected function createModelsVocabulary() : Vocabulary {
 
   /**
    * Creates a non-islandora node.
+   *
+   * @return \Drupal\node\NodeInterface
+   *   A created (and saved) node entity.
    */
   public function createNonIslandoraNode(): NodeInterface {
     /** @var \Drupal\node\NodeInterface $entity */