MAGETWO-38686: Merge and Fix Builds

Author: anupdugar

dev/tests/integration/testsuite/Magento/Ui/Model/Resource/BookmarkRepositoryTest.php

@@ -11,7 +11,8 @@
 use Magento\Ui\Api\Data\BookmarkInterface;
 
 /**
- * @magentoDataFixture Magento/Customer/_files/customer.php
+ * @magentoAppIsolation enabled
+ * @magentoAppArea adminhtml
  */
 class BookmarkRepositoryTest extends \PHPUnit_Framework_TestCase
 {
@@ -30,22 +31,39 @@ class BookmarkRepositoryTest extends \PHPUnit_Framework_TestCase
      */
     protected $bookmark;
 
+    /**
+     * @var \Magento\Customer\Api\CustomerRepositoryInterface
+     */
+    protected $customerRepository;
+
     protected function setUp()
     {
         $this->bookmarkRepository = Bootstrap::getObjectManager()
             ->create('Magento\Ui\Model\Resource\BookmarkRepository');
         $this->bookmarkFactory = Bootstrap::getObjectManager()->create('Magento\Ui\Model\BookmarkFactory');
+
         /** @var $customerRepository \Magento\Customer\Api\CustomerRepositoryInterface */
-        $customerRepository = Bootstrap::getObjectManager()
+        $this->customerRepository = Bootstrap::getObjectManager()
             ->create('Magento\Customer\Api\CustomerRepositoryInterface');
-        $customerId = $customerRepository->get('customer@example.com')->getId();
-        $this->bookmark = $this->bookmarkFactory->create()->setUserId($customerId)->setTitle('test');
+        $newCustomerEntity = Bootstrap::getObjectManager()
+            ->create('Magento\Customer\Api\Data\CustomerInterfaceFactory')
+            ->create()
+            ->setStoreId(1)
+            ->setWebsiteId(1)
+            ->setEmail('bookmark_user@example.com')
+            ->setFirstname('TestFn')
+            ->setLastname('TestLn')
+            ->setGroupId(1);
+        $newCustomerEntity = $this->customerRepository->save($newCustomerEntity);
+
+        $this->bookmark = $this->bookmarkFactory->create()->setUserId($newCustomerEntity->getId())->setTitle('test');
         $this->bookmark = $this->bookmarkRepository->save($this->bookmark);
     }
 
     protected function tearDown()
     {
         $this->bookmarkRepository->delete($this->bookmark);
+        $this->customerRepository->delete($this->customerRepository->get('bookmark_user@example.com'));
     }
 
     public function testGetList()