aimeos / ai-ezpublish

lib/custom/setup/EzuserAddAddress.php

Indentation +116 added lines, -116 removed lines

@@ -14,120 +14,120 @@
  */
 class EzuserAddAddress extends \Aimeos\MW\Setup\Task\TablesCreateMShop
 {
-	/**
-	 * Returns the list of task names which depends on this task.
-	 *
-	 * @return array List of task names
-	 */
-	public function getPreDependencies()
-	{
-		return array( 'TablesCreateEzpublish' );
-	}
-
-
-	/**
-	 * Migrate database schema
-	 */
-	public function migrate()
-	{
-		$this->msg( 'Adding address fields to ezuser table', 0 );
-
-		$dbal = $this->getConnection( 'db-customer' )->getRawObject();
-
-		if( !( $dbal instanceof \Doctrine\DBAL\Connection ) ) {
-			throw new \Aimeos\MW\Setup\Exception( 'Not a DBAL connection' );
-		}
-
-
-		$fromSchema = $dbal->getSchemaManager()->createSchema();
-		$toSchema = clone $fromSchema;
-
-		$this->addIndexes( $this->addColumns( $toSchema->getTable( 'ezuser' ) ) );
-		$sql = $fromSchema->getMigrateToSql( $toSchema, $dbal->getDatabasePlatform() );
-
-		if( $sql !== array() )
-		{
-			$this->executeList( $sql, 'db-customer' );
-			$this->status( 'done' );
-		}
-		else
-		{
-			$this->status( 'OK' );
-		}
-	}
-
-
-	/**
-	 * Adds the missing columns to the table
-	 *
-	 * @param \Doctrine\DBAL\Schema\Table $table Table object
-	 * @return \Doctrine\DBAL\Schema\Table Updated table object
-	 */
-	protected function addColumns( \Doctrine\DBAL\Schema\Table $table )
-	{
-		$columns = array(
-			'company' => array( 'string', array( 'length' => 100 ) ),
-			'vatid' => array( 'string', array( 'length' => 32 ) ),
-			'salutation' => array( 'string', array( 'length' => 8 ) ),
-			'title' => array( 'string', array( 'length' => 64 ) ),
-			'firstname' => array( 'string', array( 'length' => 64 ) ),
-			'lastname' => array( 'string', array( 'length' => 64 ) ),
-			'address1' => array( 'string', array( 'length' => 255 ) ),
-			'address2' => array( 'string', array( 'length' => 255 ) ),
-			'address3' => array( 'string', array( 'length' => 255 ) ),
-			'postal' => array( 'string', array( 'length' => 16 ) ),
-			'city' => array( 'string', array( 'length' => 255 ) ),
-			'state' => array( 'string', array( 'length' => 255 ) ),
-			'langid' => array( 'string', array( 'length' => 5, 'notnull' => false ) ),
-			'countryid' => array( 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) ),
-			'telephone' => array( 'string', array( 'length' => 32 ) ),
-			'telefax' => array( 'string', array( 'length' => 32 ) ),
-			'website' => array( 'string', array( 'length' => 255 ) ),
-			'birthday' => array( 'date', array( 'notnull' => false ) ),
-			'vdate' => array( 'date', array( 'notnull' => false ) ),
-			'status' => array( 'smallint', array() ),
-			'mtime' => array( 'datetime', array() ),
-			'ctime' => array( 'datetime', array() ),
-			'editor' => array( 'string', array( 'length' => 255 ) ),
-		);
-
-		foreach( $columns as $name => $def )
-		{
-			if( $table->hasColumn( $name ) === false ) {
-				$table->addColumn( $name, $def[0], $def[1] );
-			}
-		}
-
-		return $table;
-	}
-
-
-	/**
-	 * Adds the missing indexes to the table
-	 *
-	 * @param \Doctrine\DBAL\Schema\Table $table Table object
-	 * @return \Doctrine\DBAL\Schema\Table Updated table object
-	 */
-	protected function addIndexes( \Doctrine\DBAL\Schema\Table $table )
-	{
-		$indexes = array(
-			'idx_ezpus_langid' => array( 'langid' ),
-			'idx_ezpus_status_ln_fn' => array( 'status', 'lastname', 'firstname' ),
-			'idx_ezpus_status_ad1_ad2' => array( 'status', 'address1', 'address2' ),
-			'idx_ezpus_status_postal_city' => array( 'status', 'postal', 'city' ),
-			'idx_ezpus_lastname' => array( 'lastname' ),
-			'idx_ezpus_address1' => array( 'address1' ),
-			'idx_ezpus_postal' => array( 'postal' ),
-			'idx_ezpus_city' => array( 'city' ),
-		);
-
-		foreach( $indexes as $name => $def )
-		{
-			if( $table->hasIndex( $name ) === false ) {
-				$table->addIndex( $def, $name );
-			}
-		}
-
-		return $table;
-	}
+    /**
+     * Returns the list of task names which depends on this task.
+     *
+     * @return array List of task names
+     */
+    public function getPreDependencies()
+    {
+        return array( 'TablesCreateEzpublish' );
+    }
+
+
+    /**
+     * Migrate database schema
+     */
+    public function migrate()
+    {
+        $this->msg( 'Adding address fields to ezuser table', 0 );
+
+        $dbal = $this->getConnection( 'db-customer' )->getRawObject();
+
+        if( !( $dbal instanceof \Doctrine\DBAL\Connection ) ) {
+            throw new \Aimeos\MW\Setup\Exception( 'Not a DBAL connection' );
+        }
+
+
+        $fromSchema = $dbal->getSchemaManager()->createSchema();
+        $toSchema = clone $fromSchema;
+
+        $this->addIndexes( $this->addColumns( $toSchema->getTable( 'ezuser' ) ) );
+        $sql = $fromSchema->getMigrateToSql( $toSchema, $dbal->getDatabasePlatform() );
+
+        if( $sql !== array() )
+        {
+            $this->executeList( $sql, 'db-customer' );
+            $this->status( 'done' );
+        }
+        else
+        {
+            $this->status( 'OK' );
+        }
+    }
+
+
+    /**
+     * Adds the missing columns to the table
+     *
+     * @param \Doctrine\DBAL\Schema\Table $table Table object
+     * @return \Doctrine\DBAL\Schema\Table Updated table object
+     */
+    protected function addColumns( \Doctrine\DBAL\Schema\Table $table )
+    {
+        $columns = array(
+            'company' => array( 'string', array( 'length' => 100 ) ),
+            'vatid' => array( 'string', array( 'length' => 32 ) ),
+            'salutation' => array( 'string', array( 'length' => 8 ) ),
+            'title' => array( 'string', array( 'length' => 64 ) ),
+            'firstname' => array( 'string', array( 'length' => 64 ) ),
+            'lastname' => array( 'string', array( 'length' => 64 ) ),
+            'address1' => array( 'string', array( 'length' => 255 ) ),
+            'address2' => array( 'string', array( 'length' => 255 ) ),
+            'address3' => array( 'string', array( 'length' => 255 ) ),
+            'postal' => array( 'string', array( 'length' => 16 ) ),
+            'city' => array( 'string', array( 'length' => 255 ) ),
+            'state' => array( 'string', array( 'length' => 255 ) ),
+            'langid' => array( 'string', array( 'length' => 5, 'notnull' => false ) ),
+            'countryid' => array( 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) ),
+            'telephone' => array( 'string', array( 'length' => 32 ) ),
+            'telefax' => array( 'string', array( 'length' => 32 ) ),
+            'website' => array( 'string', array( 'length' => 255 ) ),
+            'birthday' => array( 'date', array( 'notnull' => false ) ),
+            'vdate' => array( 'date', array( 'notnull' => false ) ),
+            'status' => array( 'smallint', array() ),
+            'mtime' => array( 'datetime', array() ),
+            'ctime' => array( 'datetime', array() ),
+            'editor' => array( 'string', array( 'length' => 255 ) ),
+        );
+
+        foreach( $columns as $name => $def )
+        {
+            if( $table->hasColumn( $name ) === false ) {
+                $table->addColumn( $name, $def[0], $def[1] );
+            }
+        }
+
+        return $table;
+    }
+
+
+    /**
+     * Adds the missing indexes to the table
+     *
+     * @param \Doctrine\DBAL\Schema\Table $table Table object
+     * @return \Doctrine\DBAL\Schema\Table Updated table object
+     */
+    protected function addIndexes( \Doctrine\DBAL\Schema\Table $table )
+    {
+        $indexes = array(
+            'idx_ezpus_langid' => array( 'langid' ),
+            'idx_ezpus_status_ln_fn' => array( 'status', 'lastname', 'firstname' ),
+            'idx_ezpus_status_ad1_ad2' => array( 'status', 'address1', 'address2' ),
+            'idx_ezpus_status_postal_city' => array( 'status', 'postal', 'city' ),
+            'idx_ezpus_lastname' => array( 'lastname' ),
+            'idx_ezpus_address1' => array( 'address1' ),
+            'idx_ezpus_postal' => array( 'postal' ),
+            'idx_ezpus_city' => array( 'city' ),
+        );
+
+        foreach( $indexes as $name => $def )
+        {
+            if( $table->hasIndex( $name ) === false ) {
+                $table->addIndex( $def, $name );
+            }
+        }
+
+        return $table;
+    }
 }

