You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by al...@apache.org on 2003/06/29 05:03:39 UTC
cvs commit: jakarta-commons/lang/src/test/org/apache/commons/lang EntitiesPerformanceTest.java
alex 2003/06/28 20:03:39
Modified: lang/src/test/org/apache/commons/lang
EntitiesPerformanceTest.java
Log:
cleaning up
use restructured EntityMap classes
Revision Changes Path
1.4 +71 -20 jakarta-commons/lang/src/test/org/apache/commons/lang/EntitiesPerformanceTest.java
Index: EntitiesPerformanceTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons/lang/src/test/org/apache/commons/lang/EntitiesPerformanceTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EntitiesPerformanceTest.java 24 May 2003 15:21:02 -0000 1.3
+++ EntitiesPerformanceTest.java 29 Jun 2003 03:03:39 -0000 1.4
@@ -68,6 +68,8 @@
private static Entities hashEntities;
private static Entities arrayEntities;
private static Entities binaryEntities;
+ private static Entities primitiveEntities;
+ private static Entities lookupEntities;
public EntitiesPerformanceTest(String name) {
super(name);
@@ -85,9 +87,9 @@
public void setUp() {
if (stringWithUnicode == null) {
StringBuffer buf = new StringBuffer(STRING_LENGTH);
- for (int i = 0; i < STRING_LENGTH/5; ++i) {
+ for (int i = 0; i < STRING_LENGTH / 5; ++i) {
buf.append("xxxx");
- char ch = html40value(i);
+ char ch = isovalue(i);
buf.append(ch);
}
stringWithUnicode = buf.toString();
@@ -101,38 +103,67 @@
return ch;
}
+ private char isovalue(int i) {
+ String entityValue = Entities.iso8859_1[i % Entities.iso8859_1.length][1];
+ char ch = (char) Integer.parseInt(entityValue);
+ return ch;
+ }
+
public void testBuildHash() throws Exception {
for (int i = 0; i < COUNT; ++i) {
- hashEntities = new Entities();
- hashEntities.map = new Entities.HashIntMap();
- Entities.fillWithHtml40Entities(hashEntities);
+ hashEntities = build(new Entities.HashEntityMap());
}
}
+
public void testBuildTree() throws Exception {
for (int i = 0; i < COUNT; ++i) {
- treeEntities = new Entities();
- treeEntities.map = new Entities.TreeIntMap();
- Entities.fillWithHtml40Entities(treeEntities);
+ treeEntities = build(new Entities.TreeEntityMap());
}
}
public void testBuildArray() throws Exception {
for (int i = 0; i < COUNT; ++i) {
- arrayEntities = new Entities();
- arrayEntities.map = new Entities.ArrayIntMap();
- Entities.fillWithHtml40Entities(arrayEntities);
+ arrayEntities = build(new Entities.ArrayEntityMap());
}
}
public void testBuildBinary() throws Exception {
for (int i = 0; i < COUNT; ++i) {
- binaryEntities = new Entities();
- binaryEntities.map = new Entities.BinaryIntMap();
- Entities.fillWithHtml40Entities(binaryEntities);
+ binaryEntities = build(new Entities.BinaryEntityMap());
+ }
+ }
+
+ public void testBuildPrimitive() throws Exception {
+ for (int i = 0; i < COUNT; ++i) {
+ buildPrimitive();
+ }
+ }
+
+ private void buildPrimitive()
+ {
+ primitiveEntities = build(new Entities.PrimitiveEntityMap());
+ }
+
+ public void testBuildLookup() throws Exception {
+ for (int i = 0; i < COUNT; ++i) {
+ buildLookup();
}
}
+ private void buildLookup()
+ {
+ lookupEntities = build(new Entities.LookupEntityMap());
+ }
+
+ private Entities build(Entities.EntityMap intMap) {
+ Entities entities;
+ entities = new Entities();
+ entities.map = intMap;
+ Entities.fillWithHtml40Entities(entities);
+ return entities;
+ }
+
public void testLookupHash() throws Exception {
lookup(hashEntities);
}
@@ -149,6 +180,16 @@
lookup(binaryEntities);
}
+ public void testLookupPrimitive() throws Exception {
+ if (primitiveEntities == null) buildPrimitive();
+ lookup(primitiveEntities);
+ }
+
+ public void testLookupLookup() throws Exception {
+ if (lookupEntities == null) buildLookup();
+ lookup(lookupEntities);
+ }
+
public void testEscapeHash() throws Exception {
escapeIt(hashEntities);
}
@@ -165,6 +206,14 @@
escapeIt(binaryEntities);
}
+ public void testEscapePrimitive() throws Exception {
+ escapeIt(primitiveEntities);
+ }
+
+ public void testEscapeLookup() throws Exception {
+ escapeIt(lookupEntities);
+ }
+
public void testUnescapeHash() throws Exception {
unescapeIt(hashEntities);
}
@@ -182,23 +231,25 @@
}
private void lookup(Entities entities) {
- for (int i = 0; i < COUNT*1000; ++i) {
- entities.entityName(html40value(i));
+ for (int i = 0; i < COUNT * 1000; ++i) {
+ entities.entityName(isovalue(i));
}
}
private void escapeIt(Entities entities) {
for (int i = 0; i < COUNT; ++i) {
- String escaped = entities.escape(stringWithUnicode);
- assertEquals("xxxxƒ", escaped.substring(0,10));
+ String escaped = entities.escape(stringWithUnicode);
+ assertEquals("xxxx ", escaped.substring(0, 10));
}
}
private void unescapeIt(Entities entities) {
for (int i = 0; i < COUNT; ++i) {
- String unescaped = entities.unescape(stringWithEntities);
- assertEquals("xxxx\u0192", unescaped.substring(0,5));
+ String unescaped = entities.unescape(stringWithEntities);
+ assertEquals("xxxx\u00A0", unescaped.substring(0, 5));
}
}
+
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org