You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by dp...@apache.org on 2005/05/03 16:54:47 UTC
svn commit: r167915 - in /incubator/jackrabbit/trunk/contrib/tck-webapp/src:
java/org/apache/jackrabbit/tck/TckTestRunner.java
java/org/apache/jackrabbit/tck/Tester.java
webapp/WEB-INF/classes/repositoryStubImpl.properties webapp/graph.jsp
Author: dpfister
Date: Tue May 3 07:54:46 2005
New Revision: 167915
URL: http://svn.apache.org/viewcvs?rev=167915&view=rev
Log:
Enhancements to TCK Web application
Modified:
incubator/jackrabbit/trunk/contrib/tck-webapp/src/java/org/apache/jackrabbit/tck/TckTestRunner.java
incubator/jackrabbit/trunk/contrib/tck-webapp/src/java/org/apache/jackrabbit/tck/Tester.java
incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/WEB-INF/classes/repositoryStubImpl.properties
incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/graph.jsp
Modified: incubator/jackrabbit/trunk/contrib/tck-webapp/src/java/org/apache/jackrabbit/tck/TckTestRunner.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/tck-webapp/src/java/org/apache/jackrabbit/tck/TckTestRunner.java?rev=167915&r1=167914&r2=167915&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/tck-webapp/src/java/org/apache/jackrabbit/tck/TckTestRunner.java (original)
+++ incubator/jackrabbit/trunk/contrib/tck-webapp/src/java/org/apache/jackrabbit/tck/TckTestRunner.java Tue May 3 07:54:46 2005
@@ -64,6 +64,9 @@
/** new test identifier string */
private String newTestString;
+ /** test counter */
+ private int tCount = 0;
+
/**
* The constructor inits the result map and sets the writer
*
@@ -86,6 +89,7 @@
result = new TestResult();
state = TestResult.SUCCESS;
startTime = System.currentTimeMillis();
+ tCount++;
}
/**
@@ -208,6 +212,14 @@
}
public void testEnded(String testName) {
+ }
+
+ public int getNumberOfTests() {
+ return tCount;
+ }
+
+ public void resetNumberOfTests() {
+ tCount = 0;
}
}
Modified: incubator/jackrabbit/trunk/contrib/tck-webapp/src/java/org/apache/jackrabbit/tck/Tester.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/tck-webapp/src/java/org/apache/jackrabbit/tck/Tester.java?rev=167915&r1=167914&r2=167915&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/tck-webapp/src/java/org/apache/jackrabbit/tck/Tester.java (original)
+++ incubator/jackrabbit/trunk/contrib/tck-webapp/src/java/org/apache/jackrabbit/tck/Tester.java Tue May 3 07:54:46 2005
@@ -59,6 +59,9 @@
/** the exclude list */
Map excludeList;
+ /** the numberf of executed tests */
+ int numOfTests;
+
/**
* The constructor...
*
@@ -70,6 +73,7 @@
this.runner = runner;
this.writer = writer;
this.excludeList = excludeList;
+ numOfTests = 0;
// set the configuration for the to be tested repository
AbstractJCRTest.helper = new RepositoryHelper(WebAppTestConfig.getCurrentConfig());
@@ -95,9 +99,11 @@
TestSuite updatedTS = applyExcludeList(suite);
try {
+ runner.resetNumberOfTests();
updatedTS.run(result);
results.putAll(runner.getResults());
write(updatedTS);
+ numOfTests += runner.getNumberOfTests();
} catch (Exception e) {
// ignore
}
@@ -217,5 +223,14 @@
}
}
node.save();
+ }
+
+ /**
+ * Returns the number of executed tests
+ *
+ * @return number of executed tests
+ */
+ public int getNumberOfExecutedTests() {
+ return numOfTests;
}
}
Modified: incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/WEB-INF/classes/repositoryStubImpl.properties
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/WEB-INF/classes/repositoryStubImpl.properties?rev=167915&r1=167914&r2=167915&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/WEB-INF/classes/repositoryStubImpl.properties (original)
+++ incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/WEB-INF/classes/repositoryStubImpl.properties Tue May 3 07:54:46 2005
@@ -252,7 +252,7 @@
javax.jcr.tck.SerializationTest.propertyValueMayChange= jcr:created jcr:uuid jcr:versionHistory jcr:baseVersion jcr:predecessors P_Reference
# List all properties which are skipped during xml import according specification chapter 7.3.3
-javax.jcr.tck.SerializtionTest.propertySkipped=
+javax.jcr.tck.SerializationTest.propertySkipped=
# The name of the test node types. For easier diagnostics, the node types have names
# that tell you the kind of information they store
Modified: incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/graph.jsp
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/graph.jsp?rev=167915&r1=167914&r2=167915&view=diff
==============================================================================
--- incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/graph.jsp (original)
+++ incubator/jackrabbit/trunk/contrib/tck-webapp/src/webapp/graph.jsp Tue May 3 07:54:46 2005
@@ -151,11 +151,17 @@
t.setfinishedSuiteString("<script>parent.statuswin.document.write(\"finished {0} tests<br>\");window.scrollBy(0,40);</script>");
long startMillies = System.currentTimeMillis();
t.run();
+
+ // saving test results
+ out.write("<script>parent.statuswin.document.write('" + String.valueOf(t.getNumberOfExecutedTests()) + " tests got executed<br>')</script>'");
+ out.write("<script>parent.statuswin.document.write('Saving test results...<br>')</script>");
Node results = testResNode.addNode(String.valueOf(startMillies));
testResNode.save();
t.storeResults(results);
// test summary
+ out.write("<script>parent.statuswin.document.write('Generating test summary...<br>')</script>'");
+ out.write("<script>parent.statuswin.scrollBy(0,30);</script>");
Map summary = buildSummary(results, repSession);
out.write("<table width=\"100%\">");
@@ -187,7 +193,7 @@
out.write("<script>parent.statuswin.document.write(\"...finished. Test took " +
String.valueOf(System.currentTimeMillis() - startMillies) + "ms<br>\");</script>");
- out.write("<script>parent.statuswin.scrollBy(0,30);</script>");
+ out.write("<script>parent.statuswin.scrollBy(0,50);</script>");
out.write("<script>parent.statuswin.document.write(\"</body></html>\");</script>");
out.write("<script>window.scrollBy(0,200);</script>");
} else if (mode != null && mode.equals("view")) {