From f301364d84dec9719f0e1f1b9ddcf72a245a848f Mon Sep 17 00:00:00 2001 From: Michael Hoennig Date: Sat, 27 Apr 2019 06:36:01 +0200 Subject: [PATCH] Revert "trying to find reason for failing tests in Jenkins, locally all tests are green" This reverts commit 318ecd0be49ab0dbee925dfb3e0fbea1e274a52f. --- .../web/rest/AssetResourceIntTest.java | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/src/test/java/org/hostsharing/hsadminng/web/rest/AssetResourceIntTest.java b/src/test/java/org/hostsharing/hsadminng/web/rest/AssetResourceIntTest.java index a3b082f4..dcbc8a13 100644 --- a/src/test/java/org/hostsharing/hsadminng/web/rest/AssetResourceIntTest.java +++ b/src/test/java/org/hostsharing/hsadminng/web/rest/AssetResourceIntTest.java @@ -7,7 +7,6 @@ import org.hostsharing.hsadminng.domain.enumeration.AssetAction; import org.hostsharing.hsadminng.repository.AssetRepository; import org.hostsharing.hsadminng.service.AssetQueryService; import org.hostsharing.hsadminng.service.AssetService; -import org.hostsharing.hsadminng.service.CustomerService; import org.hostsharing.hsadminng.service.dto.AssetDTO; import org.hostsharing.hsadminng.service.mapper.AssetMapper; import org.hostsharing.hsadminng.web.rest.errors.ExceptionTranslator; @@ -61,9 +60,6 @@ public class AssetResourceIntTest { private static final String DEFAULT_REMARK = "AAAAAAAAAA"; private static final String UPDATED_REMARK = "BBBBBBBBBB"; - @Autowired - private CustomerService customerService; - @Autowired private AssetRepository assetRepository; @@ -124,7 +120,6 @@ public class AssetResourceIntTest { Membership membership = MembershipResourceIntTest.createEntity(em); em.persist(membership); em.flush(); - asset.setMembership(membership); return asset; } @@ -149,13 +144,9 @@ public class AssetResourceIntTest { em.flush(); return asset; } - @Before public void initTest() { asset = createEntity(em); - - // TOOD: on Jenkins the customer row vanishes, locally all tests are green - assertThat(customerService.findOne(asset.getMembership().getCustomer().getId())).as("precondition failed").isNotNull(); } @Test @@ -320,15 +311,10 @@ public class AssetResourceIntTest { assetRepository.saveAndFlush(asset); // Get all the assetList where documentDate equals to DEFAULT_DOCUMENT_DATE - try { - defaultAssetShouldBeFound("documentDate.equals=" + DEFAULT_DOCUMENT_DATE); + defaultAssetShouldBeFound("documentDate.equals=" + DEFAULT_DOCUMENT_DATE); - // Get all the assetList where documentDate equals to UPDATED_DOCUMENT_DATE - defaultAssetShouldNotBeFound("documentDate.equals=" + UPDATED_DOCUMENT_DATE); - } catch (Exception exc) { - // TOOD: on Jenkins the customer row vanishes, locally all tests are green - assertThat(customerService.findOne(asset.getMembership().getCustomer().getId())).as("postcondition failed").isNotNull(); - } + // Get all the assetList where documentDate equals to UPDATED_DOCUMENT_DATE + defaultAssetShouldNotBeFound("documentDate.equals=" + UPDATED_DOCUMENT_DATE); } @Test