Merge pull request #78 from creative-commoners/pulls/5.2/assert-contains

MNT Refactor test to use assertStringContainsString()
symbiote · Jan 19, 2022 · 0527e8a · 0527e8a
2 parents 551471f + 89ce733
commit 0527e8a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 18 deletions.
diff --git a/tests/MultiValueFieldTest.php b/tests/MultiValueFieldTest.php
@@ -18,42 +18,42 @@ class MultiValueFieldTest extends SapphireTest
 
     public function testUpdate()
     {
-        $obj          = new MultiValueFieldTest_DataObject();
+        $obj = new MultiValueFieldTest_DataObject();
         $obj->MVField = ['One', 'Two'];
         $obj->write();
-        $obj          = MultiValueFieldTest_DataObject::get()->byID($obj->ID);
+        $obj = MultiValueFieldTest_DataObject::get()->byID($obj->ID);
         $obj->MVField = ['Three'];
         $obj->write();
         $this->assertEquals(['Three'], $obj->obj('MVField')->getValues());
     }
 
     public function testSetArrayAsProperty()
     {
-        $obj          = new MultiValueFieldTest_DataObject();
+        $obj = new MultiValueFieldTest_DataObject();
         $obj->MVField = ['One', 'Two'];
         $obj->write();
-        $obj          = MultiValueFieldTest_DataObject::get()->byID($obj->ID);
+        $obj = MultiValueFieldTest_DataObject::get()->byID($obj->ID);
         $this->assertNotNull($obj->MVField);
         $this->assertEquals(['One', 'Two'], $obj->obj('MVField')->getValues());
     }
 
     public function testSetSerialisedStringAsProperty()
     {
-        $obj          = new MultiValueFieldTest_DataObject();
+        $obj = new MultiValueFieldTest_DataObject();
         $obj->MVField = serialize(['One', 'Two']);
         $obj->write();
-        $obj          = MultiValueFieldTest_DataObject::get()->byID($obj->ID);
+        $obj = MultiValueFieldTest_DataObject::get()->byID($obj->ID);
         $this->assertNotNull($obj->MVField);
 
         $this->assertEquals(['One', 'Two'], $obj->obj('MVField')->getValues());
     }
 
     public function testSetJsonStringAsProperty()
     {
-        $obj          = new MultiValueFieldTest_DataObject();
+        $obj = new MultiValueFieldTest_DataObject();
         $obj->MVField = json_encode(['One', 'Two']);
         $obj->write();
-        $obj          = MultiValueFieldTest_DataObject::get()->byID($obj->ID);
+        $obj = MultiValueFieldTest_DataObject::get()->byID($obj->ID);
         $this->assertNotNull($obj->MVField);
 
         $this->assertEquals(['One', 'Two'], $obj->obj('MVField')->getValues());
@@ -63,13 +63,9 @@ public function testSetEmptyArrayAsValue()
     {
 
         $field = new MultiValueField();
-
         $field->setValue(['one' => 'one']);
-
         $this->assertEquals(['one' => 'one'], $field->getValue());
-
         $field->setValue([]);
-
         $this->assertEquals([], $field->getValue());
     }
 

diff --git a/tests/MultiValueTextFieldTest.php b/tests/MultiValueTextFieldTest.php
@@ -17,16 +17,17 @@ class MultiValueTextFieldTest extends SapphireTest
     public function testAttributesGeneration()
     {
         $field = MultiValueTextField::create('TestTextField', 'Test Text Field');
+        $keySep = MultiValueTextField::KEY_SEP;
 
-        $this->assertContains('id="' . $field->ID() . '"', $field->forTemplate());
-        $this->assertContains('id="' . $field->ID() . MultiValueTextField::KEY_SEP . '0"', $field->forTemplate());
-        $this->assertNotContains('id="' . $field->ID() . MultiValueTextField::KEY_SEP . '1"', $field->forTemplate());
+        $this->assertStringContainsString('id="' . $field->ID() . '"', $field->forTemplate());
+        $this->assertStringContainsString('id="' . $field->ID() . $keySep . '0"', $field->forTemplate());
+        $this->assertStringNotContainsString('id="' . $field->ID() . $keySep . '1"', $field->forTemplate());
 
         $field->setValue(['one']);
-        $this->assertContains('id="' . $field->ID() . MultiValueTextField::KEY_SEP . '1"', $field->forTemplate());
-        $this->assertNotContains('id="' . $field->ID() . MultiValueTextField::KEY_SEP . '2"', $field->forTemplate());
+        $this->assertStringContainsString('id="' . $field->ID() . $keySep . '1"', $field->forTemplate());
+        $this->assertStringNotContainsString('id="' . $field->ID() . $keySep . '2"', $field->forTemplate());
 
         $field->setValue(['one', 'two']);
-        $this->assertContains('id="' . $field->ID() . MultiValueTextField::KEY_SEP . '2"', $field->forTemplate());
+        $this->assertStringContainsString('id="' . $field->ID() . $keySep . '2"', $field->forTemplate());
     }
 }