svn commit: r1799419 - in /ofbiz/branches/release16.11: ./ framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java

[jacopoc]

Author: jacopoc
Date: Wed Jun 21 09:53:51 2017
New Revision: 1799419

URL: http://svn.apache.org/viewvc?rev=1799419&view=rev
Log:
Applied fix from trunk for revision: 1799417
===

Fixed: unit test failure when "verbose" logging was on.
(OFBIZ-9305)

When print.verbose was set to true in debug.properties, the unit test
EntitySaxReaderTests.parse was failing because it is using some mock objects;
fixed by temporarily disabling the verbose logging during the test.

Thanks: William Wang for the report.


Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 21 09:53:51 2017
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java?rev=1799419&r1=1799418&r2=1799419&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java (original)
+++ ofbiz/branches/release16.11/framework/entity/src/test/java/org/apache/ofbiz/entity/util/EntitySaxReaderTests.java Wed Jun 21 09:53:51 2017
@@ -18,15 +18,32 @@
  *******************************************************************************/
 package org.apache.ofbiz.entity.util;
 
+import org.apache.ofbiz.base.util.Debug;
 import org.apache.ofbiz.entity.Delegator;
 import org.apache.ofbiz.entity.GenericValue;
 import org.apache.ofbiz.entity.model.ModelEntity;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 public class EntitySaxReaderTests {
+    private boolean logVerboseOn;
+
+    @Before
+    public void initialize() {
+        logVerboseOn = Debug.isOn(Debug.VERBOSE); // save the current setting (to be restored after the tests)
+        Debug.set(Debug.VERBOSE, false); // disable verbose logging: this is necessary to avoid a test error in the "parse" unit test
+    }
+
+    @After
+    public void restore() {
+        Debug.set(Debug.VERBOSE, logVerboseOn); // restore the verbose log setting
+    }
+
+
     @Test
     public void constructorWithDefaultTimeout() {
         Delegator delegator = mock(Delegator.class);