details: https://code.openbravo.com/erp/devel/pi/rev/d45f2b8d352e
changeset: 35179:d45f2b8d352e
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Nov 30 15:14:27 2018 +0100
summary: fixed bug 39725: ViewGeneration fails in retail CI
Retail now has a new grid configuration which caused:
1. SortingFilteringGridConfiguration to be skipped as it is detected as
custom
grid config.
2. SortingFilteringGridConfiguration to leave core module in an inconsistent
state having isIndevelopment = null
This fix:
* Ensures even skipped SortingFilteringGridConfiguration core is kept in a
correct state
* Registers the new grid config so that SortingFilteringGridConfiguration is
executed
* Recovers ViewGeneration execution
diffstat:
src-test/src/org/openbravo/test/views/GridConfigurationTest.java |
3 ++-
src-test/src/org/openbravo/test/views/SortingFilteringGridConfiguration.java |
2 +-
src-test/src/org/openbravo/test/views/ViewGeneration.java |
2 --
3 files changed, 3 insertions(+), 4 deletions(-)
diffs (44 lines):
diff -r 6bb6bc73bc75 -r d45f2b8d352e
src-test/src/org/openbravo/test/views/GridConfigurationTest.java
--- a/src-test/src/org/openbravo/test/views/GridConfigurationTest.java Fri Nov
30 14:06:35 2018 +0100
+++ b/src-test/src/org/openbravo/test/views/GridConfigurationTest.java Fri Nov
30 15:14:27 2018 +0100
@@ -41,7 +41,8 @@
* Standard Grid Configuration IDs
*/
private static final List<String> CORE_DEFAULT_GRID_CONFIGS = Arrays.asList(
- "4701BC23719C41FAA422305FCDBBAF85", "FDA9AFD8D7504E18A220EFC01F5D28D3");
+ "4701BC23719C41FAA422305FCDBBAF85", "FDA9AFD8D7504E18A220EFC01F5D28D3",
+ "1AD989605ACA4F5FB6C11B2E7AC88867");
/**
* @return the current number of grid configurations defined in the system.
diff -r 6bb6bc73bc75 -r d45f2b8d352e
src-test/src/org/openbravo/test/views/SortingFilteringGridConfiguration.java
---
a/src-test/src/org/openbravo/test/views/SortingFilteringGridConfiguration.java
Fri Nov 30 14:06:35 2018 +0100
+++
b/src-test/src/org/openbravo/test/views/SortingFilteringGridConfiguration.java
Fri Nov 30 15:14:27 2018 +0100
@@ -81,7 +81,7 @@
@AfterClass
public static void cleanUp() {
- if (Boolean.TRUE.equals(coreWasInDevelopment)) {
+ if (getNumberOfGridConfigurations() > 0 ||
Boolean.TRUE.equals(coreWasInDevelopment)) {
return;
}
OBContext.setAdminMode(true);
diff -r 6bb6bc73bc75 -r d45f2b8d352e
src-test/src/org/openbravo/test/views/ViewGeneration.java
--- a/src-test/src/org/openbravo/test/views/ViewGeneration.java Fri Nov 30
14:06:35 2018 +0100
+++ b/src-test/src/org/openbravo/test/views/ViewGeneration.java Fri Nov 30
15:14:27 2018 +0100
@@ -34,7 +34,6 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.junit.Ignore;
import org.junit.Test;
import org.openbravo.base.weld.test.WeldBaseTest;
import org.openbravo.client.application.ViewComponent;
@@ -55,7 +54,6 @@
private ViewComponent vc;
@Test
- @Ignore("Failing with retail mods. Temporaryly ignoring. See #39725")
public void viewsShouldBeGeneratedAfterADCSCaching() {
setSystemAdministratorContext();
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