lib/custom/setup/unittest/CustomerAddEzpublishTestData.php

Indentation +105 added lines, -105 removed lines

@@ -14,119 +14,119 @@
  */
 class CustomerAddEzpublishTestData extends \Aimeos\MW\Setup\Task\CustomerAddTestData
 {
-	/**
-	 * Returns the list of task names which this task depends on.
-	 *
-	 * @return string[] List of task names
-	 */
-	public function getPreDependencies()
-	{
-		return array( 'TablesCreateEzpublish', 'EzuserAddAddress', 'MShopSetLocale', 'MediaAddTestData' );
-	}
-
-
-	/**
-	 * Adds attribute test data.
-	 */
-	public function migrate()
-	{
-		$iface = '\\Aimeos\\MShop\\Context\\Item\\Iface';
-		if( !( $this->additional instanceof $iface ) ) {
-			throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) );
-		}
-
-		$context = $this->getEzContext( $this->additional );
-
-		$this->msg( 'Adding ezPublish customer test data', 0 );
-
-		$parentIds = array();
-		$ds = DIRECTORY_SEPARATOR;
-		$context->setEditor( 'ai-ezpublish:unittest' );
-		$path = __DIR__ . $ds . 'data' . $ds . 'customer.php';
-
-		if( ( $testdata = include( $path ) ) === false ){
-			throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer domain', $path ) );
-		}
-
-
-		$customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context, 'Ezpublish' );
-		$customerAddressManager = $customerManager->getSubManager( 'address', 'Ezpublish' );
-
-		$search = $customerManager->createSearch();
-		$search->setConditions( $search->compare( '==', 'customer.code', array( 'UTC001', 'UTC002', 'UTC003' ) ) );
-		$items = $customerManager->searchItems( $search );
-
-		$this->conn->begin();
-
-		$customerManager->deleteItems( array_keys( $items ) );
-		$parentIds = $this->addCustomerData( $testdata, $customerManager, $customerAddressManager->createItem() );
-		$this->addCustomerAddressData( $testdata, $customerAddressManager, $parentIds );
-
-		$this->conn->commit();
-
-
-		$this->status( 'done' );
-	}
-
-
-	/**
-	 * Returns the Ezpublish context
-	 *
-	 * @param \Aimeos\MShop\Context\Item\Iface $context Context object
-	 * @return \Aimeos\MShop\Context\Item\Ezpublish Ezpublish context object
-	 */
-	protected function getEzContext( \Aimeos\MShop\Context\Item\Iface $context )
-	{
-		$class = '\Aimeos\MShop\Context\Item\Ezpublish';
-		if( is_a( $context, $class ) ) {
-			return $context;
-		}
-
-		$ezContext = new \Aimeos\MShop\Context\Item\Ezpublish();
-		$ezContext->setDatabaseManager( clone $context->getDatabaseManager() );
-		$ezContext->setSession( clone $context->getSession() );
-		$ezContext->setLogger( clone $context->getLogger() );
-		$ezContext->setLocale( clone $context->getLocale() );
-		$ezContext->setConfig( clone $context->getConfig() );
-		$ezContext->setCache( clone $context->getCache() );
-
-
-		$ezContext->setEzUser( function( $code, $email, $password ) use ( $context ) {
-
-			$id = mt_rand( -0x7fffffff,-1 );
-			$dbm = $context->getDatabaseManager();
-			$dbconf = $context->getConfig()->get( 'resource/db-customer' );
-			$dbname = ( $dbconf ? 'db-customer' : 'db' );
-			$conn = $dbm->acquire( $dbname );
-
-			try
-			{
-				$stmt = $conn->create( 'INSERT INTO "ezuser" (
+    /**
+     * Returns the list of task names which this task depends on.
+     *
+     * @return string[] List of task names
+     */
+    public function getPreDependencies()
+    {
+        return array( 'TablesCreateEzpublish', 'EzuserAddAddress', 'MShopSetLocale', 'MediaAddTestData' );
+    }
+
+
+    /**
+     * Adds attribute test data.
+     */
+    public function migrate()
+    {
+        $iface = '\\Aimeos\\MShop\\Context\\Item\\Iface';
+        if( !( $this->additional instanceof $iface ) ) {
+            throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) );
+        }
+
+        $context = $this->getEzContext( $this->additional );
+
+        $this->msg( 'Adding ezPublish customer test data', 0 );
+
+        $parentIds = array();
+        $ds = DIRECTORY_SEPARATOR;
+        $context->setEditor( 'ai-ezpublish:unittest' );
+        $path = __DIR__ . $ds . 'data' . $ds . 'customer.php';
+
+        if( ( $testdata = include( $path ) ) === false ){
+            throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer domain', $path ) );
+        }
+
+
+        $customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $context, 'Ezpublish' );
+        $customerAddressManager = $customerManager->getSubManager( 'address', 'Ezpublish' );
+
+        $search = $customerManager->createSearch();
+        $search->setConditions( $search->compare( '==', 'customer.code', array( 'UTC001', 'UTC002', 'UTC003' ) ) );
+        $items = $customerManager->searchItems( $search );
+
+        $this->conn->begin();
+
+        $customerManager->deleteItems( array_keys( $items ) );
+        $parentIds = $this->addCustomerData( $testdata, $customerManager, $customerAddressManager->createItem() );
+        $this->addCustomerAddressData( $testdata, $customerAddressManager, $parentIds );
+
+        $this->conn->commit();
+
+
+        $this->status( 'done' );
+    }
+
+
+    /**
+     * Returns the Ezpublish context
+     *
+     * @param \Aimeos\MShop\Context\Item\Iface $context Context object
+     * @return \Aimeos\MShop\Context\Item\Ezpublish Ezpublish context object
+     */
+    protected function getEzContext( \Aimeos\MShop\Context\Item\Iface $context )
+    {
+        $class = '\Aimeos\MShop\Context\Item\Ezpublish';
+        if( is_a( $context, $class ) ) {
+            return $context;
+        }
+
+        $ezContext = new \Aimeos\MShop\Context\Item\Ezpublish();
+        $ezContext->setDatabaseManager( clone $context->getDatabaseManager() );
+        $ezContext->setSession( clone $context->getSession() );
+        $ezContext->setLogger( clone $context->getLogger() );
+        $ezContext->setLocale( clone $context->getLocale() );
+        $ezContext->setConfig( clone $context->getConfig() );
+        $ezContext->setCache( clone $context->getCache() );
+
+
+        $ezContext->setEzUser( function( $code, $email, $password ) use ( $context ) {
+
+            $id = mt_rand( -0x7fffffff,-1 );
+            $dbm = $context->getDatabaseManager();
+            $dbconf = $context->getConfig()->get( 'resource/db-customer' );
+            $dbname = ( $dbconf ? 'db-customer' : 'db' );
+            $conn = $dbm->acquire( $dbname );
+
+            try
+            {
+                $stmt = $conn->create( 'INSERT INTO "ezuser" (
 					"contentobject_id", "email", "login", "login_normalized", "password_hash", "password_hash_type"
 				) VALUES (
 					?, ?, ?, ?, ?, 5
 				)' );
 
-				$stmt->bind( 1, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-				$stmt->bind( 2, $email );
-				$stmt->bind( 3, $code );
-				$stmt->bind( 4, $code );
-				$stmt->bind( 5, $password );
+                $stmt->bind( 1, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+                $stmt->bind( 2, $email );
+                $stmt->bind( 3, $code );
+                $stmt->bind( 4, $code );
+                $stmt->bind( 5, $password );
 
-				$stmt->execute()->finish();
+                $stmt->execute()->finish();
 
-				$dbm->release( $conn, $dbname );
-			}
-			catch( \Exception $e )
-			{
-				$dbm->release( $conn, $dbname );
-				throw $e;
-			}
+                $dbm->release( $conn, $dbname );
+            }
+            catch( \Exception $e )
+            {
+                $dbm->release( $conn, $dbname );
+                throw $e;
+            }
 
-			return $id;
-		} );
+            return $id;
+        } );
 
 
-		return $ezContext;
-	}
+        return $ezContext;
+    }
 }

