svn commit: r1780660 - in /ofbiz/branches/release16.11: ./ framework/widget/src/main/java/org/apache/ofbiz/widget/test/WidgetMacroLibraryTests.java

Author: jleroux
Date: Sat Jan 28 11:20:08 2017
New Revision: 1780660

URL: http://svn.apache.org/viewvc?rev=1780660&view=rev
Log:
"Applied fix from trunk for revision: 1780659  "
------------------------------------------------------------------------
r1780659 | jleroux | 2017-01-28 12:19:34 +0100 (sam. 28 janv. 2017) | 7 lignes

No functional change, only this test is concerned, more a bug fix though.

Despite missing the creation data in svn, I guess this file has been created
after I created the portoffset feature or I missed it then (unlikely since I
changed all 8080 and 8443 ports in Java code).

Anyway, we now need this to be portoffset aware and this commit just does that
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/framework/widget/src/main/java/org/apache/ofbiz/widget/test/WidgetMacroLibraryTests.java

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 28 11:20:08 2017
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724
+/ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659

Modified: ofbiz/branches/release16.11/framework/widget/src/main/java/org/apache/ofbiz/widget/test/WidgetMacroLibraryTests.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/framework/widget/src/main/java/org/apache/ofbiz/widget/test/WidgetMacroLibraryTests.java?rev=1780660&r1=1780659&r2=1780660&view=diff
==============================================================================
--- ofbiz/branches/release16.11/framework/widget/src/main/java/org/apache/ofbiz/widget/test/WidgetMacroLibraryTests.java (original)
+++ ofbiz/branches/release16.11/framework/widget/src/main/java/org/apache/ofbiz/widget/test/WidgetMacroLibraryTests.java Sat Jan 28 11:20:08 2017
@@ -20,23 +20,21 @@
 package org.apache.ofbiz.widget.test;
 
 import java.io.InputStream;
-import java.net.ContentHandler;
 
-import org.apache.tika.Tika;
-import org.apache.tika.config.TikaConfig;
-import org.apache.tika.metadata.Metadata;
-import org.apache.tika.parser.ParseContext;
-import org.apache.tika.parser.pdf.PDFParser;
-import org.apache.tika.sax.BodyContentHandler;
+import org.apache.ofbiz.base.start.Start;
 import org.apache.ofbiz.base.util.HttpClient;
 import org.apache.ofbiz.base.util.HttpClientException;
 import org.apache.ofbiz.base.util.SSLUtil;
 import org.apache.ofbiz.service.testtools.OFBizTestCase;
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.parser.ParseContext;
+import org.apache.tika.parser.pdf.PDFParser;
+import org.apache.tika.sax.BodyContentHandler;
 
 
 public class WidgetMacroLibraryTests extends OFBizTestCase {
 
-    protected final String screenUrl = "https://localhost:8443/webtools/control/WebtoolsLayoutDemo" ; //use existing screen to present most of layout use case
+    protected String screenUrl = "https://localhost:8443/webtools/control/WebtoolsLayoutDemo" ; //use existing screen to present most of layout use case
     protected final String authentificationQuery = "?USERNAME=admin&PASSWORD=ofbiz";
 
     public WidgetMacroLibraryTests(String name) {
@@ -56,6 +54,10 @@ public class WidgetMacroLibraryTests ext
 
     public void testHtmlMacroLibrary() throws Exception {
         HttpClient http = initHttpClient();
+        if (Start.getInstance().getConfig().portOffset != 0) {
+            Integer port = 8443 + Start.getInstance().getConfig().portOffset;
+            screenUrl = screenUrl.replace("8443", port.toString());
+        }
         http.setUrl(screenUrl.concat(authentificationQuery));
         String screenOutString = http.post();
         assertNotNull("Response failed from ofbiz", screenOutString);