details:   https://code.openbravo.com/erp/devel/pi/rev/0615284678a2
changeset: 34007:0615284678a2
user:      Carlos Aristu <carlos.aristu <at> openbravo.com>
date:      Wed May 23 08:58:43 2018 +0200
summary:   related to issue 38520: fix test case problems

  - Keep resetting the execution count before doing the setUp, and refresh the 
entities of the observers just in case the DAL layer has been reinitialized

diffstat:

 
modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/ObserverBaseTest.java
      |  4 +++-
 
modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderLineTestObserver.java
 |  7 +++++++
 
modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderTestObserver.java
     |  7 +++++++
 3 files changed, 17 insertions(+), 1 deletions(-)

diffs (46 lines):

diff -r e81a78a7757b -r 0615284678a2 
modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/ObserverBaseTest.java
--- 
a/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/ObserverBaseTest.java
       Tue May 22 19:18:03 2018 +0200
+++ 
b/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/ObserverBaseTest.java
       Wed May 23 08:58:43 2018 +0200
@@ -48,9 +48,11 @@
   @Before
   @Override
   public void setUp() throws Exception {
-    super.setUp();
     OrderTestObserver.resetExecutionCount();
     OrderLineTestObserver.resetExecutionCount();
+    super.setUp();
+    OrderTestObserver.refreshObservedEntities();
+    OrderLineTestObserver.refreshObservedEntities();
   }
 
   protected OrderLine pickARandomOrderLine() {
diff -r e81a78a7757b -r 0615284678a2 
modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderLineTestObserver.java
--- 
a/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderLineTestObserver.java
  Tue May 22 19:18:03 2018 +0200
+++ 
b/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderLineTestObserver.java
  Wed May 23 08:58:43 2018 +0200
@@ -151,4 +151,11 @@
   public static int getNumberOfClosedTrxs() {
     return endTrx;
   }
+
+  public static void refreshObservedEntities() {
+    Entity currentEntity = 
ModelProvider.getInstance().getEntity(OrderLine.ENTITY_NAME);
+    if (entities[0] != currentEntity) {
+      entities[0] = currentEntity;
+    }
+  }
 }
diff -r e81a78a7757b -r 0615284678a2 
modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderTestObserver.java
--- 
a/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderTestObserver.java
      Tue May 22 19:18:03 2018 +0200
+++ 
b/modules/org.openbravo.client.application/src-test/org/openbravo/client/application/test/event/OrderTestObserver.java
      Wed May 23 08:58:43 2018 +0200
@@ -83,4 +83,11 @@
     final Entity orderEntity = 
ModelProvider.getInstance().getEntity(Order.ENTITY_NAME);
     return orderEntity.getProperty(Order.PROPERTY_ORDERLINELIST);
   }
+
+  public static void refreshObservedEntities() {
+    Entity currentEntity = 
ModelProvider.getInstance().getEntity(Order.ENTITY_NAME);
+    if (entities[0] != currentEntity) {
+      entities[0] = currentEntity;
+    }
+  }
 }

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to