MAGETWO-32464: Fix Functional API Tests after Public PR #927 Merge

magento · Jan 12, 2015 · f4119fb · f4119fb
1 parent a4cd98b
commit f4119fb
Show file tree

Hide file tree

Showing 18 changed files with 98 additions and 98 deletions.
diff --git a/app/code/Magento/Checkout/etc/webapi.xml b/app/code/Magento/Checkout/etc/webapi.xml
@@ -54,7 +54,7 @@
  <resource ref="Magento_Catalog::products" />
  </resources>
  </route>
- <route url="/V1/carts" method="PUT">
+ <route url="/V1/carts" method="GET">
  <service class="Magento\Checkout\Service\V1\Cart\ReadServiceInterface" method="getCartList"/>
  <resources>
  <resource ref="Magento_Catalog::products" />

diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/AttributeSetRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/AttributeSetRepositoryTest.php
@@ -183,8 +183,8 @@ public function testGetList()
 
  $serviceInfo = [
  'rest' => [
- 'resourcePath' => '/V1/products/attribute-sets/sets/list',
- 'httpMethod' => RestConfig::HTTP_METHOD_PUT,
+ 'resourcePath' => '/V1/products/attribute-sets/sets/list' . '?' . http_build_query($searchCriteria),
+ 'httpMethod' => RestConfig::HTTP_METHOD_GET,
  ],
  'soap' => [
  'service' => 'catalogAttributeSetRepositoryV1',

diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryAttributeRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryAttributeRepositoryTest.php
@@ -50,8 +50,8 @@ public function testGetList()
 
  $serviceInfo = [
  'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . '/',
- 'httpMethod' => RestConfig::HTTP_METHOD_PUT,
+ 'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($searchCriteria),
+ 'httpMethod' => RestConfig::HTTP_METHOD_GET,
  ],
  'soap' => [
  'service' => self::SERVICE_NAME,

diff --git a/...ests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeGroupRepositoryTest.php b/...ests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeGroupRepositoryTest.php
@@ -111,8 +111,8 @@ public function testGetList()
 
  $serviceInfo = [
  'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . "/groups/list",
- 'httpMethod' => \Magento\Webapi\Model\Rest\Config::HTTP_METHOD_PUT,
+ 'resourcePath' => self::RESOURCE_PATH . '/groups/list' . '?' . http_build_query($searchCriteria),
+ 'httpMethod' => \Magento\Webapi\Model\Rest\Config::HTTP_METHOD_GET,
  ],
  'soap' => [
  'service' => self::SERVICE_NAME,

diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeRepositoryTest.php
@@ -51,8 +51,8 @@ public function testGetList()
 
  $serviceInfo = [
  'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . '/',
- 'httpMethod' => RestConfig::HTTP_METHOD_PUT,
+ 'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($searchCriteria),
+ 'httpMethod' => RestConfig::HTTP_METHOD_GET,
  ],
  'soap' => [
  'service' => self::SERVICE_NAME,

diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
@@ -182,8 +182,8 @@ public function testGetList()
 
  $serviceInfo = [
  'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . '/',
- 'httpMethod' => RestConfig::HTTP_METHOD_PUT,
+ 'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($searchCriteria),
+ 'httpMethod' => RestConfig::HTTP_METHOD_GET,
  ],
  'soap' => [
  'service' => self::SERVICE_NAME,

diff --git a/dev/tests/api-functional/testsuite/Magento/Checkout/Service/V1/Cart/ReadServiceTest.php b/dev/tests/api-functional/testsuite/Magento/Checkout/Service/V1/Cart/ReadServiceTest.php
@@ -204,18 +204,6 @@ public function testGetCartList()
  {
  $cart = $this->getCart('test01');
 
- $serviceInfo = [
- 'rest' => [
- 'resourcePath' => '/V1/carts',
- 'httpMethod' => RestConfig::HTTP_METHOD_PUT,
- ],
- 'soap' => [
- 'service' => 'checkoutCartReadServiceV1',
- 'serviceVersion' => 'V1',
- 'operation' => 'checkoutCartReadServiceV1GetCartList',
- ],
- ];
-
  // The following two filters are used as alternatives. The target cart does not match the first one.
  $grandTotalFilter = $this->filterBuilder->setField('grand_total')
  ->setConditionType('gteq')
@@ -246,6 +234,17 @@ public function testGetCartList()
  $searchCriteria = $this->searchBuilder->create()->__toArray();
 
  $requestData = ['searchCriteria' => $searchCriteria];
+ $serviceInfo = [
+ 'rest' => [
+ 'resourcePath' => '/V1/carts' . '?' . http_build_query($requestData),
+ 'httpMethod' => RestConfig::HTTP_METHOD_GET,
+ ],
+ 'soap' => [
+ 'service' => 'checkoutCartReadServiceV1',
+ 'serviceVersion' => 'V1',
+ 'operation' => 'checkoutCartReadServiceV1GetCartList',
+ ],
+ ];
  $searchResult = $this->_webApiCall($serviceInfo, $requestData);
  $this->assertArrayHasKey('total_count', $searchResult);
  $this->assertEquals(1, $searchResult['total_count']);
@@ -272,26 +271,25 @@ public function testGetCartList()
  */
  public function testGetCartListThrowsExceptionIfProvidedSearchFieldIsInvalid()
  {
+ $invalidFilter = $this->filterBuilder->setField('invalid_field')
+ ->setConditionType('eq')
+ ->setValue(0)
+ ->create();
+
+ $this->searchBuilder->addFilter([$invalidFilter]);
+ $searchCriteria = $this->searchBuilder->create()->__toArray();
+ $requestData = ['searchCriteria' => $searchCriteria];
  $serviceInfo = [
  'soap' => [
  'service' => 'checkoutCartReadServiceV1',
  'serviceVersion' => 'V1',
  'operation' => 'checkoutCartReadServiceV1GetCartList',
  ],
  'rest' => [
- 'resourcePath' => '/V1/carts',
- 'httpMethod' => RestConfig::HTTP_METHOD_PUT,
+ 'resourcePath' => '/V1/carts' . '?' . http_build_query($requestData),
+ 'httpMethod' => RestConfig::HTTP_METHOD_GET,
  ],
  ];
-
- $invalidFilter = $this->filterBuilder->setField('invalid_field')
- ->setConditionType('eq')
- ->setValue(0)
- ->create();
-
- $this->searchBuilder->addFilter([$invalidFilter]);
- $searchCriteria = $this->searchBuilder->create()->__toArray();
- $requestData = ['searchCriteria' => $searchCriteria];
  $this->_webApiCall($serviceInfo, $requestData);
  }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php
@@ -344,22 +344,22 @@ public function testSearchCustomers()
  ->setValue($customerData[Customer::EMAIL])
  ->create();
  $this->searchCriteriaBuilder->addFilter([$filter]);
+ $searchData = $this->dataObjectProcessor->buildOutputDataArray(
+ $this->searchCriteriaBuilder->create(),
+ 'Magento\Framework\Api\SearchCriteriaInterface'
+ );
+ $requestData = ['searchCriteria' => $searchData];
  $serviceInfo = [
  'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . '/search',
- 'httpMethod' => RestConfig::HTTP_METHOD_POST,
+ 'resourcePath' => self::RESOURCE_PATH . '/search' . '?' . http_build_query($requestData),
+ 'httpMethod' => RestConfig::HTTP_METHOD_GET,
  ],
  'soap' => [
  'service' => self::SERVICE_NAME,
  'serviceVersion' => self::SERVICE_VERSION,
  'operation' => self::SERVICE_NAME . 'getList',
  ],
  ];
- $searchData = $this->dataObjectProcessor->buildOutputDataArray(
- $this->searchCriteriaBuilder->create(),
- 'Magento\Framework\Api\SearchCriteriaInterface'
- );
- $requestData = ['searchCriteria' => $searchData];
  $searchResults = $this->_webApiCall($serviceInfo, $requestData);
  $this->assertEquals(1, $searchResults['total_count']);
  $this->assertEquals($customerData[Customer::ID], $searchResults['items'][0][Customer::ID]);
@@ -449,19 +449,19 @@ public function testSearchCustomersMultipleFiltersWithSort()
  $this->searchCriteriaBuilder->setSortOrders([$sortOrder]);
 
  $searchCriteria = $this->searchCriteriaBuilder->create();
+ $searchData = $searchCriteria->__toArray();
+ $requestData = ['searchCriteria' => $searchData];
  $serviceInfo = [
  'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . '/search',
- 'httpMethod' => RestConfig::HTTP_METHOD_POST,
+ 'resourcePath' => self::RESOURCE_PATH . '/search' . '?' . http_build_query($requestData),
+ 'httpMethod' => RestConfig::HTTP_METHOD_GET,
  ],
  'soap' => [
  'service' => self::SERVICE_NAME,
  'serviceVersion' => self::SERVICE_VERSION,
  'operation' => self::SERVICE_NAME . 'getList',
  ],
  ];
- $searchData = $searchCriteria->__toArray();
- $requestData = ['searchCriteria' => $searchData];
  $searchResults = $this->_webApiCall($serviceInfo, $requestData);
  $this->assertEquals(2, $searchResults['total_count']);
  $this->assertEquals($customerData1[Customer::ID], $searchResults['items'][0][Customer::ID]);
@@ -525,19 +525,19 @@ public function testSearchCustomersNonExistentMultipleFilters()
  $this->searchCriteriaBuilder->addFilter([$filter1, $filter2]);
  $this->searchCriteriaBuilder->addFilter([$filter3]);
  $searchCriteria = $this->searchCriteriaBuilder->create();
+ $searchData = $searchCriteria->__toArray();
+ $requestData = ['searchCriteria' => $searchData];
  $serviceInfo = [
  'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . '/search',
- 'httpMethod' => RestConfig::HTTP_METHOD_POST,
+ 'resourcePath' => self::RESOURCE_PATH . '/search' . '?' . http_build_query($requestData),
+ 'httpMethod' => RestConfig::HTTP_METHOD_GET,
  ],
  'soap' => [
  'service' => self::SERVICE_NAME,
  'serviceVersion' => self::SERVICE_VERSION,
  'operation' => self::SERVICE_NAME . 'getList',
  ],
  ];
- $searchData = $searchCriteria->__toArray();
- $requestData = ['searchCriteria' => $searchData];
  $searchResults = $this->_webApiCall($serviceInfo, $requestData);
  $this->assertEquals(0, $searchResults['total_count'], 'No results expected for non-existent email.');
  }
@@ -602,19 +602,19 @@ public function testSearchCustomersMultipleFilterGroups()
  $this->searchCriteriaBuilder->addFilter([$filter2, $filter3]);
  $this->searchCriteriaBuilder->addFilter([$filter4]);
  $searchCriteria = $this->searchCriteriaBuilder->setCurrentPage(1)->setPageSize(10)->create();
+ $searchData = $searchCriteria->__toArray();
+ $requestData = ['searchCriteria' => $searchData];
  $serviceInfo = [
  'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . '/search',
- 'httpMethod' => RestConfig::HTTP_METHOD_POST,
+ 'resourcePath' => self::RESOURCE_PATH . '/search' . '?' . http_build_query($requestData),
+ 'httpMethod' => RestConfig::HTTP_METHOD_GET,
  ],
  'soap' => [
  'service' => self::SERVICE_NAME,
  'serviceVersion' => self::SERVICE_VERSION,
  'operation' => self::SERVICE_NAME . 'getList',
  ],
  ];
- $searchData = $searchCriteria->__toArray();
- $requestData = ['searchCriteria' => $searchData];
  $searchResults = $this->_webApiCall($serviceInfo, $requestData);
  $this->assertEquals(1, $searchResults['total_count']);
  $this->assertEquals($customerData1[Customer::ID], $searchResults['items'][0][Customer::ID]);
@@ -630,6 +630,7 @@ public function testSearchCustomersMultipleFilterGroups()
  $searchCriteria = $this->searchCriteriaBuilder->create();
  $searchData = $searchCriteria->__toArray();
  $requestData = ['searchCriteria' => $searchData];
+ $serviceInfo['rest']['resourcePath'] = self::RESOURCE_PATH . '/search' . '?' . http_build_query($requestData);
  $searchResults = $this->_webApiCall($serviceInfo, $requestData);
  $this->assertEquals(0, $searchResults['total_count']);
  }

diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/GroupRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/GroupRepositoryTest.php
@@ -937,10 +937,13 @@ public function testSearchGroups($filterField, $filterValue, $expectedResult)
  ->create();
  $searchCriteriaBuilder->addFilter([$filter]);
 
+
+ $searchData = $searchCriteriaBuilder->create()->__toArray();
+ $requestData = ['searchCriteria' => $searchData];
  $serviceInfo = [
  'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . "/search",
- 'httpMethod' => \Magento\Webapi\Model\Rest\Config::HTTP_METHOD_POST,
+ 'resourcePath' => self::RESOURCE_PATH . "/search" . '?' . http_build_query($requestData),
+ 'httpMethod' => \Magento\Webapi\Model\Rest\Config::HTTP_METHOD_GET,
  ],
  'soap' => [
  'service' => self::SERVICE_NAME,
@@ -949,9 +952,6 @@ public function testSearchGroups($filterField, $filterValue, $expectedResult)
  ],
  ];
 