lib/custom/tests/MShop/Customer/Manager/Address/EzpublishTest.php

Indentation +211 added lines, -211 removed lines

@@ -11,215 +11,215 @@
 
 class EzpublishTest extends \PHPUnit_Framework_TestCase
 {
-	private $fixture = null;
-	private $object = null;
-	private $editor = '';
-
-
-	protected function setUp()
-	{
-		$context = \TestHelper::getContext();
-		$this->editor = $context->getEditor();
-		$customer = new \Aimeos\MShop\Customer\Manager\Ezpublish( $context );
-
-		$search = $customer->createSearch();
-		$conditions = array(
-			$search->compare( '==', 'customer.code', 'UTC001' ),
-			$search->compare( '==', 'customer.editor', $this->editor )
-		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$result = $customer->searchItems( $search );
-
-		if( ( $customerItem = reset( $result ) ) === false ) {
-			throw new \Exception( sprintf( 'No customer item found for code "%1$s"', 'UTC001' ) );
-		}
-
-		$this->fixture = array(
-			'customer.address.parentid' => $customerItem->getId(),
-			'customer.address.company' => 'ABC GmbH',
-			'customer.address.vatid' => 'DE999999999',
-			'customer.address.salutation' => \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR,
-			'customer.address.title' => 'Herr',
-			'customer.address.firstname' => 'firstunit',
-			'customer.address.lastname' => 'lastunit',
-			'customer.address.address1' => 'unit str.',
-			'customer.address.address2' => ' 166',
-			'customer.address.address3' => '4.OG',
-			'customer.address.postal' => '22769',
-			'customer.address.city' => 'Hamburg',
-			'customer.address.state' => 'Hamburg',
-			'customer.address.countryid' => 'de',
-			'customer.address.languageid' => 'de',
-			'customer.address.telephone' => '05554433221',
-			'customer.address.email' => 'unittest@aimeos.org',
-			'customer.address.telefax' => '05554433222',
-			'customer.address.website' => 'unittest.aimeos.org',
-			'customer.address.position' => 1,
-			'customer.address.siteid' => $context->getLocale()->getSiteId(),
-		);
-
-		$this->object = $customer->getSubManager( 'address', 'Ezpublish' );
-	}
-
-
-	protected function tearDown()
-	{
-		unset( $this->object, $this->fixture );
-	}
-
-
-	public function testCleanup()
-	{
-		$this->object->cleanup( array( -1 ) );
-	}
-
-	public function testGetSearchAttributes()
-	{
-		foreach( $this->object->getSearchAttributes() as $attribute ) {
-			$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
-		}
-	}
-
-	public function testGetSubManager()
-	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
-	}
-
-	public function testCreateItem()
-	{
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Address\\Iface', $this->object->createItem() );
-	}
-
-	public function testGetItem()
-	{
-		$search = $this->object->createSearch();
-		$search->setConditions( $search->compare( '~=', 'customer.address.company', 'ABC GmbH' ) );
-
-		$items = $this->object->searchItems( $search );
-
-		if( ( $item = reset( $items ) ) === false ) {
-			throw new \Exception( 'No address item with company "ABC" found' );
-		}
-
-		$this->assertEquals( $item, $this->object->getItem( $item->getId() ) );
-	}
-
-	public function testSaveUpdateDeleteItem()
-	{
-		$item = new \Aimeos\MShop\Common\Item\Address\Standard( 'customer.address.', $this->fixture );
-		$item->setId( null );
-		$this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
-
-		$itemExp = clone $itemSaved;
-		$itemExp->setPosition( 1 );
-		$itemExp->setCity( 'Berlin' );
-		$itemExp->setState( 'Berlin' );
-		$this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
-
-		$this->object->deleteItem( $itemSaved->getId() );
-
-
-		$this->assertTrue( $item->getId() !== null );
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
-		$this->assertEquals( $item->getParentId(), $itemSaved->getParentId());
-		$this->assertEquals( $item->getPosition(), $itemSaved->getPosition());
-		$this->assertEquals( $item->getCompany(), $itemSaved->getCompany());
-		$this->assertEquals( $item->getVatID(), $itemSaved->getVatID());
-		$this->assertEquals( $item->getSalutation(), $itemSaved->getSalutation());
-		$this->assertEquals( $item->getTitle(), $itemSaved->getTitle());
-		$this->assertEquals( $item->getFirstname(), $itemSaved->getFirstname());
-		$this->assertEquals( $item->getLastname(), $itemSaved->getLastname());
-		$this->assertEquals( $item->getAddress1(), $itemSaved->getAddress1());
-		$this->assertEquals( $item->getAddress2(), $itemSaved->getAddress2());
-		$this->assertEquals( $item->getAddress3(), $itemSaved->getAddress3());
-		$this->assertEquals( $item->getPostal(), $itemSaved->getPostal());
-		$this->assertEquals( $item->getCity(), $itemSaved->getCity());
-		$this->assertEquals( $item->getState(), $itemSaved->getState());
-		$this->assertEquals( $item->getCountryId(), $itemSaved->getCountryId());
-		$this->assertEquals( $item->getLanguageId(), $itemSaved->getLanguageId());
-		$this->assertEquals( $item->getTelephone(), $itemSaved->getTelephone());
-		$this->assertEquals( $item->getEmail(), $itemSaved->getEmail());
-		$this->assertEquals( $item->getTelefax(), $itemSaved->getTelefax());
-		$this->assertEquals( $item->getWebsite(), $itemSaved->getWebsite());
-		$this->assertEquals( $item->getFlag(), $itemSaved->getFlag());
-
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
-		$this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
-
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
-		$this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId());
-		$this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition());
-		$this->assertEquals( $itemExp->getCompany(), $itemUpd->getCompany());
-		$this->assertEquals( $itemExp->getVatID(), $itemUpd->getVatID());
-		$this->assertEquals( $itemExp->getSalutation(), $itemUpd->getSalutation());
-		$this->assertEquals( $itemExp->getTitle(), $itemUpd->getTitle());
-		$this->assertEquals( $itemExp->getFirstname(), $itemUpd->getFirstname());
-		$this->assertEquals( $itemExp->getLastname(), $itemUpd->getLastname());
-		$this->assertEquals( $itemExp->getAddress1(), $itemUpd->getAddress1());
-		$this->assertEquals( $itemExp->getAddress2(), $itemUpd->getAddress2());
-		$this->assertEquals( $itemExp->getAddress3(), $itemUpd->getAddress3());
-		$this->assertEquals( $itemExp->getPostal(), $itemUpd->getPostal());
-		$this->assertEquals( $itemExp->getCity(), $itemUpd->getCity());
-		$this->assertEquals( $itemExp->getState(), $itemUpd->getState());
-		$this->assertEquals( $itemExp->getCountryId(), $itemUpd->getCountryId());
-		$this->assertEquals( $itemExp->getLanguageId(), $itemUpd->getLanguageId());
-		$this->assertEquals( $itemExp->getTelephone(), $itemUpd->getTelephone());
-		$this->assertEquals( $itemExp->getEmail(), $itemUpd->getEmail());
-		$this->assertEquals( $itemExp->getTelefax(), $itemUpd->getTelefax());
-		$this->assertEquals( $itemExp->getWebsite(), $itemUpd->getWebsite());
-		$this->assertEquals( $itemExp->getFlag(), $itemUpd->getFlag());
-
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
-
-		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
-		$this->object->getItem( $itemSaved->getId() );
-	}
-
-	public function testCreateSearch()
-	{
-		$this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() );
-	}
-
-
-	public function testSearchItem()
-	{
-		$search = $this->object->createSearch();
-
-		$conditions = array(
-			$search->compare( '==', 'customer.address.company', 'ABC' ),
-			$search->compare( '==', 'customer.address.editor', $this->editor )
-		);
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$this->assertEquals( 1, count( $this->object->searchItems( $search ) ) );
-	}
-
-
-	public function testSearchItemTotal()
-	{
-		$total = 0;
-		$search = $this->object->createSearch();
-
-		$conditions = array(
-			$search->compare( '~=', 'customer.address.company', 'ABC GmbH' ),
-			$search->compare( '==', 'customer.address.editor', $this->editor )
-		);
-
-		$search->setConditions( $search->combine( '&&', $conditions ) );
-		$search->setSlice( 0, 1 );
-
-		$results = $this->object->searchItems( $search, array(), $total );
-
-		$this->assertEquals( 1, count( $results ) );
-		$this->assertEquals( 2, $total );
-
-		foreach( $results as $id => $item ) {
-			$this->assertEquals( $id, $item->getId() );
-		}
-	}
+    private $fixture = null;
+    private $object = null;
+    private $editor = '';
+
+
+    protected function setUp()
+    {
+        $context = \TestHelper::getContext();
+        $this->editor = $context->getEditor();
+        $customer = new \Aimeos\MShop\Customer\Manager\Ezpublish( $context );
+
+        $search = $customer->createSearch();
+        $conditions = array(
+            $search->compare( '==', 'customer.code', 'UTC001' ),
+            $search->compare( '==', 'customer.editor', $this->editor )
+        );
+        $search->setConditions( $search->combine( '&&', $conditions ) );
+        $result = $customer->searchItems( $search );
+
+        if( ( $customerItem = reset( $result ) ) === false ) {
+            throw new \Exception( sprintf( 'No customer item found for code "%1$s"', 'UTC001' ) );
+        }
+
+        $this->fixture = array(
+            'customer.address.parentid' => $customerItem->getId(),
+            'customer.address.company' => 'ABC GmbH',
+            'customer.address.vatid' => 'DE999999999',
+            'customer.address.salutation' => \Aimeos\MShop\Common\Item\Address\Base::SALUTATION_MR,
+            'customer.address.title' => 'Herr',
+            'customer.address.firstname' => 'firstunit',
+            'customer.address.lastname' => 'lastunit',
+            'customer.address.address1' => 'unit str.',
+            'customer.address.address2' => ' 166',
+            'customer.address.address3' => '4.OG',
+            'customer.address.postal' => '22769',
+            'customer.address.city' => 'Hamburg',
+            'customer.address.state' => 'Hamburg',
+            'customer.address.countryid' => 'de',
+            'customer.address.languageid' => 'de',
+            'customer.address.telephone' => '05554433221',
+            'customer.address.email' => 'unittest@aimeos.org',
+            'customer.address.telefax' => '05554433222',
+            'customer.address.website' => 'unittest.aimeos.org',
+            'customer.address.position' => 1,
+            'customer.address.siteid' => $context->getLocale()->getSiteId(),
+        );
+
+        $this->object = $customer->getSubManager( 'address', 'Ezpublish' );
+    }
+
+
+    protected function tearDown()
+    {
+        unset( $this->object, $this->fixture );
+    }
+
+
+    public function testCleanup()
+    {
+        $this->object->cleanup( array( -1 ) );
+    }
+
+    public function testGetSearchAttributes()
+    {
+        foreach( $this->object->getSearchAttributes() as $attribute ) {
+            $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Attribute\\Iface', $attribute );
+        }
+    }
+
+    public function testGetSubManager()
+    {
+        $this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
+        $this->object->getSubManager( 'unknown' );
+    }
+
+    public function testCreateItem()
+    {
+        $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Address\\Iface', $this->object->createItem() );
+    }
+
+    public function testGetItem()
+    {
+        $search = $this->object->createSearch();
+        $search->setConditions( $search->compare( '~=', 'customer.address.company', 'ABC GmbH' ) );
+
+        $items = $this->object->searchItems( $search );
+
+        if( ( $item = reset( $items ) ) === false ) {
+            throw new \Exception( 'No address item with company "ABC" found' );
+        }
+
+        $this->assertEquals( $item, $this->object->getItem( $item->getId() ) );
+    }
+
+    public function testSaveUpdateDeleteItem()
+    {
+        $item = new \Aimeos\MShop\Common\Item\Address\Standard( 'customer.address.', $this->fixture );
+        $item->setId( null );
+        $this->object->saveItem( $item );
+        $itemSaved = $this->object->getItem( $item->getId() );
+
+        $itemExp = clone $itemSaved;
+        $itemExp->setPosition( 1 );
+        $itemExp->setCity( 'Berlin' );
+        $itemExp->setState( 'Berlin' );
+        $this->object->saveItem( $itemExp );
+        $itemUpd = $this->object->getItem( $itemExp->getId() );
+
+        $this->object->deleteItem( $itemSaved->getId() );
+
+
+        $this->assertTrue( $item->getId() !== null );
+        $this->assertEquals( $item->getId(), $itemSaved->getId() );
+        $this->assertEquals( $item->getParentId(), $itemSaved->getParentId());
+        $this->assertEquals( $item->getPosition(), $itemSaved->getPosition());
+        $this->assertEquals( $item->getCompany(), $itemSaved->getCompany());
+        $this->assertEquals( $item->getVatID(), $itemSaved->getVatID());
+        $this->assertEquals( $item->getSalutation(), $itemSaved->getSalutation());
+        $this->assertEquals( $item->getTitle(), $itemSaved->getTitle());
+        $this->assertEquals( $item->getFirstname(), $itemSaved->getFirstname());
+        $this->assertEquals( $item->getLastname(), $itemSaved->getLastname());
+        $this->assertEquals( $item->getAddress1(), $itemSaved->getAddress1());
+        $this->assertEquals( $item->getAddress2(), $itemSaved->getAddress2());
+        $this->assertEquals( $item->getAddress3(), $itemSaved->getAddress3());
+        $this->assertEquals( $item->getPostal(), $itemSaved->getPostal());
+        $this->assertEquals( $item->getCity(), $itemSaved->getCity());
+        $this->assertEquals( $item->getState(), $itemSaved->getState());
+        $this->assertEquals( $item->getCountryId(), $itemSaved->getCountryId());
+        $this->assertEquals( $item->getLanguageId(), $itemSaved->getLanguageId());
+        $this->assertEquals( $item->getTelephone(), $itemSaved->getTelephone());
+        $this->assertEquals( $item->getEmail(), $itemSaved->getEmail());
+        $this->assertEquals( $item->getTelefax(), $itemSaved->getTelefax());
+        $this->assertEquals( $item->getWebsite(), $itemSaved->getWebsite());
+        $this->assertEquals( $item->getFlag(), $itemSaved->getFlag());
+
+        $this->assertEquals( $this->editor, $itemSaved->getEditor() );
+        $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
+        $this->assertRegExp('/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified());
+
+        $this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
+        $this->assertEquals( $itemExp->getParentId(), $itemUpd->getParentId());
+        $this->assertEquals( $itemExp->getPosition(), $itemUpd->getPosition());
+        $this->assertEquals( $itemExp->getCompany(), $itemUpd->getCompany());
+        $this->assertEquals( $itemExp->getVatID(), $itemUpd->getVatID());
+        $this->assertEquals( $itemExp->getSalutation(), $itemUpd->getSalutation());
+        $this->assertEquals( $itemExp->getTitle(), $itemUpd->getTitle());
+        $this->assertEquals( $itemExp->getFirstname(), $itemUpd->getFirstname());
+        $this->assertEquals( $itemExp->getLastname(), $itemUpd->getLastname());
+        $this->assertEquals( $itemExp->getAddress1(), $itemUpd->getAddress1());
+        $this->assertEquals( $itemExp->getAddress2(), $itemUpd->getAddress2());
+        $this->assertEquals( $itemExp->getAddress3(), $itemUpd->getAddress3());
+        $this->assertEquals( $itemExp->getPostal(), $itemUpd->getPostal());
+        $this->assertEquals( $itemExp->getCity(), $itemUpd->getCity());
+        $this->assertEquals( $itemExp->getState(), $itemUpd->getState());
+        $this->assertEquals( $itemExp->getCountryId(), $itemUpd->getCountryId());
+        $this->assertEquals( $itemExp->getLanguageId(), $itemUpd->getLanguageId());
+        $this->assertEquals( $itemExp->getTelephone(), $itemUpd->getTelephone());
+        $this->assertEquals( $itemExp->getEmail(), $itemUpd->getEmail());
+        $this->assertEquals( $itemExp->getTelefax(), $itemUpd->getTelefax());
+        $this->assertEquals( $itemExp->getWebsite(), $itemUpd->getWebsite());
+        $this->assertEquals( $itemExp->getFlag(), $itemUpd->getFlag());
+
+        $this->assertEquals( $this->editor, $itemUpd->getEditor() );
+        $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
+        $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
+
+        $this->setExpectedException('\\Aimeos\\MShop\\Exception');
+        $this->object->getItem( $itemSaved->getId() );
+    }
+
+    public function testCreateSearch()
+    {
+        $this->assertInstanceOf( '\\Aimeos\\MW\\Criteria\\Iface', $this->object->createSearch() );
+    }
+
+
+    public function testSearchItem()
+    {
+        $search = $this->object->createSearch();
+
+        $conditions = array(
+            $search->compare( '==', 'customer.address.company', 'ABC' ),
+            $search->compare( '==', 'customer.address.editor', $this->editor )
+        );
+        $search->setConditions( $search->combine( '&&', $conditions ) );
+        $this->assertEquals( 1, count( $this->object->searchItems( $search ) ) );
+    }
+
+
+    public function testSearchItemTotal()
+    {
+        $total = 0;
+        $search = $this->object->createSearch();
+
+        $conditions = array(
+            $search->compare( '~=', 'customer.address.company', 'ABC GmbH' ),
+            $search->compare( '==', 'customer.address.editor', $this->editor )
+        );
+
+        $search->setConditions( $search->combine( '&&', $conditions ) );
+        $search->setSlice( 0, 1 );
+
+        $results = $this->object->searchItems( $search, array(), $total );
+
+        $this->assertEquals( 1, count( $results ) );
+        $this->assertEquals( 2, $total );
+
+        foreach( $results as $id => $item ) {
+            $this->assertEquals( $id, $item->getId() );
+        }
+    }
 }

