Menu
▾
▴
[jtrac-svn] SF.net SVN: j-trac:[1469] trunk/jtrac
|
From: <udi...@us...> - 2023-02-11 16:48:17
|
Revision: 1469
http://sourceforge.net/p/j-trac/code/1469
Author: udittmer
Date: 2023-02-11 16:48:15 +0000 (Sat, 11 Feb 2023)
Log Message:
-----------
adapt web unit tests for 2.3.0
Modified Paths:
--------------
trunk/jtrac/pom.xml
trunk/jtrac/src/main/java/info/jtrac/wicket/HeaderPanel.java
trunk/jtrac/src/main/java/info/jtrac/wicket/RoleAllocatePanel.java
trunk/jtrac/src/main/java/info/jtrac/wiki/WikiServlet.java
trunk/jtrac/src/test/java/info/jtrac/htmlunit/BasicTest.java
trunk/jtrac/src/test/java/info/jtrac/util/ItemUtilsTest.java
Modified: trunk/jtrac/pom.xml
===================================================================
--- trunk/jtrac/pom.xml 2023-02-11 13:18:09 UTC (rev 1468)
+++ trunk/jtrac/pom.xml 2023-02-11 16:48:15 UTC (rev 1469)
@@ -381,7 +381,6 @@
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>2.7.1</version>
- <!-- 2.6 and newer are built for Java 11 -->
<classifier>jdk8</classifier>
<!-- 2.x can apparently not read DBs created with 1.8
<version>1.8.0.10</version>
Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/HeaderPanel.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/HeaderPanel.java 2023-02-11 13:18:09 UTC (rev 1468)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/HeaderPanel.java 2023-02-11 16:48:15 UTC (rev 1469)
@@ -61,7 +61,9 @@
});
String base = configMap.get("jtrac.url.base");
- if (! base.endsWith("/")) {
+ if (base == null) {
+ base = "/";
+ } else if (! base.endsWith("/")) {
base = base + "/";
}
add(new ExternalLink("wiki", base+"wiki/view"));
Modified: trunk/jtrac/src/main/java/info/jtrac/wicket/RoleAllocatePanel.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wicket/RoleAllocatePanel.java 2023-02-11 13:18:09 UTC (rev 1468)
+++ trunk/jtrac/src/main/java/info/jtrac/wicket/RoleAllocatePanel.java 2023-02-11 16:48:15 UTC (rev 1469)
@@ -36,11 +36,11 @@
public void setChoices(List<String> choices) {
this.choices = choices;
}
-
+
public List<String> getSelected() {
return selected;
}
-
+
public RoleAllocatePanel(String id) {
super(id);
CheckGroup checkGroup = new CheckGroup("checkGroup", new PropertyModel(this, "selected"));
Modified: trunk/jtrac/src/main/java/info/jtrac/wiki/WikiServlet.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wiki/WikiServlet.java 2023-02-11 13:18:09 UTC (rev 1468)
+++ trunk/jtrac/src/main/java/info/jtrac/wiki/WikiServlet.java 2023-02-11 16:48:15 UTC (rev 1469)
@@ -135,7 +135,9 @@
jtrac = (Jtrac) applicationContext.getBean("jtrac");
String baseDir = jtrac.getJtracHome();
baseUrl = jtrac.loadConfig("jtrac.url.base");
- if (! baseUrl.endsWith("/"))
+ if (baseUrl == null) {
+ baseUrl = "/";
+ } else if (! baseUrl.endsWith("/"))
baseUrl = baseUrl + "/";
policy = new Policy(new File(baseDir));
Modified: trunk/jtrac/src/test/java/info/jtrac/htmlunit/BasicTest.java
===================================================================
--- trunk/jtrac/src/test/java/info/jtrac/htmlunit/BasicTest.java 2023-02-11 13:18:09 UTC (rev 1468)
+++ trunk/jtrac/src/test/java/info/jtrac/htmlunit/BasicTest.java 2023-02-11 16:48:15 UTC (rev 1469)
@@ -49,8 +49,9 @@
WebAssert.assertTextPresent(page, "Space Details");
((HtmlElement) page.getElementByName("space.name")).type("Test Space");
((HtmlElement) page.getElementByName("space.prefixCode")).type("TEST");
+ ((HtmlCheckBoxInput) page.getFirstByXPath("//input[@name='space.isActive']")).click();
page = ((HtmlElement) page.getFirstByXPath("//input[@value='Next']")).click();
- WebAssert.assertTextPresent(page, "Custom Fields for Space:");
+ WebAssert.assertTextPresent(page, "Custom Fields for Space");
page = ((HtmlElement) page.getFirstByXPath("//input[@value='Next']")).click();
WebAssert.assertTextPresent(page, "Space Roles");
page = ((HtmlElement) page.getFirstByXPath("//input[@value='Save']")).click();
@@ -111,7 +112,7 @@
page = ((HtmlElement) page.getFirstByXPath("//a[text()[normalize-space(.) = 'OPTIONS']]")).click();
WebAssert.assertTextPresent(page, "Options Menu");
page = ((HtmlElement) page.getFirstByXPath("//a[text()[normalize-space(.) = 'Configure Links']]")).click();
- WebAssert.assertTextPresent(page, "Links configuration");
+ WebAssert.assertTextPresent(page, "Link configuration");
page = ((HtmlElement) page.getFirstByXPath("//a[text()[normalize-space(.) = 'Create a new link']]")).click();
WebAssert.assertTextPresent(page, "Link details");
((HtmlElement) page.getElementByName("name")).type("Test Link");
@@ -129,7 +130,20 @@
}
@Test
- public void test_J_Logout() throws Exception {
+ public void test_J_Wiki() throws IOException {
+ page = webClient.getPage("http://localhost:8888/wiki/view");
+ WebAssert.assertTitleEquals(page, "Home Page");
+ page = ((HtmlElement) page.getFirstByXPath("//a[text()[normalize-space(.) = 'SandBox']]")).click();
+ WebAssert.assertTitleEquals(page, "Sand Box");
+ ((HtmlElement) page.getElementByName("q")).type("qweqwe");
+ page = ((HtmlElement) page.getFirstByXPath("//input[@value='Search']")).click();
+ WebAssert.assertTextPresent(page, "No results for");
+ page = ((HtmlElement) page.getFirstByXPath("//a[text()[normalize-space(.) = 'Dashboard']]")).click();
+ WebAssert.assertTitleEquals(page, "JTrac");
+ }
+
+ @Test
+ public void test_K_Logout() throws Exception {
page = ((HtmlElement) page.getFirstByXPath("//a[text()[normalize-space(.) = 'LOGOUT']]")).click();
WebAssert.assertTextPresent(page, "Logout Successful");
}
Modified: trunk/jtrac/src/test/java/info/jtrac/util/ItemUtilsTest.java
===================================================================
--- trunk/jtrac/src/test/java/info/jtrac/util/ItemUtilsTest.java 2023-02-11 13:18:09 UTC (rev 1468)
+++ trunk/jtrac/src/test/java/info/jtrac/util/ItemUtilsTest.java 2023-02-11 16:48:15 UTC (rev 1469)
@@ -21,11 +21,11 @@
public void testMarkdown() {
Assert.assertEquals(null, ItemUtils.renderMarkdown(null));
Assert.assertEquals("", ItemUtils.renderMarkdown(""));
- Assert.assertEquals("<p>Hello World</p>\n", ItemUtils.renderMarkdown("Hello World"));
- Assert.assertEquals("<p><em>Hello</em> <strong>World</strong></p>\n", ItemUtils.renderMarkdown("*Hello* **World**"));
- Assert.assertEquals("<h1>Hello World</h1>\n", ItemUtils.renderMarkdown("# Hello World"));
- Assert.assertEquals("<h2>Hello World</h2>\n", ItemUtils.renderMarkdown("## Hello World"));
- Assert.assertEquals("<blockquote>\n<p>Hello World</p>\n</blockquote>\n", ItemUtils.renderMarkdown("> Hello World"));
+ Assert.assertEquals("<p>Hello World</p>", ItemUtils.renderMarkdown("Hello World"));
+ Assert.assertEquals("<p><em>Hello</em> <strong>World</strong></p>", ItemUtils.renderMarkdown("*Hello* **World**"));
+ Assert.assertEquals("<h1>Hello World</h1>", ItemUtils.renderMarkdown("# Hello World"));
+ Assert.assertEquals("<h2>Hello World</h2>", ItemUtils.renderMarkdown("## Hello World"));
+ Assert.assertEquals("<blockquote>\n<p>Hello World</p>\n</blockquote>", ItemUtils.renderMarkdown("> Hello World"));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