- $searchData = $searchCriteriaBuilder->create()->__toArray();
- $requestData = ['searchCriteria' => $searchData];
-
  $searchResult = $this->_webApiCall($serviceInfo, $requestData);
 
  if (is_null($expectedResult)) {

diff --git a/dev/tests/api-functional/testsuite/Magento/Eav/Api/AttributeSetRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Eav/Api/AttributeSetRepositoryTest.php
@@ -215,8 +215,8 @@ public function testGetList()
 
  $serviceInfo = [
  'rest' => [
- 'resourcePath' => '/V1/eav/attribute-sets/list',
- 'httpMethod' => RestConfig::HTTP_METHOD_PUT,
+ 'resourcePath' => '/V1/eav/attribute-sets/list' . '?' . http_build_query($searchCriteria),
+ 'httpMethod' => RestConfig::HTTP_METHOD_GET,
  ],
  'soap' => [
  'service' => 'eavAttributeSetRepositoryV1',

diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoListTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/CreditmemoListTest.php
@@ -72,7 +72,7 @@ public function testCreditmemoList()
  $serviceInfo = [
  'rest' => [
  'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($requestData),
- 'httpMethod' => Config::HTTP_METHOD_PUT,
+ 'httpMethod' => Config::HTTP_METHOD_GET,
  ],
  'soap' => [
  'service' => self::SERVICE_READ_NAME,

diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/InvoiceListTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/InvoiceListTest.php
@@ -57,7 +57,7 @@ public function testInvoiceList()
  $serviceInfo = [
  'rest' => [
  'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($requestData),
- 'httpMethod' => Config::HTTP_METHOD_PUT,
+ 'httpMethod' => Config::HTTP_METHOD_GET,
  ],
  'soap' => [
  'service' => self::SERVICE_READ_NAME,

diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderListTest.php
@@ -58,7 +58,7 @@ public function testOrderList()
  $serviceInfo = [
  'rest' => [
  'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($requestData),
- 'httpMethod' => Config::HTTP_METHOD_PUT,
+ 'httpMethod' => Config::HTTP_METHOD_GET,
  ],
  'soap' => [
  'service' => self::SERVICE_READ_NAME,

diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentListTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentListTest.php
@@ -50,7 +50,7 @@ public function testShipmentList()
  $serviceInfo = [
  'rest' => [
  'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($requestData),
- 'httpMethod' => Config::HTTP_METHOD_PUT,
+ 'httpMethod' => Config::HTTP_METHOD_GET,
  ],
  'soap' => [
  'service' => self::SERVICE_READ_NAME,

diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/TransactionTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/TransactionTest.php
@@ -113,7 +113,7 @@ public function testTransactionList($filters)
  $serviceInfo = [
  'rest' => [
  'resourcePath' => self::RESOURCE_PATH . '?' . http_build_query($requestData),
- 'httpMethod' => Config::HTTP_METHOD_PUT,
+ 'httpMethod' => Config::HTTP_METHOD_GET,
  ],
  'soap' => [
  'service' => self::SERVICE_READ_NAME,

diff --git a/dev/tests/api-functional/testsuite/Magento/Tax/Api/TaxClassRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Tax/Api/TaxClassRepositoryTest.php
@@ -225,19 +225,19 @@ public function testSearchTaxClass()
  ->setValue($taxClassName)
  ->create();
  $this->searchCriteriaBuilder->addFilter([$filter]);
+ $searchData = $this->searchCriteriaBuilder->create()->__toArray();
+ $requestData = ['searchCriteria' => $searchData];
  $serviceInfo = [
  'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . '/search',
- 'httpMethod' => RestConfig::HTTP_METHOD_PUT,
+ 'resourcePath' => self::RESOURCE_PATH . '/search' . '?' . http_build_query($requestData),
+ 'httpMethod' => RestConfig::HTTP_METHOD_GET,
  ],
  'soap' => [
  'service' => self::SERVICE_NAME,
  'serviceVersion' => self::SERVICE_VERSION,
  'operation' => self::SERVICE_NAME . 'GetList',
  ],
  ];
- $searchData = $this->searchCriteriaBuilder->create()->__toArray();
- $requestData = ['searchCriteria' => $searchData];
  $searchResults = $this->_webApiCall($serviceInfo, $requestData);
  $this->assertEquals(1, $searchResults['total_count']);
  $this->assertEquals($taxClassName, $searchResults['items'][0][$taxClassNameField]);
@@ -275,19 +275,19 @@ public function testSearchTaxClassMultipleFilterGroups()
  $this->searchCriteriaBuilder->addFilter([$filter1, $filter2]);
  $this->searchCriteriaBuilder->addFilter([$filter3, $filter4]);
  $searchCriteria = $this->searchCriteriaBuilder->setCurrentPage(1)->setPageSize(10)->create();
+ $searchData = $searchCriteria->__toArray();
+ $requestData = ['searchCriteria' => $searchData];
  $serviceInfo = [
  'rest' => [
- 'resourcePath' => self::RESOURCE_PATH . '/search',
- 'httpMethod' => RestConfig::HTTP_METHOD_PUT,
+ 'resourcePath' => self::RESOURCE_PATH . '/search' . '?' . http_build_query($requestData),
+ 'httpMethod' => RestConfig::HTTP_METHOD_GET,
  ],
  'soap' => [
  'service' => self::SERVICE_NAME,
  'serviceVersion' => self::SERVICE_VERSION,
  'operation' => self::SERVICE_NAME . 'GetList',
  ],
  ];
- $searchData = $searchCriteria->__toArray();
- $requestData = ['searchCriteria' => $searchData];
  $searchResults = $this->_webApiCall($serviceInfo, $requestData);
  $this->assertEquals(2, $searchResults['total_count']);
  $this->assertEquals($productTaxClass[Data\TaxClassInterface::KEY_NAME],
@@ -301,6 +301,7 @@ public function testSearchTaxClassMultipleFilterGroups()
  $searchCriteria = $this->searchCriteriaBuilder->create();
  $searchData = $searchCriteria->__toArray();
  $requestData = ['searchCriteria' => $searchData];
+ $serviceInfo['rest']['resourcePath'] = self::RESOURCE_PATH . '/search' . '?' . http_build_query($requestData);
  $searchResults = $this->_webApiCall($serviceInfo, $requestData);
  $this->assertEquals(1, $searchResults['total_count']);
  $this->assertEquals($customerTaxClass[Data\TaxClassInterface::KEY_NAME],