You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/01/07 02:25:08 UTC
svn commit: r609484 - in /geronimo/server/trunk:
plugins/console/console-base-portlets/src/main/resources/
testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/
Author: dwoods
Date: Sun Jan 6 17:25:07 2008
New Revision: 609484
URL: http://svn.apache.org/viewvc?rev=609484&view=rev
Log:
GERONIMO-1775 Fix 2 failing tests in the LinkCheckTest for Server Information portlet
Modified:
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties
geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties?rev=609484&r1=609483&r2=609484&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties Sun Jan 6 17:25:07 2008
@@ -295,8 +295,8 @@
infomanager.svrInfoHelp.body = This page provides information about the uptime of the server and the resources being used by the JVM.
infomanager.svrInfoNormal.architecture = Architecture
infomanager.svrInfoNormal.availableProcessors = Available Processors
-infomanager.svrInfoNormal.bootTime = Boot Time
-infomanager.svrInfoNormal.build = Build
+infomanager.svrInfoNormal.startTime = Start Time
+infomanager.svrInfoNormal.version = Version
infomanager.svrInfoNormal.cookiesMustBenabled = Error: Cookies must be enabled
infomanager.svrInfoNormal.currentMemoryUsed = Current Memory Used
infomanager.svrInfoNormal.java = Java
Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties?rev=609484&r1=609483&r2=609484&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties Sun Jan 6 17:25:07 2008
@@ -295,8 +295,8 @@
infomanager.svrInfoHelp.body = \u8FD9\u4E2A\u9875\u9762\u63D0\u4F9B\u4E86\u5173\u4E8E\u670D\u52A1\u5668\u6B63\u5E38\u8FD0\u884C\u65F6\u95F4\u548CJVM\u4F7F\u7528\u7684\u8D44\u6E90\u7684\u4FE1\u606F\u3002
infomanager.svrInfoNormal.architecture = \u67B6\u6784
infomanager.svrInfoNormal.availableProcessors = \u53EF\u7528\u5904\u7406\u5668
-infomanager.svrInfoNormal.bootTime = \u542F\u52A8\u65F6\u95F4
-infomanager.svrInfoNormal.build = \u7248\u672C
+infomanager.svrInfoNormal.startTime = Start Time
+infomanager.svrInfoNormal.version = Version
infomanager.svrInfoNormal.cookiesMustBenabled = \u9519\u8BEF\uFF1A\u5FC5\u987B\u542F\u7528Cookies\u3002
infomanager.svrInfoNormal.currentMemoryUsed = \u5F53\u524D\u5360\u6709\u5185\u5B58
infomanager.svrInfoNormal.java = Java
Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java?rev=609484&r1=609483&r2=609484&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java (original)
+++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java Sun Jan 6 17:25:07 2008
@@ -37,8 +37,9 @@
selenium.waitForPageToLoad("30000");
assertEquals("Geronimo Console", selenium.getTitle());
- assertTrue(selenium.isTextPresent("Geronimo Version"));
- assertTrue(selenium.isTextPresent("Geronimo Start Time"));
+ assertTrue(selenium.isTextPresent("Version"));
+ assertTrue(selenium.isTextPresent("Start Time"));
+ assertTrue(selenium.isTextPresent("Up Time"));
assertEquals("Server Info",
selenium.getText(getPortletTitleLocation()));
Re: svn commit: r609484 - in /geronimo/server/trunk: plugins/console/console-base-portlets/src/main/resources/ testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/
Posted by Jarek Gawor <jg...@gmail.com>.
Btw, I took care of it since I've found some other problems with the
i18n strings in the console.
Jarek
On Jan 6, 2008 10:44 PM, Jarek Gawor <jg...@gmail.com> wrote:
> Donald,
>
> I think you forgot to update the jsp/java files that use these keys.
>
> Jarek
>
>
> On Jan 6, 2008 8:25 PM, <dw...@apache.org> wrote:
> > Author: dwoods
> > Date: Sun Jan 6 17:25:07 2008
> > New Revision: 609484
> >
> > URL: http://svn.apache.org/viewvc?rev=609484&view=rev
> > Log:
> > GERONIMO-1775 Fix 2 failing tests in the LinkCheckTest for Server Information portlet
> >
> > Modified:
> > geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
> > geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties
> > geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java
> >
> > Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
> > URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties?rev=609484&r1=609483&r2=609484&view=diff
> > ==============================================================================
> > --- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties (original)
> > +++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties Sun Jan 6 17:25:07 2008
> > @@ -295,8 +295,8 @@
> > infomanager.svrInfoHelp.body = This page provides information about the uptime of the server and the resources being used by the JVM.
> > infomanager.svrInfoNormal.architecture = Architecture
> > infomanager.svrInfoNormal.availableProcessors = Available Processors
> > -infomanager.svrInfoNormal.bootTime = Boot Time
> > -infomanager.svrInfoNormal.build = Build
> > +infomanager.svrInfoNormal.startTime = Start Time
> > +infomanager.svrInfoNormal.version = Version
> > infomanager.svrInfoNormal.cookiesMustBenabled = Error: Cookies must be enabled
> > infomanager.svrInfoNormal.currentMemoryUsed = Current Memory Used
> > infomanager.svrInfoNormal.java = Java
> >
> > Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties
> > URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties?rev=609484&r1=609483&r2=609484&view=diff
> > ==============================================================================
> > --- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties (original)
> > +++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties Sun Jan 6 17:25:07 2008
> > @@ -295,8 +295,8 @@
> > infomanager.svrInfoHelp.body = \u8FD9\u4E2A\u9875\u9762\u63D0\u4F9B\u4E86\u5173\u4E8E\u670D\u52A1\u5668\u6B63\u5E38\u8FD0\u884C\u65F6\u95F4\u548CJVM\u4F7F\u7528\u7684\u8D44\u6E90\u7684\u4FE1\u606F\u3002
> > infomanager.svrInfoNormal.architecture = \u67B6\u6784
> > infomanager.svrInfoNormal.availableProcessors = \u53EF\u7528\u5904\u7406\u5668
> > -infomanager.svrInfoNormal.bootTime = \u542F\u52A8\u65F6\u95F4
> > -infomanager.svrInfoNormal.build = \u7248\u672C
> > +infomanager.svrInfoNormal.startTime = Start Time
> > +infomanager.svrInfoNormal.version = Version
> > infomanager.svrInfoNormal.cookiesMustBenabled = \u9519\u8BEF\uFF1A\u5FC5\u987B\u542F\u7528Cookies\u3002
> > infomanager.svrInfoNormal.currentMemoryUsed = \u5F53\u524D\u5360\u6709\u5185\u5B58
> > infomanager.svrInfoNormal.java = Java
> >
> > Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java
> > URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java?rev=609484&r1=609483&r2=609484&view=diff
> > ==============================================================================
> > --- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java (original)
> > +++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java Sun Jan 6 17:25:07 2008
> > @@ -37,8 +37,9 @@
> > selenium.waitForPageToLoad("30000");
> > assertEquals("Geronimo Console", selenium.getTitle());
> >
> > - assertTrue(selenium.isTextPresent("Geronimo Version"));
> > - assertTrue(selenium.isTextPresent("Geronimo Start Time"));
> > + assertTrue(selenium.isTextPresent("Version"));
> > + assertTrue(selenium.isTextPresent("Start Time"));
> > + assertTrue(selenium.isTextPresent("Up Time"));
> >
> > assertEquals("Server Info",
> > selenium.getText(getPortletTitleLocation()));
> >
> >
> >
>
Re: svn commit: r609484 - in /geronimo/server/trunk: plugins/console/console-base-portlets/src/main/resources/ testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/
Posted by Jarek Gawor <jg...@gmail.com>.
Donald,
I think you forgot to update the jsp/java files that use these keys.
Jarek
On Jan 6, 2008 8:25 PM, <dw...@apache.org> wrote:
> Author: dwoods
> Date: Sun Jan 6 17:25:07 2008
> New Revision: 609484
>
> URL: http://svn.apache.org/viewvc?rev=609484&view=rev
> Log:
> GERONIMO-1775 Fix 2 failing tests in the LinkCheckTest for Server Information portlet
>
> Modified:
> geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
> geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties
> geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java
>
> Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties?rev=609484&r1=609483&r2=609484&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties (original)
> +++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase.properties Sun Jan 6 17:25:07 2008
> @@ -295,8 +295,8 @@
> infomanager.svrInfoHelp.body = This page provides information about the uptime of the server and the resources being used by the JVM.
> infomanager.svrInfoNormal.architecture = Architecture
> infomanager.svrInfoNormal.availableProcessors = Available Processors
> -infomanager.svrInfoNormal.bootTime = Boot Time
> -infomanager.svrInfoNormal.build = Build
> +infomanager.svrInfoNormal.startTime = Start Time
> +infomanager.svrInfoNormal.version = Version
> infomanager.svrInfoNormal.cookiesMustBenabled = Error: Cookies must be enabled
> infomanager.svrInfoNormal.currentMemoryUsed = Current Memory Used
> infomanager.svrInfoNormal.java = Java
>
> Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties?rev=609484&r1=609483&r2=609484&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties (original)
> +++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/resources/consolebase_zh.properties Sun Jan 6 17:25:07 2008
> @@ -295,8 +295,8 @@
> infomanager.svrInfoHelp.body = \u8FD9\u4E2A\u9875\u9762\u63D0\u4F9B\u4E86\u5173\u4E8E\u670D\u52A1\u5668\u6B63\u5E38\u8FD0\u884C\u65F6\u95F4\u548CJVM\u4F7F\u7528\u7684\u8D44\u6E90\u7684\u4FE1\u606F\u3002
> infomanager.svrInfoNormal.architecture = \u67B6\u6784
> infomanager.svrInfoNormal.availableProcessors = \u53EF\u7528\u5904\u7406\u5668
> -infomanager.svrInfoNormal.bootTime = \u542F\u52A8\u65F6\u95F4
> -infomanager.svrInfoNormal.build = \u7248\u672C
> +infomanager.svrInfoNormal.startTime = Start Time
> +infomanager.svrInfoNormal.version = Version
> infomanager.svrInfoNormal.cookiesMustBenabled = \u9519\u8BEF\uFF1A\u5FC5\u987B\u542F\u7528Cookies\u3002
> infomanager.svrInfoNormal.currentMemoryUsed = \u5F53\u524D\u5360\u6709\u5185\u5B58
> infomanager.svrInfoNormal.java = Java
>
> Modified: geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java?rev=609484&r1=609483&r2=609484&view=diff
> ==============================================================================
> --- geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java (original)
> +++ geronimo/server/trunk/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java Sun Jan 6 17:25:07 2008
> @@ -37,8 +37,9 @@
> selenium.waitForPageToLoad("30000");
> assertEquals("Geronimo Console", selenium.getTitle());
>
> - assertTrue(selenium.isTextPresent("Geronimo Version"));
> - assertTrue(selenium.isTextPresent("Geronimo Start Time"));
> + assertTrue(selenium.isTextPresent("Version"));
> + assertTrue(selenium.isTextPresent("Start Time"));
> + assertTrue(selenium.isTextPresent("Up Time"));
>
> assertEquals("Server Info",
> selenium.getText(getPortletTitleLocation()));
>
>
>