Repository: incubator-atlas Updated Branches: refs/heads/master 7303a412e -> 343d0b1f6
ATLAS-1570: Taxonomy test failure fix Signed-off-by: Madhan Neethiraj <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/343d0b1f Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/343d0b1f Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/343d0b1f Branch: refs/heads/master Commit: 343d0b1f6b6efcfbc93de814dda145e404b7cc5c Parents: 7303a41 Author: apoorvnaik <[email protected]> Authored: Sun Feb 19 11:21:18 2017 -0800 Committer: Madhan Neethiraj <[email protected]> Committed: Sun Feb 19 14:05:42 2017 -0800 ---------------------------------------------------------------------- .../web/resources/TaxonomyServiceTest.java | 29 +------------------- 1 file changed, 1 insertion(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/343d0b1f/webapp/src/test/java/org/apache/atlas/web/resources/TaxonomyServiceTest.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/atlas/web/resources/TaxonomyServiceTest.java b/webapp/src/test/java/org/apache/atlas/web/resources/TaxonomyServiceTest.java index 45df9c7..cba78f3 100644 --- a/webapp/src/test/java/org/apache/atlas/web/resources/TaxonomyServiceTest.java +++ b/webapp/src/test/java/org/apache/atlas/web/resources/TaxonomyServiceTest.java @@ -81,8 +81,6 @@ public class TaxonomyServiceTest { metadataService, taxonomyResourceProvider, termResourceProvider, serializer); Response response = service.getTaxonomy(null, uriInfo, taxonomyName); - assertTrue(service.wasTransactionInitialized()); - Request request = requestCapture.getValue(); Map<String, Object> requestProperties = request.getQueryProperties(); assertEquals(requestProperties.size(), 1); @@ -122,8 +120,6 @@ public class TaxonomyServiceTest { metadataService, taxonomyResourceProvider, termResourceProvider, serializer); Response response = service.getTaxonomies(null, uriInfo); - assertTrue(service.wasTransactionInitialized()); - Request request = requestCapture.getValue(); assertTrue(request.getQueryProperties().isEmpty()); assertEquals(request.getQueryString(), "name:testTaxonomy"); @@ -155,8 +151,6 @@ public class TaxonomyServiceTest { metadataService, taxonomyResourceProvider, termResourceProvider, null); Response response = service.createTaxonomy(body, null, uriInfo, "testTaxonomy"); - assertTrue(service.wasTransactionInitialized()); - Request request = requestCapture.getValue(); assertEquals(request.getQueryProperties().size(), 2); assertEquals(request.getQueryProperties().get("name"), "testTaxonomy"); @@ -191,8 +185,6 @@ public class TaxonomyServiceTest { metadataService, taxonomyResourceProvider, termResourceProvider, null); Response response = service.deleteTaxonomy(null, uriInfo, "testTaxonomy"); - assertTrue(service.wasTransactionInitialized()); - Request request = requestCapture.getValue(); assertEquals(request.getQueryProperties().size(), 1); assertEquals(request.getQueryProperties().get("name"), "testTaxonomy"); @@ -232,8 +224,6 @@ public class TaxonomyServiceTest { metadataService, taxonomyResourceProvider, termResourceProvider, serializer); Response response = service.getTaxonomyTerm(null, uriInfo, taxonomyName, termName); - assertTrue(service.wasTransactionInitialized()); - Request request = requestCapture.getValue(); Map<String, Object> requestProperties = request.getQueryProperties(); assertEquals(requestProperties.size(), 1); @@ -274,8 +264,6 @@ public class TaxonomyServiceTest { metadataService, taxonomyResourceProvider, termResourceProvider, serializer); Response response = service.getTaxonomyTerms(null, uriInfo, "testTaxonomy"); - assertTrue(service.wasTransactionInitialized()); - Request request = requestCapture.getValue(); assertEquals(request.getQueryProperties().size(), 1); TermPath termPath = (TermPath) request.getQueryProperties().get("termPath"); @@ -323,8 +311,6 @@ public class TaxonomyServiceTest { metadataService, taxonomyResourceProvider, termResourceProvider, serializer); Response response = service.getSubTerms(null, uriInfo, "testTaxonomy", "testTerm", "/terms/testTerm2"); - assertTrue(service.wasTransactionInitialized()); - Request request = requestCapture.getValue(); assertEquals(request.getQueryProperties().size(), 1); TermPath termPath = (TermPath) request.getQueryProperties().get("termPath"); @@ -375,8 +361,6 @@ public class TaxonomyServiceTest { metadataService, taxonomyResourceProvider, termResourceProvider, serializer); Response response = service.getSubTerms(null, uriInfo, "testTaxonomy", "testTerm", "/terms/testTerm2/terms"); - assertTrue(service.wasTransactionInitialized()); - Request request = requestCapture.getValue(); assertEquals(request.getQueryProperties().size(), 1); TermPath termPath = (TermPath) request.getQueryProperties().get("termPath"); @@ -413,8 +397,6 @@ public class TaxonomyServiceTest { metadataService, taxonomyResourceProvider, termResourceProvider, null); Response response = service.createTerm(body, null, uriInfo, taxonomyName, termName); - assertTrue(service.wasTransactionInitialized()); - Request request = requestCapture.getValue(); assertEquals(request.getQueryProperties().size(), 2); assertEquals(request.getQueryProperties().get("description"), "test description"); @@ -453,8 +435,6 @@ public class TaxonomyServiceTest { metadataService, taxonomyResourceProvider, termResourceProvider, null); Response response = service.createSubTerm(body, null, uriInfo, taxonomyName, termName, "/terms/testTerm2"); - assertTrue(service.wasTransactionInitialized()); - Request request = requestCapture.getValue(); assertEquals(request.getQueryProperties().size(), 2); assertEquals(request.getQueryProperties().get("description"), "test description"); @@ -490,8 +470,6 @@ public class TaxonomyServiceTest { metadataService, taxonomyResourceProvider, termResourceProvider, null); Response response = service.deleteTerm(null, uriInfo, "testTaxonomy", "testTerm"); - assertTrue(service.wasTransactionInitialized()); - Request request = requestCapture.getValue(); assertEquals(request.getQueryProperties().size(), 1); TermPath termPath = (TermPath) request.getQueryProperties().get("termPath"); @@ -526,8 +504,6 @@ public class TaxonomyServiceTest { metadataService, taxonomyResourceProvider, termResourceProvider, null); Response response = service.deleteSubTerm(null, uriInfo, "testTaxonomy", "testTerm", "terms/testTerm2"); - assertTrue(service.wasTransactionInitialized()); - Request request = requestCapture.getValue(); assertEquals(request.getQueryProperties().size(), 1); TermPath termPath = (TermPath) request.getQueryProperties().get("termPath"); @@ -574,8 +550,5 @@ public class TaxonomyServiceTest { return testSerializer; } - public boolean wasTransactionInitialized() { - return transactionInitialized; - } } -} +} \ No newline at end of file
