Bail out early if possible

simplesamlphp · Dec 16, 2024 · edae558 · edae558
1 parent bed3740
commit edae558
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/TestUtils/SchemaValidationTestTrait.php b/src/TestUtils/SchemaValidationTestTrait.php
@@ -32,12 +32,17 @@ public function testSchemaValidation(): void
         if (!class_exists(self::$testedClass)) {
             $this->markTestSkipped(
                 'Unable to run ' . self::class . '::testSchemaValidation(). Please set ' . self::class
-                . ':$testedClass to a class-string representing the XML-class being tested',
+                . ':$testedClass to a class-string representing the XML-class being tested.',
+            );
+        } elseif (!(self::$testedClass instanceof SchemaValidatableElementInterface)) {
+            $this->markTestSkipped(
+                'Unable to run ' . self::class . '::testSchemaValidation() because the class set in ' . self::class
+                . ':$testedClass does not implement the SchemaValidableElementInterface.',
             );
         } elseif (empty(self::$xmlRepresentation)) {
             $this->markTestSkipped(
                 'Unable to run ' . self::class . '::testSchemaValidation(). Please set ' . self::class
-                . ':$xmlRepresentation to a DOMDocument representing the XML-class being tested',
+                . ':$xmlRepresentation to a DOMDocument representing the XML-class being tested.',
             );
         } else {
             // Validate before serialization

diff --git a/tests/Utils/URIElement.php b/tests/Utils/URIElement.php
@@ -5,9 +5,9 @@
 namespace SimpleSAML\Test\XML;
 
 use SimpleSAML\XML\AbstractElement;
-use SimpleSAML\XML\URIElementTrait;
 use SimpleSAML\XML\SchemaValidatableElementInterface;
 use SimpleSAML\XML\SchemaValidatableElementTrait;
+use SimpleSAML\XML\URIElementTrait;
 
 /**
  * Empty shell class for testing URIElement.