lib/custom/tests/MShop/Customer/Manager/Lists/Type/EzpublishTest.php

Indentation +103 added lines, -103 removed lines

@@ -11,137 +11,137 @@
 
 class EzpublishTest extends \PHPUnit_Framework_TestCase
 {
-	private $object;
-	private $editor = '';
+    private $object;
+    private $editor = '';
 
 
-	protected function setUp()
-	{
-		$this->editor = \TestHelper::getContext()->getEditor();
-		$manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'Ezpublish' );
+    protected function setUp()
+    {
+        $this->editor = \TestHelper::getContext()->getEditor();
+        $manager = \Aimeos\MShop\Customer\Manager\Factory::createManager( \TestHelper::getContext(), 'Ezpublish' );
 
-		$listManager = $manager->getSubManager( 'lists', 'Ezpublish' );
-		$this->object = $listManager->getSubManager( 'type', 'Ezpublish' );
-	}
+        $listManager = $manager->getSubManager( 'lists', 'Ezpublish' );
+        $this->object = $listManager->getSubManager( 'type', 'Ezpublish' );
+    }
 
 
-	protected function tearDown()
-	{
-		unset( $this->object );
-	}
+    protected function tearDown()
+    {
+        unset( $this->object );
+    }
 
 
-	public function testCleanup()
-	{
-		$this->object->cleanup( array( -1 ) );
-	}
+    public function testCleanup()
+    {
+        $this->object->cleanup( array( -1 ) );
+    }
 
 
-	public function testGetSubManager()
-	{
-		$this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
-		$this->object->getSubManager( 'unknown' );
-	}
+    public function testGetSubManager()
+    {
+        $this->setExpectedException( '\\Aimeos\\MShop\\Exception' );
+        $this->object->getSubManager( 'unknown' );
+    }
 
 
-	public function testCreateItem()
-	{
-		$item = $this->object->createItem();
-		$this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item );
-	}
+    public function testCreateItem()
+    {
+        $item = $this->object->createItem();
+        $this->assertInstanceOf( '\\Aimeos\\MShop\\Common\\Item\\Type\\Iface', $item );
+    }
 
 
-	public function testGetItem()
-	{
-		$search = $this->object->createSearch();
-		$search->setSlice(0, 1);
-		$results = $this->object->searchItems($search);
+    public function testGetItem()
+    {
+        $search = $this->object->createSearch();
+        $search->setSlice(0, 1);
+        $results = $this->object->searchItems($search);
 
-		if( ( $expected = reset($results) ) === false ) {
-			throw new \Exception( 'No list type item found' );
-		}
+        if( ( $expected = reset($results) ) === false ) {
+            throw new \Exception( 'No list type item found' );
+        }
 
-		$this->assertEquals( $expected, $this->object->getItem( $expected->getId() ) );
-	}
+        $this->assertEquals( $expected, $this->object->getItem( $expected->getId() ) );
+    }
 
 
-	public function testSaveUpdateDeleteItem()
-	{
-		$search = $this->object->createSearch();
-		$search->setSlice(0, 1);
-		$results = $this->object->searchItems($search);
+    public function testSaveUpdateDeleteItem()
+    {
+        $search = $this->object->createSearch();
+        $search->setSlice(0, 1);
+        $results = $this->object->searchItems($search);
 
-		if( ( $item = reset($results) ) === false ) {
-			throw new \Exception( 'No type item found' );
-		}
+        if( ( $item = reset($results) ) === false ) {
+            throw new \Exception( 'No type item found' );
+        }
 
-		$item->setId(null);
-		$item->setCode( 'unitTestInit' );
-		$this->object->saveItem( $item );
-		$itemSaved = $this->object->getItem( $item->getId() );
+        $item->setId(null);
+        $item->setCode( 'unitTestInit' );
+        $this->object->saveItem( $item );
+        $itemSaved = $this->object->getItem( $item->getId() );
 
-		$itemExp = clone $itemSaved;
-		$itemExp->setCode( 'unitTestSave' );
-		$this->object->saveItem( $itemExp );
-		$itemUpd = $this->object->getItem( $itemExp->getId() );
+        $itemExp = clone $itemSaved;
+        $itemExp->setCode( 'unitTestSave' );
+        $this->object->saveItem( $itemExp );
+        $itemUpd = $this->object->getItem( $itemExp->getId() );
 
-		$this->object->deleteItem( $itemSaved->getId() );
+        $this->object->deleteItem( $itemSaved->getId() );
 
 
-		$this->assertTrue( $item->getId() !== null );
-		$this->assertEquals( $item->getId(), $itemSaved->getId() );
-		$this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
-		$this->assertEquals( $item->getCode(), $itemSaved->getCode() );
-		$this->assertEquals( $item->getDomain(), $itemSaved->getDomain() );
-		$this->assertEquals( $item->getLabel(), $itemSaved->getLabel() );
-		$this->assertEquals( $item->getStatus(), $itemSaved->getStatus() );
+        $this->assertTrue( $item->getId() !== null );
+        $this->assertEquals( $item->getId(), $itemSaved->getId() );
+        $this->assertEquals( $item->getSiteId(), $itemSaved->getSiteId() );
+        $this->assertEquals( $item->getCode(), $itemSaved->getCode() );
+        $this->assertEquals( $item->getDomain(), $itemSaved->getDomain() );
+        $this->assertEquals( $item->getLabel(), $itemSaved->getLabel() );
+        $this->assertEquals( $item->getStatus(), $itemSaved->getStatus() );
 
-		$this->assertEquals( $this->editor, $itemSaved->getEditor() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() );
+        $this->assertEquals( $this->editor, $itemSaved->getEditor() );
+        $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeCreated() );
+        $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemSaved->getTimeModified() );
 
