Menu
▾
▴
[jtrac-svn] SF.net SVN: j-trac:[1418] trunk/jtrac
|
From: <udi...@us...> - 2021-11-22 13:24:21
|
Revision: 1418
http://sourceforge.net/p/j-trac/code/1418
Author: udittmer
Date: 2021-11-22 13:24:18 +0000 (Mon, 22 Nov 2021)
Log Message:
-----------
move unit tests to JUnit 4, add HtmlUnit test in lieu of the deleted Selenium test
Modified Paths:
--------------
trunk/jtrac/pom.xml
trunk/jtrac/src/test/java/info/jtrac/JtracTest.java
trunk/jtrac/src/test/java/info/jtrac/JtracTestBase.java
trunk/jtrac/src/test/java/info/jtrac/domain/CountsTest.java
trunk/jtrac/src/test/java/info/jtrac/domain/ExcelFileTest.java
trunk/jtrac/src/test/java/info/jtrac/domain/FieldTest.java
trunk/jtrac/src/test/java/info/jtrac/domain/ItemTest.java
trunk/jtrac/src/test/java/info/jtrac/domain/MetadataTest.java
trunk/jtrac/src/test/java/info/jtrac/domain/RoleTest.java
trunk/jtrac/src/test/java/info/jtrac/domain/UserTest.java
trunk/jtrac/src/test/java/info/jtrac/lucene/IndexSearcherTest.java
trunk/jtrac/src/test/java/info/jtrac/svn/SvnTest.java
trunk/jtrac/src/test/java/info/jtrac/util/ItemUtilsTest.java
trunk/jtrac/src/test/java/info/jtrac/util/JtracConfigurerTest.java
trunk/jtrac/src/test/java/info/jtrac/util/ValidationUtilsTest.java
trunk/jtrac/src/test/java/info/jtrac/util/XmlUtilsTest.java
Added Paths:
-----------
trunk/jtrac/src/test/java/info/jtrac/htmlunit/
trunk/jtrac/src/test/java/info/jtrac/htmlunit/BasicTest.java
Removed Paths:
-------------
trunk/jtrac/src/test/java/info/jtrac/test/
Modified: trunk/jtrac/pom.xml
===================================================================
--- trunk/jtrac/pom.xml 2021-11-19 11:13:45 UTC (rev 1417)
+++ trunk/jtrac/pom.xml 2021-11-22 13:24:18 UTC (rev 1418)
@@ -64,6 +64,12 @@
<version>4.13.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>2.55.0</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
@@ -474,7 +480,7 @@
<goal>testCompile</goal>
</goals>
<configuration>
- <skip>true</skip>
+ <skip>false</skip>
</configuration>
</execution>
</executions>
@@ -495,10 +501,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
+ <version>3.0.0-M5</version>
<configuration>
<excludes>
<exclude>info/jtrac/test/**</exclude>
+ <exclude>info/jtrac/JtracTest</exclude>
</excludes>
</configuration>
</plugin>
Modified: trunk/jtrac/src/test/java/info/jtrac/JtracTest.java
===================================================================
--- trunk/jtrac/src/test/java/info/jtrac/JtracTest.java 2021-11-19 11:13:45 UTC (rev 1417)
+++ trunk/jtrac/src/test/java/info/jtrac/JtracTest.java 2021-11-22 13:24:18 UTC (rev 1418)
@@ -13,6 +13,7 @@
import info.jtrac.domain.State;
import info.jtrac.domain.UserSpaceRole;
import info.jtrac.util.ItemUtils;
+
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -21,6 +22,8 @@
import org.acegisecurity.GrantedAuthority;
import org.acegisecurity.userdetails.UserDetails;
+import org.junit.*;
+
/**
* JUnit test cases for the business implementation as well as the DAO
* Tests assume that a database is available, and with HSQLDB around this is not an issue.
@@ -62,26 +65,30 @@
//==========================================================================
+ @Test
public void testGeneratedPasswordIsAlwaysDifferent() {
String p1 = jtrac.generatePassword();
String p2 = jtrac.generatePassword();
- assertTrue(!p1.equals(p2));
+ Assert.assertTrue(!p1.equals(p2));
}
+ @Test
public void testEncodeClearTextPassword() {
- assertEquals("21232f297a57a5a743894a0e4a801fc3", jtrac.encodeClearText("admin"));
+ Assert.assertEquals("21232f297a57a5a743894a0e4a801fc3", jtrac.encodeClearText("admin"));
}
+ @Test
public void testMetadataInsertAndLoad() {
Metadata m1 = getMetadata();
jtrac.storeMetadata(m1);
- assertTrue(m1.getId() > 0);
+ Assert.assertTrue(m1.getId() > 0);
Metadata m2 = jtrac.loadMetadata(m1.getId());
- assertTrue(m2 != null);
+ Assert.assertTrue(m2 != null);
Map<Field.Name, Field> fields = m2.getFields();
- assertTrue(fields.size() == 2);
+ Assert.assertTrue(fields.size() == 2);
}
+ @Test
public void testUserInsertAndLoad() {
User user = new User();
user.setLoginName("test");
@@ -88,11 +95,12 @@
user.setEmail("te...@jt...");
jtrac.storeUser(user);
User user1 = jtrac.loadUser("test");
- assertTrue(user1.getEmail().equals("te...@jt..."));
+ Assert.assertTrue(user1.getEmail().equals("te...@jt..."));
User user2 = dao.findUsersByEmail("te...@jt...").get(0);
- assertTrue(user2.getLoginName().equals("test"));
+ Assert.assertTrue(user2.getLoginName().equals("test"));
}
+ @Test
public void testUserSpaceRolesInsert() {
Space space = getSpace();
Metadata metadata = getMetadata();
@@ -109,29 +117,31 @@
User u1 = jtrac.loadUser("test");
GrantedAuthority[] gas = u1.getAuthorities();
- assertEquals(1, gas.length);
- assertEquals("ROLE_TEST:TEST", gas[0].getAuthority());
+ Assert.assertEquals(1, gas.length);
+ Assert.assertEquals("ROLE_TEST:TEST", gas[0].getAuthority());
List<UserSpaceRole> userSpaceRoles = jtrac.findUserRolesForSpace(space.getId());
- assertEquals(1, userSpaceRoles.size());
+ Assert.assertEquals(1, userSpaceRoles.size());
UserSpaceRole usr = userSpaceRoles.get(0);
- assertEquals("test", usr.getUser().getLoginName());
- assertEquals("ROLE_TEST", usr.getRoleKey());
+ Assert.assertEquals("test", usr.getUser().getLoginName());
+ Assert.assertEquals("ROLE_TEST", usr.getRoleKey());
List<User> users = jtrac.findUsersForUser(u1);
- assertEquals(1, users.size());
+ Assert.assertEquals(1, users.size());
List<User> users2 = jtrac.findUsersForSpace(space.getId());
- assertEquals(1, users2.size());
+ Assert.assertEquals(1, users2.size());
}
+ @Test
public void testConfigStoreAndLoad() {
Config config = new Config("testParam", "testValue");
jtrac.storeConfig(config);
String value = jtrac.loadConfig("testParam");
- assertEquals("testValue", value);
+ Assert.assertEquals("testValue", value);
}
+ @Test
public void testStoreAndLoadUserWithAdminRole() {
User user = new User();
user.setLoginName("test");
@@ -145,10 +155,11 @@
set.add(ga.getAuthority());
}
- assertEquals(1, set.size());
- assertTrue(set.contains("ROLE_ADMIN"));
+ Assert.assertEquals(1, set.size());
+ Assert.assertTrue(set.contains("ROLE_ADMIN"));
}
+ @Test
public void testDefaultAdminUserHasAdminRole() {
UserDetails ud = jtrac.loadUserByUsername("admin");
Set<String> set = new HashSet<String>();
@@ -155,10 +166,11 @@
for (GrantedAuthority ga : ud.getAuthorities()) {
set.add(ga.getAuthority());
}
- assertEquals(1, set.size());
- assertTrue(set.contains("ROLE_ADMIN"));
+ Assert.assertEquals(1, set.size());
+ Assert.assertTrue(set.contains("ROLE_ADMIN"));
}
+ @Test
public void testItemInsertAndCounts() {
Space s = getSpace();
jtrac.storeSpace(s);
@@ -172,19 +184,20 @@
i.setLoggedBy(u);
i.setStatus(State.CLOSED);
jtrac.storeItem(i, null);
- assertEquals(1, i.getSequenceNum());
+ Assert.assertEquals(1, i.getSequenceNum());
CountsHolder ch = jtrac.loadCountsForUser(u);
- assertEquals(1, ch.getTotalAssignedToMe());
- assertEquals(1, ch.getTotalLoggedByMe());
- assertEquals(1, ch.getTotalTotal());
+ Assert.assertEquals(1, ch.getTotalAssignedToMe());
+ Assert.assertEquals(1, ch.getTotalLoggedByMe());
+ Assert.assertEquals(1, ch.getTotalTotal());
Counts c = ch.getCounts().get(s.getId());
- assertEquals(1, c.getLoggedByMe());
- assertEquals(1, c.getAssignedToMe());
- assertEquals(1, c.getTotal());
+ Assert.assertEquals(1, c.getLoggedByMe());
+ Assert.assertEquals(1, c.getAssignedToMe());
+ Assert.assertEquals(1, c.getTotal());
}
+ @Test
public void testRemoveSpaceRoleDoesNotOrphanDatabaseRecord() {
Space space = getSpace();
jtrac.storeSpace(space);
@@ -195,21 +208,23 @@
jtrac.storeUser(user);
long id = jdbcTemplate.queryForLong("select id from user_space_roles where space_id = " + spaceId);
UserSpaceRole usr = jtrac.loadUserSpaceRole(id);
- assertEquals(spaceId, usr.getSpace().getId());
+ Assert.assertEquals(spaceId, usr.getSpace().getId());
jtrac.removeUserSpaceRole(usr);
setComplete();
endTransaction();
- assertEquals(0, jdbcTemplate.queryForInt("select count(0) from user_space_roles where space_id = " + spaceId));
+ Assert.assertEquals(0, jdbcTemplate.queryForInt("select count(0) from user_space_roles where space_id = " + spaceId));
cleanDatabase();
}
+ @Test
public void testFindSpacesWhereGuestAllowed() {
Space space = getSpace();
space.setGuestAllowed(true);
jtrac.storeSpace(space);
- assertEquals(1, jtrac.findSpacesWhereGuestAllowed().size());
+ Assert.assertEquals(1, jtrac.findSpacesWhereGuestAllowed().size());
}
+ @Test
public void testRenameSpaceRole() {
Space space = getSpace();
jtrac.storeSpace(space);
@@ -217,12 +232,13 @@
u.setLoginName("test");
u.addSpaceWithRole(space, "DEFAULT");
jtrac.storeUser(u);
- assertEquals(1, jdbcTemplate.queryForInt("select count(0) from user_space_roles where role_key = 'DEFAULT'"));
+ Assert.assertEquals(1, jdbcTemplate.queryForInt("select count(0) from user_space_roles where role_key = 'DEFAULT'"));
jtrac.bulkUpdateRenameSpaceRole(space, "DEFAULT", "NEWDEFAULT");
- assertEquals(0, jdbcTemplate.queryForInt("select count(0) from user_space_roles where role_key = 'DEFAULT'"));
- assertEquals(1, jdbcTemplate.queryForInt("select count(0) from user_space_roles where role_key = 'NEWDEFAULT'"));
+ Assert.assertEquals(0, jdbcTemplate.queryForInt("select count(0) from user_space_roles where role_key = 'DEFAULT'"));
+ Assert.assertEquals(1, jdbcTemplate.queryForInt("select count(0) from user_space_roles where role_key = 'NEWDEFAULT'"));
}
+ @Test
public void testGetItemAsHtmlDoesNotThrowException() {
Config config = new Config("mail.server.host", "dummyhost");
jtrac.storeConfig(config);
@@ -243,9 +259,10 @@
// next step will internally try to render item as Html for sending e-mail
jtrac.storeItem(i, null);
String rendered = ItemUtils.getAsXml(i).asXML();
- assertTrue(rendered.contains("<item refId=\"TEST-"));
+ Assert.assertTrue(rendered.contains("<item refId=\"TEST-"));
}
+ @Test
public void testDeleteItemThatHasRelatedItems() {
Space s = getSpace();
jtrac.storeSpace(s);
@@ -277,12 +294,13 @@
i2.setStatus(State.CLOSED);
i2.addRelated(i1, ItemItem.DUPLICATE_OF);
jtrac.storeItem(i2, null);
- assertEquals(3, jtrac.loadCountOfHistoryInvolvingUser(u));
+ Assert.assertEquals(3, jtrac.loadCountOfHistoryInvolvingUser(u));
// can we remove i1?
Item temp = jtrac.loadItem(i1.getId());
jtrac.removeItem(temp);
}
+ @Test
public void testDeletingUserDeletesItemUsersAlso() {
Space s = getSpace();
jtrac.storeSpace(s);
@@ -320,11 +338,12 @@
startNewTransaction();
Item dummyItem = jtrac.loadItem(i.getId());
- assertEquals(0, dummyItem.getItemUsers().size());
+ Assert.assertEquals(0, dummyItem.getItemUsers().size());
cleanDatabase();
}
+ @Test
public void testLogicToFindNotUsersAndSpacesNotAllocated() {
cleanDatabase();
@@ -348,12 +367,12 @@
jtrac.storeUser(u1);
List<Space> list = jtrac.findSpacesNotFullyAllocatedToUser(u1.getId());
- assertEquals(2, list.size());
+ Assert.assertEquals(2, list.size());
jtrac.storeUserSpaceRole(u1, s1, "ROLE_ADMIN");
List<Space> list2 = jtrac.findSpacesNotFullyAllocatedToUser(u1.getId());
- assertEquals(1, list2.size());
+ Assert.assertEquals(1, list2.size());
User u2 = new User();
u2.setLoginName("test2");
@@ -361,26 +380,25 @@
List<User> list3 = jtrac.findUsersNotFullyAllocatedToSpace(s1.getId());
// admin user exists also
- assertEquals(2, list3.size());
+ Assert.assertEquals(2, list3.size());
jtrac.storeUserSpaceRole(u2, s1, "DEFAULT");
List<User> list4 = jtrac.findUsersNotFullyAllocatedToSpace(s1.getId());
logger.info(list4);
- assertEquals(2, list4.size());
+ Assert.assertEquals(2, list4.size());
-
jtrac.storeUserSpaceRole(u2, s1, "ROLE_ADMIN");
List<User> list5 = jtrac.findUsersNotFullyAllocatedToSpace(s1.getId());
- assertEquals(1, list5.size());
+ Assert.assertEquals(1, list5.size());
}
+ @Test
public void testFindSuperUsers() {
-
List<User> list1 = dao.findSuperUsers();
- assertEquals(1, list1.size());
- assertEquals("admin", list1.get(0).getLoginName());
+ Assert.assertEquals(1, list1.size());
+ Assert.assertEquals("admin", list1.get(0).getLoginName());
User u1 = new User();
u1.setLoginName("test2");
@@ -389,11 +407,11 @@
jtrac.storeUserSpaceRole(u1, null, "ROLE_ADMIN");
List<User> list2 = dao.findSuperUsers();
- assertEquals(2, list2.size());
+ Assert.assertEquals(2, list2.size());
}
+ @Test
public void testLoadSpaceRolesMapForUser() {
-
User u1 = new User();
u1.setLoginName("test2");
jtrac.storeUser(u1);
@@ -401,7 +419,6 @@
jtrac.storeUserSpaceRole(u1, null, "ROLE_ADMIN");
Map<Long, List<UserSpaceRole>> map = jtrac.loadSpaceRolesMapForUser(u1.getId());
- assertEquals(1, map.size());
+ Assert.assertEquals(1, map.size());
}
-
}
Modified: trunk/jtrac/src/test/java/info/jtrac/JtracTestBase.java
===================================================================
--- trunk/jtrac/src/test/java/info/jtrac/JtracTestBase.java 2021-11-19 11:13:45 UTC (rev 1417)
+++ trunk/jtrac/src/test/java/info/jtrac/JtracTestBase.java 2021-11-22 13:24:18 UTC (rev 1418)
@@ -1,38 +1,38 @@
-package info.jtrac;
-
-import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
-
-/**
- * base class for tests that can test either the service layer or dao or both
- * using the Spring JUnit helper class with the long name, ensures that
- * the applicationContext is only built once
- */
-public abstract class JtracTestBase extends AbstractTransactionalDataSourceSpringContextTests {
-
- protected Jtrac jtrac;
- protected JtracDao dao;
-
- public JtracTestBase(String name) {
- super(name);
- }
-
- // magically autowired by Spring JUnit support
- public void setDao(JtracDao dao) {
- this.dao = dao;
- }
-
- // magically autowired by Spring JUnit support
- public void setJtrac(Jtrac jtrac) {
- this.jtrac = jtrac;
- }
-
- @Override
- protected String[] getConfigLocations() {
- System.setProperty("jtrac.home", "target/home");
- return new String[] {
- "file:src/main/webapp/WEB-INF/applicationContext.xml",
- "file:src/main/webapp/WEB-INF/applicationContext-lucene.xml"
- };
- }
-
-}
+package info.jtrac;
+
+import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
+
+/**
+ * base class for tests that can test either the service layer or dao or both
+ * using the Spring JUnit helper class with the long name, ensures that
+ * the applicationContext is only built once
+ */
+public abstract class JtracTestBase extends AbstractTransactionalDataSourceSpringContextTests {
+
+ protected Jtrac jtrac;
+ protected JtracDao dao;
+
+ public JtracTestBase(String name) {
+ super(name);
+ }
+
+ // magically autowired by Spring JUnit support
+ public void setDao(JtracDao dao) {
+ this.dao = dao;
+ }
+
+ // magically autowired by Spring JUnit support
+ public void setJtrac(Jtrac jtrac) {
+ this.jtrac = jtrac;
+ }
+
+ @Override
+ protected String[] getConfigLocations() {
+ System.setProperty("jtrac.home", "target/home");
+ return new String[] {
+ "file:src/main/webapp/WEB-INF/applicationContext.xml",
+ "file:src/main/webapp/WEB-INF/applicationContext-lucene.xml"
+ };
+ }
+
+}
Modified: trunk/jtrac/src/test/java/info/jtrac/domain/CountsTest.java
===================================================================
--- trunk/jtrac/src/test/java/info/jtrac/domain/CountsTest.java 2021-11-19 11:13:45 UTC (rev 1417)
+++ trunk/jtrac/src/test/java/info/jtrac/domain/CountsTest.java 2021-11-22 13:24:18 UTC (rev 1418)
@@ -1,15 +1,17 @@
-package info.jtrac.domain;
-
-import java.util.HashMap;
-import java.util.Map;
-import junit.framework.TestCase;
-
-public class CountsTest extends TestCase {
-
- public void testCountsLogic() {
- Counts c = new Counts(false);
- c.add(Counts.ASSIGNED_TO_ME, 1, 5);
- assertEquals(0, c.getTotal());
- assertEquals(5, c.getAssignedToMe());
- }
-}
+package info.jtrac.domain;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.*;
+
+public class CountsTest {
+
+ @Test
+ public void testCountsLogic() {
+ Counts c = new Counts(false);
+ c.add(Counts.ASSIGNED_TO_ME, 1, 5);
+ Assert.assertEquals(0, c.getTotal());
+ Assert.assertEquals(5, c.getAssignedToMe());
+ }
+}
Modified: trunk/jtrac/src/test/java/info/jtrac/domain/ExcelFileTest.java
===================================================================
--- trunk/jtrac/src/test/java/info/jtrac/domain/ExcelFileTest.java 2021-11-19 11:13:45 UTC (rev 1417)
+++ trunk/jtrac/src/test/java/info/jtrac/domain/ExcelFileTest.java 2021-11-22 13:24:18 UTC (rev 1418)
@@ -1,10 +1,12 @@
package info.jtrac.domain;
import java.io.FileInputStream;
-import junit.framework.TestCase;
-public class ExcelFileTest extends TestCase {
+import org.junit.*;
+
+public class ExcelFileTest {
+ @Test
public void testLoadFile() throws Exception {
// ExcelFile ef = new ExcelFile(new FileInputStream("src/test/resources/data.xls"));
}
Modified: trunk/jtrac/src/test/java/info/jtrac/domain/FieldTest.java
===================================================================
--- trunk/jtrac/src/test/java/info/jtrac/domain/FieldTest.java 2021-11-19 11:13:45 UTC (rev 1417)
+++ trunk/jtrac/src/test/java/info/jtrac/domain/FieldTest.java 2021-11-22 13:24:18 UTC (rev 1418)
@@ -2,49 +2,56 @@
import info.jtrac.domain.Field;
import info.jtrac.util.XmlUtils;
-import junit.framework.TestCase;
+
+import org.junit.*;
+
import org.dom4j.Document;
import org.dom4j.Element;
-public class FieldTest extends TestCase {
+public class FieldTest {
+ @Test
public void testSetValidName() {
Field field = new Field();
field.setName("cusInt01");
- assertEquals(field.getName().toString(), "cusInt01");
+ Assert.assertEquals(field.getName().toString(), "cusInt01");
}
+ @Test
public void testSetInValidNameFails() {
Field field = new Field();
try {
field.setName("foo");
- fail("How did we set an invalid name?");
+ Assert.fail("How did we set an invalid name?");
} catch (Exception e) {
// expected
}
}
+ @Test
public void testConstructFromXml() {
Document d = XmlUtils.parse("<field name='cusInt01' label='Test Label'/>");
Field field = new Field(d.getRootElement());
- assertEquals("cusInt01", field.getName().toString());
- assertEquals("Test Label", field.getLabel());
- assertEquals(field.isOptional(), false);
+ Assert.assertEquals("cusInt01", field.getName().toString());
+ Assert.assertEquals("Test Label", field.getLabel());
+ Assert.assertEquals(field.isOptional(), false);
}
+ @Test
public void testConstructFromXmlWithOptionalAttribute() {
Document d = XmlUtils.parse("<field name='cusInt01' label='Test Label' optional='true'/>");
Field field = new Field(d.getRootElement());
- assertTrue(field.isOptional());
+ Assert.assertTrue(field.isOptional());
}
+ @Test
public void testGetAsXml() {
Field field = new Field();
field.setName("cusInt01");
field.setLabel("Test Label");
Element e = field.getAsElement();
- assertEquals("cusInt01", e.attributeValue("name"));
- assertEquals("Test Label", e.attributeValue("label"));
+ Assert.assertEquals("cusInt01", e.attributeValue("name"));
+ Assert.assertEquals("Test Label", e.attributeValue("label"));
}
}
Modified: trunk/jtrac/src/test/java/info/jtrac/domain/ItemTest.java
===================================================================
--- trunk/jtrac/src/test/java/info/jtrac/domain/ItemTest.java 2021-11-19 11:13:45 UTC (rev 1417)
+++ trunk/jtrac/src/test/java/info/jtrac/domain/ItemTest.java 2021-11-22 13:24:18 UTC (rev 1418)
@@ -1,14 +1,16 @@
package info.jtrac.domain;
import info.jtrac.domain.Item;
-import junit.framework.TestCase;
-public class ItemTest extends TestCase {
+import org.junit.*;
+public class ItemTest {
+
+ @Test
public void testSetAndGetForCustomInteger() {
Item item = new Item();
item.setCusInt01(5);
- assertEquals(item.getCusInt01().intValue(), 5);
+ Assert.assertEquals(item.getCusInt01().intValue(), 5);
}
}
Modified: trunk/jtrac/src/test/java/info/jtrac/domain/MetadataTest.java
===================================================================
--- trunk/jtrac/src/test/java/info/jtrac/domain/MetadataTest.java 2021-11-19 11:13:45 UTC (rev 1417)
+++ trunk/jtrac/src/test/java/info/jtrac/domain/MetadataTest.java 2021-11-22 13:24:18 UTC (rev 1418)
@@ -5,9 +5,10 @@
import java.util.Map;
import java.util.Set;
-import junit.framework.TestCase;
-public class MetadataTest extends TestCase {
+import org.junit.*;
+
+public class MetadataTest {
private Metadata getMetadata() {
Metadata metadata = new Metadata();
@@ -19,23 +20,26 @@
return metadata;
}
+ @Test
public void testGetFieldByName() {
Metadata m = getMetadata();
Field f = m.getField("cusInt01");
- assertEquals("Test Label", f.getLabel());
+ Assert.assertEquals("Test Label", f.getLabel());
}
+ @Test
public void testGetFieldsFromXml() {
Metadata m = getMetadata();
Map<Field.Name, Field> fields = m.getFields();
- assertTrue(fields.size() == 2);
+ Assert.assertTrue(fields.size() == 2);
Field[] fa = fields.values().toArray(new Field[0]);
- assertEquals("cusInt01", fa[0].getName() + "");
- assertEquals("Test Label", fa[0].getLabel());
- assertEquals("cusInt02", fa[1].getName() + "");
- assertEquals("Test Label 2", fa[1].getLabel());
+ Assert.assertEquals("cusInt01", fa[0].getName() + "");
+ Assert.assertEquals("Test Label", fa[0].getLabel());
+ Assert.assertEquals("cusInt02", fa[1].getName() + "");
+ Assert.assertEquals("Test Label 2", fa[1].getLabel());
}
+ @Test
public void testMetadataInheritance() {
Metadata m1 = getMetadata();
Metadata m2 = new Metadata();
@@ -46,27 +50,29 @@
m2.setXmlString(xmlString);
m2.setParent(m1);
Map<Field.Name, Field> fields = m2.getFields();
- assertEquals(fields.size(), 4);
+ Assert.assertEquals(fields.size(), 4);
Set<Field.Name> names = m2.getUnusedFieldNames();
- assertEquals(names.contains(Field.Name.CUS_INT_01), false);
- assertEquals(names.contains(Field.Name.CUS_INT_04), false);
- assertEquals(names.size(), Field.Name.values().length - 4);
+ Assert.assertEquals(names.contains(Field.Name.CUS_INT_01), false);
+ Assert.assertEquals(names.contains(Field.Name.CUS_INT_04), false);
+ Assert.assertEquals(names.size(), Field.Name.values().length - 4);
}
+ @Test
public void testInitRolesThenAddRolesAndStates() {
Metadata m = new Metadata();
m.initRoles();
- assertEquals("New, Open and Closed available by default", 3, m.getStateCount());
- assertEquals("DEFAULT available by default", 1, m.getRoleCount());
+ Assert.assertEquals("New, Open and Closed available by default", 3, m.getStateCount());
+ Assert.assertEquals("DEFAULT available by default", 1, m.getRoleCount());
Field f = new Field(Field.Name.CUS_INT_01);
m.add(f);
- assertEquals(1, m.getFieldCount());
- assertEquals("New", m.getStatusValue(0));
- assertEquals("Open", m.getStatusValue(1));
- assertEquals("Closed", m.getStatusValue(99));
- assertEquals("", m.getStatusValue(50));
+ Assert.assertEquals(1, m.getFieldCount());
+ Assert.assertEquals("New", m.getStatusValue(0));
+ Assert.assertEquals("Open", m.getStatusValue(1));
+ Assert.assertEquals("Closed", m.getStatusValue(99));
+ Assert.assertEquals("", m.getStatusValue(50));
}
+ @Test
public void testGetEditableFields() {
Metadata m = new Metadata();
m.initRoles();
@@ -74,17 +80,16 @@
m.add(f);
// query for editable fields across all roles
List<Field> fields = m.getEditableFields();
- assertEquals(0, fields.size());
+ Assert.assertEquals(0, fields.size());
// query for editable fields for DEFAULT role and when status is OPEN
fields = m.getEditableFields("DEFAULT", State.OPEN);
- assertEquals(0, fields.size());
+ Assert.assertEquals(0, fields.size());
// now make the field editable for given state and role
m.switchMask(State.OPEN, "DEFAULT", "cusStr01"); // should now be editable when status is open
fields = m.getEditableFields();
- assertEquals(1, fields.size());
+ Assert.assertEquals(1, fields.size());
fields = m.getEditableFields("DEFAULT", State.OPEN);
- assertEquals(1, fields.size());
-
+ Assert.assertEquals(1, fields.size());
}
}
Modified: trunk/jtrac/src/test/java/info/jtrac/domain/RoleTest.java
===================================================================
--- trunk/jtrac/src/test/java/info/jtrac/domain/RoleTest.java 2021-11-19 11:13:45 UTC (rev 1417)
+++ trunk/jtrac/src/test/java/info/jtrac/domain/RoleTest.java 2021-11-22 13:24:18 UTC (rev 1418)
@@ -1,41 +1,44 @@
-package info.jtrac.domain;
-
-import info.jtrac.util.XmlUtils;
-
-import junit.framework.TestCase;
-import org.dom4j.Document;
-
-public class RoleTest extends TestCase {
-
- public void testConstructFromXml() {
- Document d = XmlUtils.parse("<role name='TESTER'>" +
- "<state status='1'>" +
- "<transition status='2'/>" +
- "<transition status='3'/>" +
- "<field name='cusInt01' mask='1'/>" +
- "<field name='cusInt02' mask='2'/>" +
- "</state>" +
- "<state status='2'>" +
- "<transition status='3'/>" +
- "<field name='cusInt03' mask='1'/>" +
- "<field name='cusInt04' mask='2'/>" +
- "</state></role>");
- Role role = new Role(d.getRootElement());
- assertEquals("TESTER", role.getName());
- assertEquals(2, role.getStates().size());
- State s1 = role.getStates().get(1);
- assertEquals(2, s1.getTransitions().size());
- assertTrue(s1.getTransitions().contains(2));
- assertTrue(s1.getTransitions().contains(3));
- assertEquals(2 , s1.getFields().size());
- assertEquals(new Integer(1), s1.getFields().get(Field.Name.CUS_INT_01));
- assertEquals(new Integer(2), s1.getFields().get(Field.Name.CUS_INT_02));
- }
-
- public void testForReservedRoleNames() {
- assertTrue(Role.isReservedRoleKey("ROLE_ADMIN"));
- assertTrue(Role.isReservedRoleKey("ROLE_GUEST"));
- assertFalse(Role.isReservedRoleKey("ROLE_FOO"));
- }
-
-}
+package info.jtrac.domain;
+
+import info.jtrac.util.XmlUtils;
+
+import org.junit.*;
+
+import org.dom4j.Document;
+
+public class RoleTest {
+
+ @Test
+ public void testConstructFromXml() {
+ Document d = XmlUtils.parse("<role name='TESTER'>" +
+ "<state status='1'>" +
+ "<transition status='2'/>" +
+ "<transition status='3'/>" +
+ "<field name='cusInt01' mask='1'/>" +
+ "<field name='cusInt02' mask='2'/>" +
+ "</state>" +
+ "<state status='2'>" +
+ "<transition status='3'/>" +
+ "<field name='cusInt03' mask='1'/>" +
+ "<field name='cusInt04' mask='2'/>" +
+ "</state></role>");
+ Role role = new Role(d.getRootElement());
+ Assert.assertEquals("TESTER", role.getName());
+ Assert.assertEquals(2, role.getStates().size());
+ State s1 = role.getStates().get(1);
+ Assert.assertEquals(2, s1.getTransitions().size());
+ Assert.assertTrue(s1.getTransitions().contains(2));
+ Assert.assertTrue(s1.getTransitions().contains(3));
+ Assert.assertEquals(2 , s1.getFields().size());
+ Assert.assertEquals(new Integer(1), s1.getFields().get(Field.Name.CUS_INT_01));
+ Assert.assertEquals(new Integer(2), s1.getFields().get(Field.Name.CUS_INT_02));
+ }
+
+ @Test
+ public void testForReservedRoleNames() {
+ Assert.assertTrue(Role.isReservedRoleKey("ROLE_ADMIN"));
+ Assert.assertTrue(Role.isReservedRoleKey("ROLE_GUEST"));
+ Assert.assertFalse(Role.isReservedRoleKey("ROLE_FOO"));
+ }
+
+}
Modified: trunk/jtrac/src/test/java/info/jtrac/domain/UserTest.java
===================================================================
--- trunk/jtrac/src/test/java/info/jtrac/domain/UserTest.java 2021-11-19 11:13:45 UTC (rev 1417)
+++ trunk/jtrac/src/test/java/info/jtrac/domain/UserTest.java 2021-11-22 13:24:18 UTC (rev 1418)
@@ -1,17 +1,16 @@
package info.jtrac.domain;
-
import java.util.HashSet;
import java.util.Set;
-import junit.framework.TestCase;
+import org.junit.*;
import org.acegisecurity.GrantedAuthority;
-public class UserTest extends TestCase {
+public class UserTest {
+ @Test
public void testGetAuthoritiesFromUserSpaceRoles() {
-
Space s1 = new Space();
s1.setPrefixCode("SPACE-ONE");
@@ -30,19 +29,19 @@
set.add(ga.getAuthority());
}
- assertEquals(3, gas.length);
+ Assert.assertEquals(3, gas.length);
- assertTrue(set.contains("ROLE_ONE-ONE:SPACE-ONE"));
- assertTrue(set.contains("ROLE_ONE-TWO:SPACE-ONE"));
- assertTrue(set.contains("ROLE_ADMIN"));
-
+ Assert.assertTrue(set.contains("ROLE_ONE-ONE:SPACE-ONE"));
+ Assert.assertTrue(set.contains("ROLE_ONE-TWO:SPACE-ONE"));
+ Assert.assertTrue(set.contains("ROLE_ADMIN"));
}
+ @Test
public void testCheckIfAdminForAllSpaces() {
User u = new User();
u.setLoginName("test");
u.addSpaceWithRole(null, "ROLE_ADMIN");
- assertTrue(u.isSuperUser());
+ Assert.assertTrue(u.isSuperUser());
}
}
Added: trunk/jtrac/src/test/java/info/jtrac/htmlunit/BasicTest.java
===================================================================
--- trunk/jtrac/src/test/java/info/jtrac/htmlunit/BasicTest.java (rev 0)
+++ trunk/jtrac/src/test/java/info/jtrac/htmlunit/BasicTest.java 2021-11-22 13:24:18 UTC (rev 1418)
@@ -0,0 +1,114 @@
+package info.jtrac.htmlunit;
+
+import java.io.IOException;
+
+import org.junit.*;
+import org.junit.runners.MethodSorters;
+
+import com.gargoylesoftware.htmlunit.*;
+import com.gargoylesoftware.htmlunit.html.*;
+
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class BasicTest {
+
+ private static WebClient webClient;
+ private static HtmlPage page;
+
+ @BeforeClass
+ public static void init() throws Exception {
+ webClient = new WebClient();
+ //webClient.getOptions().setThrowExceptionOnScriptError(false);
+ }
+
+ @AfterClass
+ public static void close() throws Exception {
+ webClient.close();
+ }
+
+ @Test
+ public void test_A_GetLoginPage() throws IOException {
+ page = webClient.getPage("http://localhost:8888/app/login");
+ WebAssert.assertTitleEquals(page, "JTrac Login");
+ }
+
+ @Test
+ public void test_B_SuccessfulLogin() throws IOException {
+ ((HtmlElement) page.getElementByName("loginName")).type("admin");
+ ((HtmlElement) page.getElementByName("password")).type("admin");
+ page = ((HtmlElement) page.getFirstByXPath("//input[@value='Submit']")).click();
+ WebAssert.assertTextPresent(page, "DASHBOARD");
+ }
+
+ @Test
+ public void test_C_CreateNewSpaceAndAllocateAdmin() throws Exception {
+ page = ((HtmlElement) page.getFirstByXPath("//a[text()[normalize-space(.) = 'OPTIONS']]")).click();
+ WebAssert.assertTextPresent(page, "Options Menu");
+ page = ((HtmlElement) page.getFirstByXPath("//a[text()[normalize-space(.) = 'Manage Spaces']]")).click();
+ WebAssert.assertTextPresent(page, "Space List");
+ page = ((HtmlElement) page.getFirstByXPath("//a[text()[normalize-space(.) = 'Create New Space']]")).click();
+ WebAssert.assertTextPresent(page, "Space Details");
+ ((HtmlElement) page.getElementByName("space.name")).type("Test Space");
+ ((HtmlElement) page.getElementByName("space.prefixCode")).type("TEST");
+ page = ((HtmlElement) page.getFirstByXPath("//input[@value='Next']")).click();
+ 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();
+ WebAssert.assertTextPresent(page, "Users Allocated To Space");
+ ((HtmlCheckBoxInput) page.getFirstByXPath("//input[@name='roleAllocatePanel:checkGroup']")).click();
+ page = ((HtmlElement) page.getFirstByXPath("//input[@value='Allocate']")).click();
+ WebAssert.assertTextPresent(page, "Admin");
+ }
+
+ @Test
+ public void test_D_CreateNewItem() throws Exception {
+ page = ((HtmlElement) page.getFirstByXPath("//a[text()[normalize-space(.) = 'DASHBOARD']]")).click();
+ WebAssert.assertTextPresent(page, "Test Space");
+ page = ((HtmlElement) page.getFirstByXPath("//img[@title='NEW']")).click();
+ WebAssert.assertTextPresent(page, "Summary");
+ ((HtmlElement) page.getElementByName("summary")).type("Test Summary");
+ ((HtmlElement) page.getElementByName("detail")).type("Test Detail");
+ ((HtmlSelect) page.getElementByName("hideAssignedTo:border:assignedTo")).getOptionByText("Admin").setSelected(true);
+ page = ((HtmlElement) page.getFirstByXPath("//input[@value='Submit']")).click();
+ WebAssert.assertTextPresent(page, "TEST-1");
+ }
+
+ @Test
+ public void test_E_SearchAllContainsItem() throws Exception {
+ page = ((HtmlElement) page.getFirstByXPath("//a[text()[normalize-space(.) = 'SEARCH']]")).click();
+ WebAssert.assertTextPresent(page, "Show History");
+ page = ((HtmlElement) page.getFirstByXPath("//input[@value='Search']")).click();
+ WebAssert.assertTextPresent(page, "1 Record Found");
+ page = ((HtmlElement) page.getFirstByXPath("//a[contains(@href, 'TEST-1')]")).click();
+ WebAssert.assertTextPresent(page, "History");
+ }
+
+ @Test
+ public void test_F_UpdateHistoryForItem() throws Exception {
+ ((HtmlSelect) page.getElementByName("status")).setSelectedAttribute("Closed", true);
+ ((HtmlElement) page.getElementByName("comment")).type("Test Comment");
+ page = ((HtmlElement) page.getFirstByXPath("//input[@value='Submit']")).click();
+ WebAssert.assertTextPresent(page, "Test Comment");
+ }
+
+ @Test
+ public void test_G_CreateNewUser() throws Exception {
+ page = ((HtmlElement) page.getFirstByXPath("//a[text()[normalize-space(.) = 'OPTIONS']]")).click();
+ page = ((HtmlElement) page.getFirstByXPath("//a[text()[normalize-space(.) = 'Manage Users']]")).click();
+ WebAssert.assertTextPresent(page, "Users and allocated Spaces");
+ page = ((HtmlElement) page.getFirstByXPath("//a[text()[normalize-space(.) = 'Create New User']]")).click();
+ WebAssert.assertTextPresent(page, "User Details");
+ ((HtmlElement) page.getElementByName("user.loginName")).type("testuser");
+ ((HtmlElement) page.getElementByName("user.name")).type("Test User");
+ ((HtmlElement) page.getElementByName("user.email")).type("fo...@ba...");
+ page = ((HtmlElement) page.getFirstByXPath("//input[@value='Submit']")).click();
+ page = ((HtmlElement) page.getFirstByXPath("//input[@value='Search']")).click();
+ WebAssert.assertTextPresent(page, "Test User");
+ }
+
+ @Test
+ public void test_H_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/lucene/IndexSearcherTest.java
===================================================================
--- trunk/jtrac/src/test/java/info/jtrac/lucene/IndexSearcherTest.java 2021-11-19 11:13:45 UTC (rev 1417)
+++ trunk/jtrac/src/test/java/info/jtrac/lucene/IndexSearcherTest.java 2021-11-22 13:24:18 UTC (rev 1418)
@@ -1,17 +1,20 @@
package info.jtrac.lucene;
import info.jtrac.domain.Item;
+
import java.io.File;
import java.util.List;
-import junit.framework.TestCase;
+
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.FileSystemXmlApplicationContext;
-public class IndexSearcherTest extends TestCase {
+import org.junit.*;
+public class IndexSearcherTest {
+
private ApplicationContext context;
- @Override
+ @Before
public void setUp() {
File home = new File("target/home");
if (!home.exists()) {
@@ -29,6 +32,7 @@
context = new FileSystemXmlApplicationContext("src/main/webapp/WEB-INF/applicationContext-lucene.xml");
}
+ @Test
public void testFindItemIdsBySearchingWithinSummaryAndDetailFields() throws Exception {
Item item = new Item();
item.setId(1);
@@ -38,13 +42,14 @@
indexer.index(item);
IndexSearcher searcher = (IndexSearcher) context.getBean("indexSearcher");
List list = searcher.findItemIdsContainingText("lazy");
- assertEquals(1, list.size());
+ Assert.assertEquals(1, list.size());
list = searcher.findItemIdsContainingText("foo");
- assertEquals(0, list.size());
+ Assert.assertEquals(0, list.size());
list = searcher.findItemIdsContainingText("summary");
- assertEquals(1, list.size());
+ Assert.assertEquals(1, list.size());
}
+ @Test
public void testIfUmlautsCanBeIndexedAndSearchedFor() {
Item item = new Item();
item.setId(1);
@@ -54,7 +59,7 @@
indexer.index(item);
IndexSearcher searcher = (IndexSearcher) context.getBean("indexSearcher");
List list = searcher.findItemIdsContainingText("\u00fcmlaut");
- assertEquals(1, list.size());
+ Assert.assertEquals(1, list.size());
}
}
Modified: trunk/jtrac/src/test/java/info/jtrac/svn/SvnTest.java
===================================================================
--- trunk/jtrac/src/test/java/info/jtrac/svn/SvnTest.java 2021-11-19 11:13:45 UTC (rev 1417)
+++ trunk/jtrac/src/test/java/info/jtrac/svn/SvnTest.java 2021-11-22 13:24:18 UTC (rev 1418)
@@ -1,66 +1,69 @@
-package info.jtrac.svn;
-
-import java.util.Collection;
-import java.util.Iterator;
-import junit.framework.TestCase;
-import org.tmatesoft.svn.core.SVNDirEntry;
-import org.tmatesoft.svn.core.SVNException;
-import org.tmatesoft.svn.core.SVNNodeKind;
-import org.tmatesoft.svn.core.SVNURL;
-import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager;
-import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory;
-import org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryFactoryImpl;
-import org.tmatesoft.svn.core.io.SVNRepository;
-import org.tmatesoft.svn.core.io.SVNRepositoryFactory;
-import org.tmatesoft.svn.core.wc.SVNWCUtil;
-
-public class SvnTest extends TestCase {
-
- public void testNothing() {
-
- }
-
- /*
- public void testSvn() throws Exception {
- String url = "https://adms.satyam.com/svn/jtrac/trunk/jtrac";
- String name = "pt34469";
- String password = "";
- DAVRepositoryFactory.setup();
- SVNRepositoryFactoryImpl.setup();
- SVNRepository repository = SVNRepositoryFactory.create(SVNURL.parseURIEncoded(url));
- ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager(name, password);
- repository.setAuthenticationManager(authManager);
- SVNNodeKind nodeKind = repository.checkPath("", -1);
- if (nodeKind == SVNNodeKind.NONE) {
- System.err.println("There is no entry at '" + url + "'.");
- System.exit(1);
- } else if (nodeKind == SVNNodeKind.FILE) {
- System.err.println("The entry at '" + url + "' is a file while a directory was expected.");
- System.exit(1);
- }
- System.out.println("Repository Root: " + repository.getRepositoryRoot(true));
- System.out.println("Repository UUID: " + repository.getRepositoryUUID());
- listEntries(repository, "");
- long latestRevision = repository.getLatestRevision();
- System.out.println("Repository latest revision: " + latestRevision);
- System.exit(0);
- }
-
- private static void listEntries(SVNRepository repository, String path) throws SVNException {
-
- Collection entries = repository.getDir(path, -1, null, (Collection) null);
- Iterator iterator = entries.iterator();
- while (iterator.hasNext()) {
- SVNDirEntry entry = (SVNDirEntry) iterator.next();
- System.out.println("/" + (path.equals("") ? "" : path + "/")
- + entry.getName() + " (author:" + entry.getAuthor()
- + "; revision:" + entry.getRevision() + ")");
- if (entry.getKind() == SVNNodeKind.DIR) {
- listEntries(repository, (path.equals("")) ? entry.getName()
- : path + "/" + entry.getName());
- }
- }
- }
- */
-
-}
+package info.jtrac.svn;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.junit.Test;
+
+import org.tmatesoft.svn.core.SVNDirEntry;
+import org.tmatesoft.svn.core.SVNException;
+import org.tmatesoft.svn.core.SVNNodeKind;
+import org.tmatesoft.svn.core.SVNURL;
+import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager;
+import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory;
+import org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryFactoryImpl;
+import org.tmatesoft.svn.core.io.SVNRepository;
+import org.tmatesoft.svn.core.io.SVNRepositoryFactory;
+import org.tmatesoft.svn.core.wc.SVNWCUtil;
+
+public class SvnTest {
+
+ @Test
+ public void testNothing() {
+
+ }
+
+ /*
+ @Test
+ public void testSvn() throws Exception {
+ String url = "https://adms.satyam.com/svn/jtrac/trunk/jtrac";
+ String name = "pt34469";
+ String password = "";
+ DAVRepositoryFactory.setup();
+ SVNRepositoryFactoryImpl.setup();
+ SVNRepository repository = SVNRepositoryFactory.create(SVNURL.parseURIEncoded(url));
+ ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager(name, password);
+ repository.setAuthenticationManager(authManager);
+ SVNNodeKind nodeKind = repository.checkPath("", -1);
+ if (nodeKind == SVNNodeKind.NONE) {
+ System.err.println("There is no entry at '" + url + "'.");
+ System.exit(1);
+ } else if (nodeKind == SVNNodeKind.FILE) {
+ System.err.println("The entry at '" + url + "' is a file while a directory was expected.");
+ System.exit(1);
+ }
+ System.out.println("Repository Root: " + repository.getRepositoryRoot(true));
+ System.out.println("Repository UUID: " + repository.getRepositoryUUID());
+ listEntries(repository, "");
+ long latestRevision = repository.getLatestRevision();
+ System.out.println("Repository latest revision: " + latestRevision);
+ System.exit(0);
+ }
+
+ private static void listEntries(SVNRepository repository, String path) throws SVNException {
+
+ Collection entries = repository.getDir(path, -1, null, (Collection) null);
+ Iterator iterator = entries.iterator();
+ while (iterator.hasNext()) {
+ SVNDirEntry entry = (SVNDirEntry) iterator.next();
+ System.out.println("/" + (path.equals("") ? "" : path + "/")
+ + entry.getName() + " (author:" + entry.getAuthor()
+ + "; revision:" + entry.getRevision() + ")");
+ if (entry.getKind() == SVNNodeKind.DIR) {
+ listEntries(repository, (path.equals("")) ? entry.getName()
+ : path + "/" + entry.getName());
+ }
+ }
+ }
+ */
+}
Modified: trunk/jtrac/src/test/java/info/jtrac/util/ItemUtilsTest.java
===================================================================
--- trunk/jtrac/src/test/java/info/jtrac/util/ItemUtilsTest.java 2021-11-19 11:13:45 UTC (rev 1417)
+++ trunk/jtrac/src/test/java/info/jtrac/util/ItemUtilsTest.java 2021-11-22 13:24:18 UTC (rev 1418)
@@ -1,19 +1,20 @@
-package info.jtrac.util;
-
-import junit.framework.TestCase;
-
-public class ItemUtilsTest extends TestCase {
-
- public void testHtmlEscaping() {
- assertEquals(" ", ItemUtils.fixWhiteSpace(" "));
- assertEquals(" ", ItemUtils.fixWhiteSpace(" \t"));
- assertEquals("Hello World", ItemUtils.fixWhiteSpace("Hello World"));
- assertEquals("", ItemUtils.fixWhiteSpace(""));
- assertEquals("", ItemUtils.fixWhiteSpace(null));
- assertEquals("Hello<br/>World", ItemUtils.fixWhiteSpace("Hello\nWorld"));
- assertEquals("Hello<br/> World", ItemUtils.fixWhiteSpace("Hello\n World"));
- assertEquals("Hello<br/> World<br/> Everyone", ItemUtils.fixWhiteSpace("Hello\n World\n\tEveryone"));
- assertEquals("Hello World", ItemUtils.fixWhiteSpace("Hello\tWorld"));
- }
-
-}
+package info.jtrac.util;
+
+import org.junit.*;
+
+public class ItemUtilsTest {
+
+ @Test
+ public void testHtmlEscaping() {
+ Assert.assertEquals(" ", ItemUtils.fixWhiteSpace(" "));
+ Assert.assertEquals(" ", ItemUtils.fixWhiteSpace(" \t"));
+ Assert.assertEquals("Hello World", ItemUtils.fixWhiteSpace("Hello World"));
+ Assert.assertEquals("", ItemUtils.fixWhiteSpace(""));
+ Assert.assertEquals("", ItemUtils.fixWhiteSpace(null));
+ Assert.assertEquals("Hello<br/>World", ItemUtils.fixWhiteSpace("Hello\nWorld"));
+ Assert.assertEquals("Hello<br/> World", ItemUtils.fixWhiteSpace("Hello\n World"));
+ Assert.assertEquals("Hello<br/> World<br/> Everyone", ItemUtils.fixWhiteSpace("Hello\n World\n\tEveryone"));
+ Assert.assertEquals("Hello World", ItemUtils.fixWhiteSpace("Hello\tWorld"));
+ }
+
+}
Modified: trunk/jtrac/src/test/java/info/jtrac/util/JtracConfigurerTest.java
===================================================================
--- trunk/jtrac/src/test/java/info/jtrac/util/JtracConfigurerTest.java 2021-11-19 11:13:45 UTC (rev 1417)
+++ trunk/jtrac/src/test/java/info/jtrac/util/JtracConfigurerTest.java 2021-11-22 13:24:18 UTC (rev 1418)
@@ -1,9 +1,10 @@
package info.jtrac.util;
-import junit.framework.TestCase;
+import org.junit.*;
-public class JtracConfigurerTest extends TestCase {
+public class JtracConfigurerTest {
+ @Test
public void testUserDir() throws Exception {
// TODO
}
Modified: trunk/jtrac/src/test/java/info/jtrac/util/ValidationUtilsTest.java
===================================================================
--- trunk/jtrac/src/test/java/info/jtrac/util/ValidationUtilsTest.java 2021-11-19 11:13:45 UTC (rev 1417)
+++ trunk/jtrac/src/test/java/info/jtrac/util/ValidationUtilsTest.java 2021-11-22 13:24:18 UTC (rev 1418)
@@ -1,52 +1,56 @@
package info.jtrac.util;
-import junit.framework.TestCase;
+import org.junit.*;
-public class ValidationUtilsTest extends TestCase {
+public class ValidationUtilsTest {
+ @Test
public void testValidateSpaceKey() {
- assertTrue(ValidationUtils.isValidSpaceKey("ABCD"));
- assertTrue(ValidationUtils.isValidSpaceKey("AB123CD"));
- assertFalse(ValidationUtils.isValidSpaceKey("ABCD-ABCD"));
- assertFalse(ValidationUtils.isValidSpaceKey("AB CD"));
+ Assert.assertTrue(ValidationUtils.isValidSpaceKey("ABCD"));
+ Assert.assertTrue(ValidationUtils.isValidSpaceKey("AB123CD"));
+ Assert.assertFalse(ValidationUtils.isValidSpaceKey("ABCD-ABCD"));
+ Assert.assertFalse(ValidationUtils.isValidSpaceKey("AB CD"));
}
+ @Test
public void testValidateRoleKey() {
- assertTrue(ValidationUtils.isValidRoleKey("ABCD"));
- assertTrue(ValidationUtils.isValidRoleKey("AB123CD"));
- assertFalse(ValidationUtils.isValidRoleKey("ABCD-ABCD"));
- assertFalse(ValidationUtils.isValidRoleKey("ABcD_ABCD"));
- assertFalse(ValidationUtils.isValidRoleKey("AB CD"));
- assertTrue(ValidationUtils.isValidRoleKey("ABCD_EFG"));
- assertFalse(ValidationUtils.isValidRoleKey("AB1CDE2_"));
- assertFalse(ValidationUtils.isValidRoleKey("_ABCDEF"));
- assertTrue(ValidationUtils.isValidRoleKey("1ABCD3_EFG2"));
+ Assert.assertTrue(ValidationUtils.isValidRoleKey("ABCD"));
+ Assert.assertTrue(ValidationUtils.isValidRoleKey("AB123CD"));
+ Assert.assertFalse(ValidationUtils.isValidRoleKey("ABCD-ABCD"));
+ Assert.assertFalse(ValidationUtils.isValidRoleKey("ABcD_ABCD"));
+ Assert.assertFalse(ValidationUtils.isValidRoleKey("AB CD"));
+ Assert.assertTrue(ValidationUtils.isValidRoleKey("ABCD_EFG"));
+ Assert.assertFalse(ValidationUtils.isValidRoleKey("AB1CDE2_"));
+ Assert.assertFalse(ValidationUtils.isValidRoleKey("_ABCDEF"));
+ Assert.assertTrue(ValidationUtils.isValidRoleKey("1ABCD3_EFG2"));
}
+ @Test
public void testValidateLoginName() {
- assertTrue(ValidationUtils.isValidLoginName("abcd"));
- assertTrue(ValidationUtils.isValidLoginName("abcd123"));
- assertTrue(ValidationUtils.isValidLoginName("ab-cd"));
- assertTrue(ValidationUtils.isValidLoginName("ab.cd"));
- assertTrue(ValidationUtils.isValidLoginName("ab_cd"));
- assertTrue(ValidationUtils.isValidLoginName("Ab-Cd"));
- assertTrue(ValidationUtils.isValidLoginName("ab@cd"));
- assertTrue(ValidationUtils.isValidLoginName("AB\\cd"));
- assertTrue(ValidationUtils.isValidLoginName("AB\\ab...@de..."));
- assertFalse(ValidationUtils.isValidLoginName("ab%cd"));
- assertFalse(ValidationUtils.isValidLoginName("ab:cd"));
- assertFalse(ValidationUtils.isValidLoginName("ab cd"));
+ Assert.assertTrue(ValidationUtils.isValidLoginName("abcd"));
+ Assert.assertTrue(ValidationUtils.isValidLoginName("abcd123"));
+ Assert.assertTrue(ValidationUtils.isValidLoginName("ab-cd"));
+ Assert.assertTrue(ValidationUtils.isValidLoginName("ab.cd"));
+ Assert.assertTrue(ValidationUtils.isValidLoginName("ab_cd"));
+ Assert.assertTrue(ValidationUtils.isValidLoginName("Ab-Cd"));
+ Assert.assertTrue(ValidationUtils.isValidLoginName("ab@cd"));
+ Assert.assertTrue(ValidationUtils.isValidLoginName("AB\\cd"));
+ Assert.assertTrue(ValidationUtils.isValidLoginName("AB\\ab...@de..."));
+ Assert.assertFalse(ValidationUtils.isValidLoginName("ab%cd"));
+ Assert.assertFalse(ValidationUtils.isValidLoginName("ab:cd"));
+ Assert.assertFalse(ValidationUtils.isValidLoginName("ab cd"));
}
+ @Test
public void testValidateStateName() {
- assertTrue(ValidationUtils.isValidStateName("Abcd"));
- assertTrue(ValidationUtils.isValidStateName("Abcd-Efgh"));
- assertTrue(ValidationUtils.isValidStateName("Abcd-Efgh-Hijk"));
- assertFalse(ValidationUtils.isValidStateName("AbcdEfgh"));
- assertFalse(ValidationUtils.isValidStateName("Abcd123"));
- assertFalse(ValidationUtils.isValidStateName("8bcd"));
- assertFalse(ValidationUtils.isValidStateName("Ab-cd"));
- assertFalse(ValidationUtils.isValidStateName("Ab cd"));
+ Assert.assertTrue(ValidationUtils.isValidStateName("Abcd"));
+ Assert.assertTrue(ValidationUtils.isValidStateName("Abcd-Efgh"));
+ Assert.assertTrue(ValidationUtils.isValidStateName("Abcd-Efgh-Hijk"));
+ Assert.assertFalse(ValidationUtils.isValidStateName("AbcdEfgh"));
+ Assert.assertFalse(ValidationUtils.isValidStateName("Abcd123"));
+ Assert.assertFalse(ValidationUtils.isValidStateName("8bcd"));
+ Assert.assertFalse(ValidationUtils.isValidStateName("Ab-cd"));
+ Assert.assertFalse(ValidationUtils.isValidStateName("Ab cd"));
}
}
Modified: trunk/jtrac/src/test/java/info/jtrac/util/XmlUtilsTest.java
===================================================================
--- trunk/jtrac/src/test/java/info/jtrac/util/XmlUtilsTest.java 2021-11-19 11:13:45 UTC (rev 1417)
+++ trunk/jtrac/src/test/java/info/jtrac/util/XmlUtilsTest.java 2021-11-22 13:24:18 UTC (rev 1418)
@@ -1,31 +1,36 @@
package info.jtrac.util;
import info.jtrac.util.XmlUtils;
-import junit.framework.TestCase;
+
+import org.junit.*;
+
import org.dom4j.Document;
-public class XmlUtilsTest extends TestCase {
-
+public class XmlUtilsTest {
+
+ @Test
public void testXmlStringParse() {
String s = "<test/>";
Document d = XmlUtils.parse(s);
- assertTrue(d.getRootElement().getName().equals("test"));
+ Assert.assertTrue(d.getRootElement().getName().equals("test"));
}
+ @Test
public void testBadXmlParseFails() {
String s = "foo";
try {
Document d = XmlUtils.parse(s);
- fail("How did we parse invalid XML?");
+ Assert.fail("How did we parse invalid XML?");
} catch (Exception e) {
// expected
}
}
+ @Test
public void testGetAsPrettyXml() {
String s = "<root><node1><node2>data</node2></node1></root>";
String result = XmlUtils.getAsPrettyXml(s);
- assertTrue(result.equals("<root>\n <node1>\n <node2>data</node2>\n </node1>\n</root>"));
+ Assert.assertTrue(result.equals("<root>\n <node1>\n <node2>data</node2>\n </node1>\n</root>"));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
