Trimming trailing spaces, removing tabs by a script
- using tab width of 4 spaces
- trailing space in property files is converted to unicode, so it is
visible in sources
- bat files use CRLF
- all other text files use just LF
diff --git a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.properties b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.properties
index 0387b4e..0a3019a 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.properties
+++ b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="test.name" value="com.sun.s1asdev.ejb.util.methodmap"/>
<property name="simple.client" value="${test.name}.client.MethodMapTest"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.xml b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.xml
index 3ca01b9..c2bc0d5 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="build" depends="init-common">
<mkdir dir="${build.classes.dir}"/>
<echo message="common.xml: Compiling test source files" level="verbose"/>
@@ -42,27 +42,27 @@
destdir="${build.classes.dir}"
classpath="${s1astest.classpath}:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
debug="on"
- failonerror="true"/>
+ failonerror="true"/>
</target>
-
+
<target name="runclient" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client}">
</java>
- </target>
+ </target>
<target name="perf" depends="init-common">
- <java fork="on"
+ <java fork="on"
failonerror="true"
classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${perf.client}">
<arg value="javax.xml.rpc.Service"/>
<arg value="100000"/>
</java>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java
index c30a6ce..1461c57 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodMapTest.java
@@ -27,21 +27,21 @@
public class MethodMapTest {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
private static final Class[] TEST_CLASSES = {
java.lang.Object.class,
- MethodMapTest1.class, MethodMapTest2.class, MethodMapTest3.class,
+ MethodMapTest1.class, MethodMapTest2.class, MethodMapTest3.class,
MethodMapTest4.class, MethodMapTest3.class, MethodMapTest6.class,
- MethodMapTest.class, jakarta.ejb.EJBHome.class,
+ MethodMapTest.class, jakarta.ejb.EJBHome.class,
jakarta.ejb.EJBObject.class, jakarta.ejb.EJBLocalObject.class,
jakarta.ejb.EJBLocalHome.class, jakarta.ejb.SessionBean.class,
jakarta.ejb.EnterpriseBean.class, java.util.Map.class,
jakarta.jms.QueueConnection.class, jakarta.jms.QueueSession.class,
jakarta.jms.Session.class, java.util.Date.class,
javax.swing.Action.class, javax.swing.AbstractAction.class,
- javax.swing.JComboBox.class, javax.swing.JTextArea.class
+ javax.swing.JComboBox.class, javax.swing.JTextArea.class
};
@@ -51,9 +51,9 @@
MethodMapTest test = new MethodMapTest(args);
test.doTest();
stat.printSummary("ejb-util-methodmapID");
- }
-
- public MethodMapTest (String[] args) {
+ }
+
+ public MethodMapTest (String[] args) {
}
public void doTest() {
@@ -63,17 +63,17 @@
System.out.println("Doing methodmap test for " + c);
boolean result = testClass(c);
if( result ) {
- stat.addStatus("methodmapclient main", stat.PASS);
+ stat.addStatus("methodmapclient main", stat.PASS);
} else {
- stat.addStatus("methodmapclient main", stat.FAIL);
+ stat.addStatus("methodmapclient main", stat.FAIL);
}
- }
-
+ }
+
testCtor();
testUnsupportedOperations();
-
-
+
+
}
private void testCtor() {
@@ -83,7 +83,7 @@
try {
new MethodMap(new HashMap(), -1);
System.out.println("bucketSize -1 should have thrown exception");
- } catch(IllegalArgumentException e) {
+ } catch(IllegalArgumentException e) {
ctorTest1Passed = true;
} catch(Exception e) {
e.printStackTrace();
@@ -107,23 +107,23 @@
ctorTest3Passed = true;
} catch(Exception e) {
e.printStackTrace();
- }
+ }
// pass map containing something other than Method objects
Map otherMap = new HashMap();
otherMap.put("foo", "bar");
boolean ctorTest4Passed = false;
try {
- new MethodMap(otherMap);
+ new MethodMap(otherMap);
} catch(Exception e) {
ctorTest4Passed = true;
}
- if( ctorTest1Passed && ctorTest2Passed & ctorTest3Passed
+ if( ctorTest1Passed && ctorTest2Passed & ctorTest3Passed
&& ctorTest4Passed ) {
- stat.addStatus("methodmapclient ctor", stat.PASS);
+ stat.addStatus("methodmapclient ctor", stat.PASS);
} else {
- stat.addStatus("methodmapclient ctor", stat.FAIL);
+ stat.addStatus("methodmapclient ctor", stat.FAIL);
}
}
@@ -157,7 +157,7 @@
} catch(Exception e) {
e.printStackTrace();
}
-
+
boolean uoeTest3Passed = false;
try {
methodMap.remove(method1);
@@ -176,19 +176,19 @@
" null method value");
} catch(Exception e) {
uoeTest4Passed = true;
- }
+ }
if( uoeTest1Passed && uoeTest2Passed && uoeTest3Passed &&
uoeTest4Passed ) {
- stat.addStatus("methodmapclient unsupportedop", stat.PASS);
+ stat.addStatus("methodmapclient unsupportedop", stat.PASS);
} else {
- stat.addStatus("methodmapclient unsupportedop", stat.FAIL);
+ stat.addStatus("methodmapclient unsupportedop", stat.FAIL);
}
}
private boolean testClass(Class c) {
-
+
Map regularMap = new HashMap();
Method[] methods = c.getDeclaredMethods();
@@ -196,31 +196,31 @@
for(int i = 0; i < methods.length; i++) {
regularMap.put(methods[i], methods[i].toString());
}
-
+
Map defaultMethodMap = new MethodMap(regularMap);
System.out.println("Testing " + c + " with default MethodMap");
- boolean defaultTest =
+ boolean defaultTest =
testClass(c, methods, false, regularMap, defaultMethodMap);
- boolean defaultTestOpt =
+ boolean defaultTestOpt =
testClass(c, methods, true, regularMap, defaultMethodMap);
// test degenerate case where there is only 1 bucket in MethodMap.
- // unless there are less than 2 methods in the map, this should
+ // unless there are less than 2 methods in the map, this should
// always defer to parent.
Map oneBucketMethodMap = new MethodMap(regularMap, 1);
System.out.println("Testing " + c + " with 1-bucket MethodMap");
- boolean oneBucketTest =
+ boolean oneBucketTest =
testClass(c, methods, false, regularMap, oneBucketMethodMap);
boolean oneBucketTestOpt =
testClass(c, methods, true, regularMap, oneBucketMethodMap);
Map seventeenBucketMethodMap = new MethodMap(regularMap, 17);
System.out.println("Testing " + c + " with 17-bucket MethodMap");
- boolean seventeenBucketTest =
- testClass(c, methods, false, regularMap, seventeenBucketMethodMap);
- boolean seventeenBucketTestOpt =
- testClass(c, methods, true, regularMap, seventeenBucketMethodMap);
-
+ boolean seventeenBucketTest =
+ testClass(c, methods, false, regularMap, seventeenBucketMethodMap);
+ boolean seventeenBucketTestOpt =
+ testClass(c, methods, true, regularMap, seventeenBucketMethodMap);
+
boolean clearTest = false;
try {
@@ -233,7 +233,7 @@
clearTest = true;
} else {
System.out.println("Clear() should have returned null for " +
- methods[0]
+ methods[0]
+ " after clear(). instead it " +
" returned " + obj);
}
@@ -245,8 +245,8 @@
System.out.println("clear() threw an exception");
e.printStackTrace();
}
-
- return (defaultTest && defaultTestOpt &&
+
+ return (defaultTest && defaultTestOpt &&
oneBucketTest && oneBucketTestOpt &&
seventeenBucketTest && seventeenBucketTestOpt &&
clearTest);
@@ -254,7 +254,7 @@
private boolean testClass(Class c, Method[] methods, boolean useParamOpt,
Map regularMap, Map methodMap) {
-
+
for(int i = 0; i < methods.length; i++) {
Method next = methods[i];
int numParams = next.getParameterTypes().length;
@@ -267,15 +267,15 @@
} else {
methodMapLookup = methodMap.get(next);
}
-
+
if( regularLookup != methodMapLookup ) {
System.out.println("Error. regularLookup = " + regularLookup
+ " methodMapLookup = " + methodMapLookup
+ " for Method " + next.toString());
return false;
- }
+ }
- // System.out.println("Got " + regularLookup + " for method " +
+ // System.out.println("Got " + regularLookup + " for method " +
// next.toString());
}
@@ -305,19 +305,19 @@
// array params
int abc(int[] a);
- int def(int[][][][][][][][] b);
+ int def(int[][][][][][][][] b);
// arbitrary unicode chars
void _B\u8001$();
void _CCMcx\u04e3\u05E90123();
-
+
}
private interface MethodMapTest3 {
void A();
-
+
}
private interface MethodMapTest4 extends MethodMapTest3 {}
diff --git a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodPerf.java b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodPerf.java
index 8f08272..336a042 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodPerf.java
+++ b/appserver/tests/appserv-tests/devtests/ejb/util/methodmap/client/MethodPerf.java
@@ -29,7 +29,7 @@
return ((timeInMillis * 1000.0) / numIterations) + " micro-seconds";
}
-
+
public static void main(String args[]) {
@@ -40,7 +40,7 @@
try {
Class clz = Class.forName(className);
-
+
Map methodMap = new HashMap();
Method[] methods = clz.getMethods();
@@ -49,7 +49,7 @@
methodMap.put(methods[i], methods[i].toString());
}
-
+
System.out.println("--------------------");
System.out.println("With regular hashmap");
System.out.println("--------------------");
@@ -60,11 +60,11 @@
totalTime += time;
System.out.println(toMicroSeconds(time, numIterations) + " : " + m.getName());
}
- System.out.println("Avg time = " +
+ System.out.println("Avg time = " +
toMicroSeconds(totalTime / methods.length,
numIterations));
-
-
+
+
System.out.println("--------------------");
System.out.println("With optimized method lookup");
System.out.println("--------------------");
@@ -77,11 +77,11 @@
totalTime += time;
System.out.println(toMicroSeconds(time, numIterations) + " : " + m.getName());
}
- System.out.println("Avg time = " +
+ System.out.println("Avg time = " +
toMicroSeconds(totalTime / methods.length,
numIterations));
-
-
+
+
System.out.println("--------------------");
System.out.println("With extra optimized method lookup");
System.out.println("--------------------");
@@ -94,10 +94,10 @@
totalTime += time;
System.out.println(toMicroSeconds(time, numIterations) + " : " + m.getName());
}
- System.out.println("Avg time = " +
+ System.out.println("Avg time = " +
toMicroSeconds(totalTime / methods.length,
numIterations));
-
+
/*
System.out.println("--------------------");
System.out.println("With java.util.IdentityHashMap lookup");
@@ -113,10 +113,10 @@
*/
-
- long ihcTime = testSystemIdentityHashCode(numIterations);
+
+ long ihcTime = testSystemIdentityHashCode(numIterations);
System.out.println("system identity hash code= " + toMicroSeconds(ihcTime, numIterations));
-
+
MethodPerf ml = new MethodPerf();
@@ -131,7 +131,7 @@
System.out.println("instance strong typed invocation time = " + toMicroSeconds(i_sTime, numIterations));
long i_rTime = testStaticReflectiveInvocation(numIterations, fooMethod);
System.out.println("instance reflective invocation time = " + toMicroSeconds(i_rTime, numIterations));
-
+
} catch(Exception e) {
e.printStackTrace();
}
@@ -151,10 +151,10 @@
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
@@ -169,10 +169,10 @@
}
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
@@ -187,10 +187,10 @@
}
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
@@ -205,10 +205,10 @@
}
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
@@ -222,48 +222,48 @@
}
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
return (end - begin) - loopTime;
}
- private static long testStaticReflectiveInvocation(int numIterations, Method m)
+ private static long testStaticReflectiveInvocation(int numIterations, Method m)
throws Exception {
-
- long begin = System.currentTimeMillis();
+
+ long begin = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
m.invoke(null, null);
}
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
return (end - begin) - loopTime;
}
- private static long testInstanceReflectiveInvocation(int numIterations, Object o, Method m)
+ private static long testInstanceReflectiveInvocation(int numIterations, Object o, Method m)
throws Exception {
-
- long begin = System.currentTimeMillis();
+
+ long begin = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
m.invoke(o, null);
}
long end = System.currentTimeMillis();
- // measure the time for the loop processing itself
+ // measure the time for the loop processing itself
long beginLoop = System.currentTimeMillis();
for(int i = 0; i < numIterations; i++) {
- }
+ }
long endLoop = System.currentTimeMillis();
long loopTime = endLoop - beginLoop;
System.out.println("Loop time = " + loopTime);