-		$this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
-		$this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() );
-		$this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() );
-		$this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() );
-		$this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() );
-		$this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() );
+        $this->assertEquals( $itemExp->getId(), $itemUpd->getId() );
+        $this->assertEquals( $itemExp->getSiteId(), $itemUpd->getSiteId() );
+        $this->assertEquals( $itemExp->getCode(), $itemUpd->getCode() );
+        $this->assertEquals( $itemExp->getDomain(), $itemUpd->getDomain() );
+        $this->assertEquals( $itemExp->getLabel(), $itemUpd->getLabel() );
+        $this->assertEquals( $itemExp->getStatus(), $itemUpd->getStatus() );
 
-		$this->assertEquals( $this->editor, $itemUpd->getEditor() );
-		$this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
-		$this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
+        $this->assertEquals( $this->editor, $itemUpd->getEditor() );
+        $this->assertEquals( $itemExp->getTimeCreated(), $itemUpd->getTimeCreated() );
+        $this->assertRegExp( '/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/', $itemUpd->getTimeModified() );
 
-		$this->setExpectedException('\\Aimeos\\MShop\\Exception');
-		$this->object->getItem( $itemSaved->getId() );
-	}
+        $this->setExpectedException('\\Aimeos\\MShop\\Exception');
+        $this->object->getItem( $itemSaved->getId() );
+    }
 
 
-	public function testSearchItems()
-	{
-		$total = 0;
-		$search = $this->object->createSearch();
-
-		$expr = array();
-		$expr[] = $search->compare( '!=', 'customer.lists.type.id', 0 );
-		$expr[] = $search->compare( '!=', 'customer.lists.type.siteid', null );
-		$expr[] = $search->compare( '==', 'customer.lists.type.code', 'default' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.domain', 'text' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.label', 'Standard' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.status', 1 );
-		$expr[] = $search->compare( '>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00' );
-		$expr[] = $search->compare( '==', 'customer.lists.type.editor', $this->editor );
-
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSlice(0, 1);
-
-		$results = $this->object->searchItems( $search, array(), $total );
-		$this->assertEquals( 1, count( $results ) );
-		$this->assertEquals( 1, $total );
-
-		foreach($results as $itemId => $item) {
-			$this->assertEquals( $itemId, $item->getId() );
-		}
-	}
+    public function testSearchItems()
+    {
+        $total = 0;
+        $search = $this->object->createSearch();
+
+        $expr = array();
+        $expr[] = $search->compare( '!=', 'customer.lists.type.id', 0 );
+        $expr[] = $search->compare( '!=', 'customer.lists.type.siteid', null );
+        $expr[] = $search->compare( '==', 'customer.lists.type.code', 'default' );
+        $expr[] = $search->compare( '==', 'customer.lists.type.domain', 'text' );
+        $expr[] = $search->compare( '==', 'customer.lists.type.label', 'Standard' );
+        $expr[] = $search->compare( '==', 'customer.lists.type.status', 1 );
+        $expr[] = $search->compare( '>=', 'customer.lists.type.mtime', '1970-01-01 00:00:00' );
+        $expr[] = $search->compare( '>=', 'customer.lists.type.ctime', '1970-01-01 00:00:00' );
+        $expr[] = $search->compare( '==', 'customer.lists.type.editor', $this->editor );
+
+        $search->setConditions( $search->combine( '&&', $expr ) );
+        $search->setSlice(0, 1);
+
+        $results = $this->object->searchItems( $search, array(), $total );
+        $this->assertEquals( 1, count( $results ) );
+        $this->assertEquals( 1, $total );
+
+        foreach($results as $itemId => $item) {
+            $this->assertEquals( $itemId, $item->getId() );
+        }
+    }
 
 }