Changeset 17803

Timestamp:

07/31/08 09:50:50 (1 month ago)

Author:

vmalykhin

Message:

new htmlunit/js introducing and and fixes for tests: js error, Cannot find function hasAttribute, resource syntax error

Files:

• trunk/core/src/net/project/view/pages/resource/management/AssignmentSummary.java (modified) (2 diffs)
• trunk/core/src/net/project/view/pages/resource/management/ViewSummary.java (modified) (2 diffs)
• trunk/core/web/jsp/help/include_outside/footer.jsp (modified) (1 diff)
• trunk/test/acceptance/.classpath (modified) (2 diffs)
• trunk/test/acceptance/lib/htmlunit-core-js-2.2.jar (added)
• trunk/test/acceptance/lib/js-1.7R1.jar (deleted)
• trunk/test/acceptance/src/net/project/test/acceptance/engine/PnetTestEngine.java (modified) (1 diff)

trunk/core/src/net/project/view/pages/resource/management/AssignmentSummary.java

@@ -432 +432 @@
-                                                getPnProject().getProjectId(), startDate, endDate.getTime(), SessionManager.getUser().getDateFormatter());
-
-                summaryGridData = "";
-                summaryGridData = "[  ";
-                if (summaryList != null) {
@@ -466 +465 @@
-                                        .length() - 2);
-                }
+                
+                // todo: the previous loop block should be fixed.
+                // the reason - in certain cases the value of summaryGridData is " ]".
+                // this is producing JS error (at least for HtmlUnit and FF browser console)
+                // so a temporary hack/fix is:
+                if (summaryGridData.equals("")) {
+                        summaryGridData = "[ ";
+                }
+                //
+                
-                summaryGridData += " ]";
-                if (summaryGridData.equals("[ ]")) {

trunk/core/src/net/project/view/pages/resource/management/ViewSummary.java

@@ -335 +335 @@
-                resourceAssignmentDetail.setAssignedProjects(assignmentSummaryDetails);
-
-                summaryGridData = "";
-                summaryGridData = "[ ";
-                if (assignmentSummaryDetails.size() > 0) {
@@ -356 +355 @@
-                        summaryGridData = summaryGridData.substring(0, summaryGridData.length() - 2);
-                }
+                
+                // todo: the previous loop block should be fixed.
+                // the reason - in certain cases the value of summaryGridData is " ]".
+                // this is producing JS error (at least for HtmlUnit and FF browser console)
+                // so a temporary hack/fix is:
+                if (summaryGridData.equals("")) {
+                        summaryGridData = "[ ";
+                }
+                //
+                
-                summaryGridData += " ]";
-                if (summaryGridData.endsWith("[  ]")) {

trunk/core/web/jsp/help/include_outside/footer.jsp

@@ -21 +21 @@
-</div>
-
-<script language="javascript" type="text/javascript">
-
-        if (document.getElementById("fixedBottomLine") == null) {
-                document.write("</div>");
-        }
-
-        // Footer alignment
-        var str = "<div style='clear: both' align=<footerDisplay:get name='@prm.global.footer.alignment' /> >";
-        
-        // Powered-by footer logo image
-        str += "<footerDisplay:img 
-                if='@prm.global.poweredby.isenabled'
-                src='@prm.global.footer.poweredby.logo'
-                href='@prm.global.footer.poweredby.href' />";
-        
-        // Copyright Footers
-        str += "<footerDisplay:if name='@prm.global.footer.copyright.newline'></footerDisplay:if>";
-        
-        str += "<footerDisplay:get
-           name='@prm.global.footer.copyright'
-               if='@prm.global.footer.copyright.isenabled'
-               href='@prm.global.footer.copyright.href'
-               enableLink='@prm.global.footer.copyright.href.isenabled' />";
-               
-        str += "<footerDisplay:if name='@prm.global.footer.copyright.line2.newline'><br/></footerDisplay:if>";
-        
-        str += "<footerDisplay:get
-           name='@prm.global.footer.copyright.line2'
-               if='@prm.global.footer.copyright.line2.isenabled'
-               href='@prm.global.footer.copyright.line2.href'
-               enableLink='@prm.global.footer.copyright.line2.href.isenabled' />";
-                
-        str+="</div>";
-        
-        var href = "<%= PropertyProvider.get("prm.global.footer.copyright.href")%>"; 
-        str = replaceAll(str, href, "\"" + href + "\"");
-        
-        if ((navigator.userAgent.toLowerCase()).indexOf("msie") == -1 || document.getElementById("content") == null) {
-                document.write(str);
-        }
-        else {
-                document.getElementById("content").innerHTML = document.getElementById("content").innerHTML + str;              
-        }       
-
-        function replaceAll(OldString,FindString,ReplaceString) {
-                var SearchIndex = 0;
-                var NewString = ""; 
-                while (OldString.indexOf(FindString,SearchIndex) != -1)    {
-                NewString += OldString.substring(SearchIndex,OldString.indexOf(FindString,SearchIndex));
-                NewString += ReplaceString;
-                SearchIndex = (OldString.indexOf(FindString,SearchIndex) + FindString.length);         
-                }
-                NewString += OldString.substring(SearchIndex,OldString.length);
-                return NewString;
-        }
-        
-</script>
-
-<%-- Provides application server debugging info.--%>
-

trunk/test/acceptance/.classpath

@@ -10 +10 @@
-        <classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
-        <classpathentry kind="lib" path="lib/cssparser-0.9.5.jar"/>
-        <classpathentry kind="lib" path="lib/htmlunit-2.1.jar"/>
-        <classpathentry kind="lib" path="lib/jaxen-1.1.1.jar"/>
-        <classpathentry kind="lib" path="lib/js-1.7R1.jar"/>
-        <classpathentry kind="lib" path="lib/junit-3.8.2.jar"/>
-        <classpathentry kind="lib" path="lib/jwebunit-core-1.5.jar"/>
-        <classpathentry kind="lib" path="lib/log4j-1.2.13.jar"/>
-        <classpathentry kind="lib" path="lib/nekohtml-1.9.7.jar"/>
-        <classpathentry kind="lib" path="lib/regexp-1.3.jar"/>
-        <classpathentry kind="lib" path="lib/sac-1.3.jar"/>
@@ -27 +24 @@
-        <classpathentry kind="lib" path="lib/xmlParserAPIs-2.6.2.jar"/>
-        <classpathentry kind="lib" path="lib/jwebunit-htmlunit-plugin-1.5-patched-for-htmlunit-2.1.jar"/>
+        <classpathentry kind="lib" path="lib/htmlunit-2.1.jar"/>
+        <classpathentry kind="lib" path="lib/nekohtml-1.9.7.jar"/>
+        <classpathentry kind="lib" path="lib/htmlunit-core-js-2.2.jar"/>
-        <classpathentry kind="output" path="bin"/>
-</classpath>

trunk/test/acceptance/src/net/project/test/acceptance/engine/PnetTestEngine.java

@@ -44 +44 @@
-                setTestingEngineKey(TestingEngineRegistry.TESTING_ENGINE_HTMLUNIT);
-                getTestContext().setBaseUrl(PNET_URL);
-
+                       
-                //getTestContext().setUserAgent("Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9) Gecko/2008052906 Firefox/3.0");
-getTestContext().setUserAgent("Mozilla/4.0 (compatible; 
-//
+//getTestContext().setUserAgent("Mozilla/4.0 (
+
-                //getTestContext().setUserAgent("Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11");
-                
-                //beginAt(CONTEXT_PATH);
-        }