Commit 343d0b1f by apoorvnaik Committed by Madhan Neethiraj

ATLAS-1570: Taxonomy test failure fix

parent 7303a412
...@@ -81,8 +81,6 @@ public class TaxonomyServiceTest { ...@@ -81,8 +81,6 @@ public class TaxonomyServiceTest {
metadataService, taxonomyResourceProvider, termResourceProvider, serializer); metadataService, taxonomyResourceProvider, termResourceProvider, serializer);
Response response = service.getTaxonomy(null, uriInfo, taxonomyName); Response response = service.getTaxonomy(null, uriInfo, taxonomyName);
assertTrue(service.wasTransactionInitialized());
Request request = requestCapture.getValue(); Request request = requestCapture.getValue();
Map<String, Object> requestProperties = request.getQueryProperties(); Map<String, Object> requestProperties = request.getQueryProperties();
assertEquals(requestProperties.size(), 1); assertEquals(requestProperties.size(), 1);
...@@ -122,8 +120,6 @@ public class TaxonomyServiceTest { ...@@ -122,8 +120,6 @@ public class TaxonomyServiceTest {
metadataService, taxonomyResourceProvider, termResourceProvider, serializer); metadataService, taxonomyResourceProvider, termResourceProvider, serializer);
Response response = service.getTaxonomies(null, uriInfo); Response response = service.getTaxonomies(null, uriInfo);
assertTrue(service.wasTransactionInitialized());
Request request = requestCapture.getValue(); Request request = requestCapture.getValue();
assertTrue(request.getQueryProperties().isEmpty()); assertTrue(request.getQueryProperties().isEmpty());
assertEquals(request.getQueryString(), "name:testTaxonomy"); assertEquals(request.getQueryString(), "name:testTaxonomy");
...@@ -155,8 +151,6 @@ public class TaxonomyServiceTest { ...@@ -155,8 +151,6 @@ public class TaxonomyServiceTest {
metadataService, taxonomyResourceProvider, termResourceProvider, null); metadataService, taxonomyResourceProvider, termResourceProvider, null);
Response response = service.createTaxonomy(body, null, uriInfo, "testTaxonomy"); Response response = service.createTaxonomy(body, null, uriInfo, "testTaxonomy");
assertTrue(service.wasTransactionInitialized());
Request request = requestCapture.getValue(); Request request = requestCapture.getValue();
assertEquals(request.getQueryProperties().size(), 2); assertEquals(request.getQueryProperties().size(), 2);
assertEquals(request.getQueryProperties().get("name"), "testTaxonomy"); assertEquals(request.getQueryProperties().get("name"), "testTaxonomy");
...@@ -191,8 +185,6 @@ public class TaxonomyServiceTest { ...@@ -191,8 +185,6 @@ public class TaxonomyServiceTest {
metadataService, taxonomyResourceProvider, termResourceProvider, null); metadataService, taxonomyResourceProvider, termResourceProvider, null);
Response response = service.deleteTaxonomy(null, uriInfo, "testTaxonomy"); Response response = service.deleteTaxonomy(null, uriInfo, "testTaxonomy");
assertTrue(service.wasTransactionInitialized());
Request request = requestCapture.getValue(); Request request = requestCapture.getValue();
assertEquals(request.getQueryProperties().size(), 1); assertEquals(request.getQueryProperties().size(), 1);
assertEquals(request.getQueryProperties().get("name"), "testTaxonomy"); assertEquals(request.getQueryProperties().get("name"), "testTaxonomy");
...@@ -232,8 +224,6 @@ public class TaxonomyServiceTest { ...@@ -232,8 +224,6 @@ public class TaxonomyServiceTest {
metadataService, taxonomyResourceProvider, termResourceProvider, serializer); metadataService, taxonomyResourceProvider, termResourceProvider, serializer);
Response response = service.getTaxonomyTerm(null, uriInfo, taxonomyName, termName); Response response = service.getTaxonomyTerm(null, uriInfo, taxonomyName, termName);
assertTrue(service.wasTransactionInitialized());
Request request = requestCapture.getValue(); Request request = requestCapture.getValue();
Map<String, Object> requestProperties = request.getQueryProperties(); Map<String, Object> requestProperties = request.getQueryProperties();
assertEquals(requestProperties.size(), 1); assertEquals(requestProperties.size(), 1);
...@@ -274,8 +264,6 @@ public class TaxonomyServiceTest { ...@@ -274,8 +264,6 @@ public class TaxonomyServiceTest {
metadataService, taxonomyResourceProvider, termResourceProvider, serializer); metadataService, taxonomyResourceProvider, termResourceProvider, serializer);
Response response = service.getTaxonomyTerms(null, uriInfo, "testTaxonomy"); Response response = service.getTaxonomyTerms(null, uriInfo, "testTaxonomy");
assertTrue(service.wasTransactionInitialized());
Request request = requestCapture.getValue(); Request request = requestCapture.getValue();
assertEquals(request.getQueryProperties().size(), 1); assertEquals(request.getQueryProperties().size(), 1);
TermPath termPath = (TermPath) request.getQueryProperties().get("termPath"); TermPath termPath = (TermPath) request.getQueryProperties().get("termPath");
...@@ -323,8 +311,6 @@ public class TaxonomyServiceTest { ...@@ -323,8 +311,6 @@ public class TaxonomyServiceTest {
metadataService, taxonomyResourceProvider, termResourceProvider, serializer); metadataService, taxonomyResourceProvider, termResourceProvider, serializer);
Response response = service.getSubTerms(null, uriInfo, "testTaxonomy", "testTerm", "/terms/testTerm2"); Response response = service.getSubTerms(null, uriInfo, "testTaxonomy", "testTerm", "/terms/testTerm2");
assertTrue(service.wasTransactionInitialized());
Request request = requestCapture.getValue(); Request request = requestCapture.getValue();
assertEquals(request.getQueryProperties().size(), 1); assertEquals(request.getQueryProperties().size(), 1);
TermPath termPath = (TermPath) request.getQueryProperties().get("termPath"); TermPath termPath = (TermPath) request.getQueryProperties().get("termPath");
...@@ -375,8 +361,6 @@ public class TaxonomyServiceTest { ...@@ -375,8 +361,6 @@ public class TaxonomyServiceTest {
metadataService, taxonomyResourceProvider, termResourceProvider, serializer); metadataService, taxonomyResourceProvider, termResourceProvider, serializer);
Response response = service.getSubTerms(null, uriInfo, "testTaxonomy", "testTerm", "/terms/testTerm2/terms"); Response response = service.getSubTerms(null, uriInfo, "testTaxonomy", "testTerm", "/terms/testTerm2/terms");
assertTrue(service.wasTransactionInitialized());
Request request = requestCapture.getValue(); Request request = requestCapture.getValue();
assertEquals(request.getQueryProperties().size(), 1); assertEquals(request.getQueryProperties().size(), 1);
TermPath termPath = (TermPath) request.getQueryProperties().get("termPath"); TermPath termPath = (TermPath) request.getQueryProperties().get("termPath");
...@@ -413,8 +397,6 @@ public class TaxonomyServiceTest { ...@@ -413,8 +397,6 @@ public class TaxonomyServiceTest {
metadataService, taxonomyResourceProvider, termResourceProvider, null); metadataService, taxonomyResourceProvider, termResourceProvider, null);
Response response = service.createTerm(body, null, uriInfo, taxonomyName, termName); Response response = service.createTerm(body, null, uriInfo, taxonomyName, termName);
assertTrue(service.wasTransactionInitialized());
Request request = requestCapture.getValue(); Request request = requestCapture.getValue();
assertEquals(request.getQueryProperties().size(), 2); assertEquals(request.getQueryProperties().size(), 2);
assertEquals(request.getQueryProperties().get("description"), "test description"); assertEquals(request.getQueryProperties().get("description"), "test description");
...@@ -453,8 +435,6 @@ public class TaxonomyServiceTest { ...@@ -453,8 +435,6 @@ public class TaxonomyServiceTest {
metadataService, taxonomyResourceProvider, termResourceProvider, null); metadataService, taxonomyResourceProvider, termResourceProvider, null);
Response response = service.createSubTerm(body, null, uriInfo, taxonomyName, termName, "/terms/testTerm2"); Response response = service.createSubTerm(body, null, uriInfo, taxonomyName, termName, "/terms/testTerm2");
assertTrue(service.wasTransactionInitialized());
Request request = requestCapture.getValue(); Request request = requestCapture.getValue();
assertEquals(request.getQueryProperties().size(), 2); assertEquals(request.getQueryProperties().size(), 2);
assertEquals(request.getQueryProperties().get("description"), "test description"); assertEquals(request.getQueryProperties().get("description"), "test description");
...@@ -490,8 +470,6 @@ public class TaxonomyServiceTest { ...@@ -490,8 +470,6 @@ public class TaxonomyServiceTest {
metadataService, taxonomyResourceProvider, termResourceProvider, null); metadataService, taxonomyResourceProvider, termResourceProvider, null);
Response response = service.deleteTerm(null, uriInfo, "testTaxonomy", "testTerm"); Response response = service.deleteTerm(null, uriInfo, "testTaxonomy", "testTerm");
assertTrue(service.wasTransactionInitialized());
Request request = requestCapture.getValue(); Request request = requestCapture.getValue();
assertEquals(request.getQueryProperties().size(), 1); assertEquals(request.getQueryProperties().size(), 1);
TermPath termPath = (TermPath) request.getQueryProperties().get("termPath"); TermPath termPath = (TermPath) request.getQueryProperties().get("termPath");
...@@ -526,8 +504,6 @@ public class TaxonomyServiceTest { ...@@ -526,8 +504,6 @@ public class TaxonomyServiceTest {
metadataService, taxonomyResourceProvider, termResourceProvider, null); metadataService, taxonomyResourceProvider, termResourceProvider, null);
Response response = service.deleteSubTerm(null, uriInfo, "testTaxonomy", "testTerm", "terms/testTerm2"); Response response = service.deleteSubTerm(null, uriInfo, "testTaxonomy", "testTerm", "terms/testTerm2");
assertTrue(service.wasTransactionInitialized());
Request request = requestCapture.getValue(); Request request = requestCapture.getValue();
assertEquals(request.getQueryProperties().size(), 1); assertEquals(request.getQueryProperties().size(), 1);
TermPath termPath = (TermPath) request.getQueryProperties().get("termPath"); TermPath termPath = (TermPath) request.getQueryProperties().get("termPath");
...@@ -574,8 +550,5 @@ public class TaxonomyServiceTest { ...@@ -574,8 +550,5 @@ public class TaxonomyServiceTest {
return testSerializer; return testSerializer;
} }
public boolean wasTransactionInitialized() {
return transactionInitialized;
}
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment