Repository: olingo-odata4 Updated Branches: refs/heads/master 72d894cd3 -> 38214db49
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e897cf27/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ContextTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ContextTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ContextTestITCase.java index b1b2e75..a3a78b4 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ContextTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ContextTestITCase.java @@ -67,16 +67,16 @@ public class ContextTestITCase extends AbstractTestITCase { final EntityTypeInvocationHandler source2 = (EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer2); - assertTrue(entityContext.isAttached(source1)); - assertTrue(entityContext.isAttached(source2)); + assertTrue(containerFactory.getContext().entityContext().isAttached(source1)); + assertTrue(containerFactory.getContext().entityContext().isAttached(source2)); - entityContext.detach(source1); - assertFalse(entityContext.isAttached(source1)); - assertTrue(entityContext.isAttached(source2)); + containerFactory.getContext().entityContext().detach(source1); + assertFalse(containerFactory.getContext().entityContext().isAttached(source1)); + assertTrue(containerFactory.getContext().entityContext().isAttached(source2)); - entityContext.detach(source2); - assertFalse(entityContext.isAttached(source1)); - assertFalse(entityContext.isAttached(source2)); + containerFactory.getContext().entityContext().detach(source2); + assertFalse(containerFactory.getContext().entityContext().isAttached(source1)); + assertFalse(containerFactory.getContext().entityContext().isAttached(source2)); } @Test @@ -92,36 +92,36 @@ public class ContextTestITCase extends AbstractTestITCase { final EntityTypeInvocationHandler source3 = (EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer3); - assertFalse(entityContext.isAttached(source1)); - assertFalse(entityContext.isAttached(source2)); - assertFalse(entityContext.isAttached(source3)); + assertFalse(containerFactory.getContext().entityContext().isAttached(source1)); + assertFalse(containerFactory.getContext().entityContext().isAttached(source2)); + assertFalse(containerFactory.getContext().entityContext().isAttached(source3)); - entityContext.attach(source1); - assertTrue(entityContext.isAttached(source1)); - assertFalse(entityContext.isAttached(source2)); - assertTrue(entityContext.isAttached(source3)); + containerFactory.getContext().entityContext().attach(source1); + assertTrue(containerFactory.getContext().entityContext().isAttached(source1)); + assertFalse(containerFactory.getContext().entityContext().isAttached(source2)); + assertTrue(containerFactory.getContext().entityContext().isAttached(source3)); - entityContext.attach(source2); - assertTrue(entityContext.isAttached(source1)); - assertTrue(entityContext.isAttached(source2)); - assertTrue(entityContext.isAttached(source3)); + containerFactory.getContext().entityContext().attach(source2); + assertTrue(containerFactory.getContext().entityContext().isAttached(source1)); + assertTrue(containerFactory.getContext().entityContext().isAttached(source2)); + assertTrue(containerFactory.getContext().entityContext().isAttached(source3)); try { - entityContext.attach(source3); + containerFactory.getContext().entityContext().attach(source3); fail(); } catch (IllegalStateException ignore) { // ignore } - entityContext.detach(source1); - assertFalse(entityContext.isAttached(source1)); - assertTrue(entityContext.isAttached(source2)); - assertFalse(entityContext.isAttached(source3)); + containerFactory.getContext().entityContext().detach(source1); + assertFalse(containerFactory.getContext().entityContext().isAttached(source1)); + assertTrue(containerFactory.getContext().entityContext().isAttached(source2)); + assertFalse(containerFactory.getContext().entityContext().isAttached(source3)); - entityContext.detach(source2); - assertFalse(entityContext.isAttached(source1)); - assertFalse(entityContext.isAttached(source2)); - assertFalse(entityContext.isAttached(source3)); + containerFactory.getContext().entityContext().detach(source2); + assertFalse(containerFactory.getContext().entityContext().isAttached(source1)); + assertFalse(containerFactory.getContext().entityContext().isAttached(source2)); + assertFalse(containerFactory.getContext().entityContext().isAttached(source3)); } @Test @@ -138,17 +138,17 @@ public class ContextTestITCase extends AbstractTestITCase { final EntityTypeInvocationHandler target = (EntityTypeInvocationHandler) Proxy.getInvocationHandler(customerInfo); - assertTrue(entityContext.isAttached(source)); - assertEquals(AttachedEntityStatus.NEW, entityContext.getStatus(source)); - assertTrue(entityContext.isAttached(target)); - assertEquals(AttachedEntityStatus.LINKED, entityContext.getStatus(target)); + assertTrue(containerFactory.getContext().entityContext().isAttached(source)); + assertEquals(AttachedEntityStatus.NEW, containerFactory.getContext().entityContext().getStatus(source)); + assertTrue(containerFactory.getContext().entityContext().isAttached(target)); + assertEquals(AttachedEntityStatus.LINKED, containerFactory.getContext().entityContext().getStatus(target)); checkUnidirectional("Info", source, "Customer", target, false); - entityContext.detachAll(); + containerFactory.getContext().entityContext().detachAll(); - assertFalse(entityContext.isAttached(source)); - assertFalse(entityContext.isAttached(target)); + assertFalse(containerFactory.getContext().entityContext().isAttached(source)); + assertFalse(containerFactory.getContext().entityContext().isAttached(target)); } @Test @@ -165,17 +165,17 @@ public class ContextTestITCase extends AbstractTestITCase { final EntityTypeInvocationHandler target = (EntityTypeInvocationHandler) Proxy.getInvocationHandler(customerInfo); - assertTrue(entityContext.isAttached(source)); - assertEquals(AttachedEntityStatus.CHANGED, entityContext.getStatus(source)); - assertTrue(entityContext.isAttached(target)); - assertEquals(AttachedEntityStatus.NEW, entityContext.getStatus(target)); + assertTrue(containerFactory.getContext().entityContext().isAttached(source)); + assertEquals(AttachedEntityStatus.CHANGED, containerFactory.getContext().entityContext().getStatus(source)); + assertTrue(containerFactory.getContext().entityContext().isAttached(target)); + assertEquals(AttachedEntityStatus.NEW, containerFactory.getContext().entityContext().getStatus(target)); checkUnidirectional("Info", source, "Customer", target, false); - entityContext.detachAll(); + containerFactory.getContext().entityContext().detachAll(); - assertFalse(entityContext.isAttached(source)); - assertFalse(entityContext.isAttached(target)); + assertFalse(containerFactory.getContext().entityContext().isAttached(source)); + assertFalse(containerFactory.getContext().entityContext().isAttached(target)); } @Test @@ -192,17 +192,17 @@ public class ContextTestITCase extends AbstractTestITCase { final EntityTypeInvocationHandler target = (EntityTypeInvocationHandler) Proxy.getInvocationHandler(customerInfo); - assertTrue(entityContext.isAttached(source)); - assertEquals(AttachedEntityStatus.CHANGED, entityContext.getStatus(source)); - assertTrue(entityContext.isAttached(target)); - assertEquals(AttachedEntityStatus.LINKED, entityContext.getStatus(target)); + assertTrue(containerFactory.getContext().entityContext().isAttached(source)); + assertEquals(AttachedEntityStatus.CHANGED, containerFactory.getContext().entityContext().getStatus(source)); + assertTrue(containerFactory.getContext().entityContext().isAttached(target)); + assertEquals(AttachedEntityStatus.LINKED, containerFactory.getContext().entityContext().getStatus(target)); checkUnidirectional("Info", source, "Customer", target, false); - entityContext.detachAll(); + containerFactory.getContext().entityContext().detachAll(); - assertFalse(entityContext.isAttached(source)); - assertFalse(entityContext.isAttached(target)); + assertFalse(containerFactory.getContext().entityContext().isAttached(source)); + assertFalse(containerFactory.getContext().entityContext().isAttached(target)); } @Test @@ -220,24 +220,25 @@ public class ContextTestITCase extends AbstractTestITCase { final EntityTypeInvocationHandler source = (EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer); - assertTrue(entityContext.isAttached(source)); - assertEquals(AttachedEntityStatus.NEW, entityContext.getStatus(source)); + assertTrue(containerFactory.getContext().entityContext().isAttached(source)); + assertEquals(AttachedEntityStatus.NEW, containerFactory.getContext().entityContext().getStatus(source)); assertEquals(3, ((Collection) (source.getLinkChanges().entrySet().iterator().next().getValue())).size()); for (Order order : toBeLinked) { final EntityTypeInvocationHandler target = (EntityTypeInvocationHandler) Proxy.getInvocationHandler(order); - assertTrue(entityContext.isAttached(target)); - assertEquals(AttachedEntityStatus.NEW, entityContext.getStatus(target)); + assertTrue(containerFactory.getContext().entityContext().isAttached(target)); + assertEquals(AttachedEntityStatus.NEW, containerFactory.getContext().entityContext().getStatus(target)); checkUnidirectional("Orders", source, "Customer", target, true); } - entityContext.detachAll(); + containerFactory.getContext().entityContext().detachAll(); - assertFalse(entityContext.isAttached(source)); + assertFalse(containerFactory.getContext().entityContext().isAttached(source)); for (Order order : toBeLinked) { - assertFalse(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(order))); + assertFalse(containerFactory.getContext().entityContext(). + isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(order))); } } @@ -265,12 +266,12 @@ public class ContextTestITCase extends AbstractTestITCase { final EntityTypeInvocationHandler source = (EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer); - assertTrue(entityContext.isAttached(source)); - assertEquals(AttachedEntityStatus.NEW, entityContext.getStatus(source)); + assertTrue(containerFactory.getContext().entityContext().isAttached(source)); + assertEquals(AttachedEntityStatus.NEW, containerFactory.getContext().entityContext().getStatus(source)); - entityContext.detachAll(); + containerFactory.getContext().entityContext().detachAll(); - assertFalse(entityContext.isAttached(source)); + assertFalse(containerFactory.getContext().entityContext().isAttached(source)); } @Test @@ -283,7 +284,7 @@ public class ContextTestITCase extends AbstractTestITCase { customerInfo = container.getCustomerInfo().get(16); assertEquals("some other info ...", customerInfo.getInformation()); - entityContext.detachAll(); + containerFactory.getContext().entityContext().detachAll(); customerInfo = container.getCustomerInfo().get(16); assertNotEquals("some other info ...", customerInfo.getInformation()); } @@ -304,7 +305,7 @@ public class ContextTestITCase extends AbstractTestITCase { } assertTrue(found); - entityContext.detachAll(); + containerFactory.getContext().entityContext().detachAll(); found = false; for (CustomerInfo info : container.getCustomerInfo().getAll()) { @@ -322,7 +323,7 @@ public class ContextTestITCase extends AbstractTestITCase { final EntityTypeInvocationHandler handler = (EntityTypeInvocationHandler) Proxy.getInvocationHandler(login); - assertTrue(entityContext.isAttached(handler)); + assertTrue(containerFactory.getContext().entityContext().isAttached(handler)); try { container.flush(); @@ -331,20 +332,20 @@ public class ContextTestITCase extends AbstractTestITCase { // ignore } - assertTrue(entityContext.isAttached(handler)); + assertTrue(containerFactory.getContext().entityContext().isAttached(handler)); login.setCustomerId(-10); login.setUsername("customer"); container.flush(); - assertFalse(entityContext.isAttached(handler)); + assertFalse(containerFactory.getContext().entityContext().isAttached(handler)); assertNotNull(container.getLogin().get("customer")); container.getLogin().delete(login.getUsername()); - assertTrue(entityContext.isAttached(handler)); + assertTrue(containerFactory.getContext().entityContext().isAttached(handler)); container.flush(); - assertFalse(entityContext.isAttached(handler)); + assertFalse(containerFactory.getContext().entityContext().isAttached(handler)); assertNull(container.getLogin().get("customer")); } @@ -387,18 +388,24 @@ public class ContextTestITCase extends AbstractTestITCase { customer.setPrimaryContactInfo(cd); customer.setBackupContactInfo(Collections.<ContactDetails>singletonList(bcd)); - assertTrue(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(customerInfo))); - assertTrue(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer))); + assertTrue(containerFactory.getContext().entityContext(). + isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(customerInfo))); + assertTrue(containerFactory.getContext().entityContext(). + isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer))); for (Order linked : toBeLinked) { - assertTrue(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(linked))); + assertTrue(containerFactory.getContext().entityContext(). + isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(linked))); } container.flush(); - assertFalse(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(customerInfo))); - assertFalse(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer))); + assertFalse(containerFactory.getContext().entityContext(). + isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(customerInfo))); + assertFalse(containerFactory.getContext().entityContext(). + isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer))); for (Order linked : toBeLinked) { - assertFalse(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(linked))); + assertFalse(containerFactory.getContext().entityContext(). + isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(linked))); } assertEquals("some new info ...", container.getCustomerInfo().get(16).getInformation()); @@ -406,16 +413,20 @@ public class ContextTestITCase extends AbstractTestITCase { container.getOrder().delete(toBeLinked); container.getCustomer().delete(customer.getCustomerId()); - assertTrue(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer))); + assertTrue(containerFactory.getContext().entityContext(). + isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer))); for (Order linked : toBeLinked) { - assertTrue(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(linked))); + assertTrue(containerFactory.getContext().entityContext(). + isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(linked))); } container.flush(); - assertFalse(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer))); + assertFalse(containerFactory.getContext().entityContext(). + isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(customer))); for (Order linked : toBeLinked) { - assertFalse(entityContext.isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(linked))); + assertFalse(containerFactory.getContext().entityContext(). + isAttached((EntityTypeInvocationHandler) Proxy.getInvocationHandler(linked))); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e897cf27/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java index 2ae58e8..ccfbd2a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java @@ -58,7 +58,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase { actual = container.getCustomer().get(id); assertNull(actual); - entityContext.detachAll(); + containerFactory.getContext().detachAll(); actual = container.getCustomer().get(id); assertNotNull(actual); @@ -68,7 +68,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase { actual = container.getCustomer().get(id); assertNull(actual); - entityContext.detachAll(); + containerFactory.getContext().detachAll(); actual = container.getCustomer().get(id); assertNull(actual); } @@ -90,7 +90,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase { assertNotNull(actual); assertEquals(id, actual.getPersonId()); - entityContext.detachAll(); + containerFactory.getContext().detachAll(); actual = container.getPerson().get(id, Employee.class); assertNotNull(actual); @@ -100,7 +100,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase { actual = container.getPerson().get(id, Employee.class); assertNull(actual); - entityContext.detachAll(); + containerFactory.getContext().detachAll(); actual = container.getPerson().get(id, Employee.class); assertNull(actual); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e897cf27/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java index 28b768f..1a0a08c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java @@ -64,7 +64,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase { getAnnotation(EntityType.class).openType()); assertTrue(otcontainer.getRow().newIndexedRow().getClass().getInterfaces()[0]. getAnnotation(EntityType.class).openType()); - entityContext.detachAll(); + containerFactory.getContext().detachAll(); } @Test @@ -124,7 +124,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase { assertTrue(Calendar.class.isAssignableFrom(rowIndex.getAdditionalProperty("aDate").getClass())); assertEquals(ContactDetails.class, rowIndex.getAdditionalProperty("aContact").getClass().getInterfaces()[0]); - entityContext.detachAll(); + containerFactory.getContext().detachAll(); otcontainer.getRowIndex().delete(id); otcontainer.flush(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e897cf27/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PropertyTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PropertyTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PropertyTestITCase.java index 0296bac..e0aec63 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PropertyTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PropertyTestITCase.java @@ -18,12 +18,11 @@ */ package org.apache.olingo.fit.proxy.v3; -import org.apache.olingo.ext.proxy.EntityContainerFactory; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order; import org.junit.Test; /** @@ -50,7 +49,7 @@ public class PropertyTestITCase extends AbstractTestITCase { fail(); } catch (IllegalStateException e) { // ignore and detach all - EntityContainerFactory.getContext().detachAll(); + containerFactory.getContext().detachAll(); } } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e897cf27/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java index baa4128..40cd2bb 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java @@ -30,7 +30,6 @@ import java.util.TimeZone; import org.apache.olingo.client.api.v4.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.ext.proxy.EntityContainerFactory; -import org.apache.olingo.ext.proxy.context.EntityContext; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order; @@ -59,8 +58,6 @@ public abstract class AbstractTestITCase { protected static String testAuthServiceRootURL; - protected final EntityContext entityContext = EntityContainerFactory.getContext().entityContext(); - protected static EntityContainerFactory<EdmEnabledODataClient> containerFactory; protected static InMemoryEntities container; @@ -78,7 +75,7 @@ public abstract class AbstractTestITCase { containerFactory.getClient().getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM); container = containerFactory.getEntityContainer(InMemoryEntities.class); assertNotNull(container); - EntityContainerFactory.getContext().detachAll(); + containerFactory.getContext().detachAll(); } protected Customer readCustomer(final InMemoryEntities container, int id) { @@ -113,7 +110,7 @@ public abstract class AbstractTestITCase { actual = container.getOrders().get(105); assertNull(actual); - entityContext.detachAll(); + containerFactory.getContext().detachAll(); actual = container.getOrders().get(105); assertNotNull(actual); @@ -123,7 +120,7 @@ public abstract class AbstractTestITCase { container.flush(); - entityContext.detachAll(); + containerFactory.getContext().detachAll(); actual = container.getOrders().get(105); assertNull(actual); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e897cf27/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java index 6d6c899..8c156e2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java @@ -74,7 +74,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase { assertEquals(id, actual.getPersonID()); assertEquals(homeAddress.getCity(), actual.getHomeAddress().getCity()); - entityContext.detachAll(); + containerFactory.getContext().detachAll(); actual = container.getPeople().get(id, Employee.class); assertNotNull(actual); assertEquals(id, actual.getPersonID()); @@ -86,7 +86,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase { actual = container.getPeople().get(id, Employee.class);; assertNull(actual); - entityContext.detachAll(); + containerFactory.getContext().detachAll(); actual = container.getPeople().get(id, Employee.class); assertNull(actual); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e897cf27/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java index 11f7d07..9b63483 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java @@ -65,7 +65,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase { getAnnotation(EntityType.class).openType()); assertTrue(otcontainer.getRow().newIndexedRow().getClass().getInterfaces()[0]. getAnnotation(EntityType.class).openType()); - entityContext.detachAll(); + containerFactory.getContext().detachAll(); } @Test @@ -128,7 +128,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase { assertEquals(Color.class, rowIndex.getAdditionalProperty("aColor").getClass()); assertEquals(Color.Green, rowIndex.getAdditionalProperty("aColor")); - entityContext.detachAll(); + containerFactory.getContext().detachAll(); otcontainer.getRowIndex().delete(id); otcontainer.flush(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e897cf27/fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java index 7c7fde7..0446809 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java @@ -21,7 +21,6 @@ package org.apache.olingo.fit.proxy.v4; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -import org.apache.olingo.ext.proxy.EntityContainerFactory; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI; import org.junit.Test; @@ -50,7 +49,7 @@ public class PropertyTestITCase extends AbstractTestITCase { fail(); } catch (IllegalStateException e) { // ignore and detach all - EntityContainerFactory.getContext().detachAll(); + containerFactory.getContext().detachAll(); } } }
