Skip to content

Escape type attribute in CIListener emitted <failure> tags. #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yjo wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Escape type attribute in CIListener emitted <failure> tags. #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ea1136
Escape type in emitted XML
yjo Nov 4, 2011
717acf1
CIListener: proper XML escaping
yjo Nov 4, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions FlexUnit4AntTasks/src/org/flexunit/ant/FlexUnitSocketThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@
*/
public class FlexUnitSocketThread implements Callable<Object>
{
// Messages from CIListener
private static final String END_OF_SUCCESS = "status=\"success\" />";
private static final String END_OF_FAILURE = "</testcase>";
private static final String END_OF_IGNORE = "<skipped /></testcase>";

// XML attribute labels
private static final String SUITE_ATTRIBUTE = "classname";

Expand Down Expand Up @@ -77,15 +72,7 @@ private void parseInboundMessages() throws IOException

while ((request = server.readNextTokenFromSocket()) != null)
{
// If the string is a failure, process the report
if (request.endsWith(END_OF_FAILURE) || request.endsWith(END_OF_SUCCESS) || request.endsWith(END_OF_IGNORE))
{
processTestReport(request);
}
else
{
throw new BuildException("command [" + request + "] not understood");
}
// TODO: handling of malformed XML processTestReport(request);
}
}

Expand Down Expand Up @@ -139,4 +126,4 @@ private Document parseReport(String report)
throw new BuildException("Error parsing report.", e);
}
}
}
}
102 changes: 49 additions & 53 deletions FlexUnit4CIListener/src/org/flexunit/listeners/CIListener.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* @author Jeff Tapper
* @author Jeff Tapper
* @version
**/

Expand Down Expand Up @@ -80,7 +80,7 @@ package org.flexunit.listeners
private var timeOut:Timer;
private var lastTestTime:Number = 0;

public function CIListener(port : uint = DEFAULT_PORT, server : String = DEFAULT_SERVER)
public function CIListener(port : uint = DEFAULT_PORT, server : String = DEFAULT_SERVER)
{
this.port = port;
this.server = server;
Expand Down Expand Up @@ -112,7 +112,7 @@ package org.flexunit.listeners
}

[Bindable(event="listenerReady")]
public function get ready():Boolean
public function get ready():Boolean
{
return _ready;
}
Expand All @@ -122,70 +122,69 @@ package org.flexunit.listeners
dispatchEvent( new Event( AsyncListenerWatcher.LISTENER_READY ) );
}

private function getTestCount( description:IDescription ):int
private function getTestCount( description:IDescription ):int
{
return description.testCount;
}

public function testTimed( description:IDescription, runTime:Number ):void {
if(!runTime || isNaN(runTime))
{
lastTestTime = 0;
}
else
{
lastTestTime = runTime;
}
{
lastTestTime = 0;
}
else
{
lastTestTime = runTime;
}

//trace( description.displayName + " took " + runTime + " ms " );
}

public function testRunStarted( description:IDescription ):void
{
//Since description tells us nothing about failure, error, and skip counts, this is
//Since description tells us nothing about failure, error, and skip counts, this is
//computed by the Ant task as the process executes and no work is needed to signify
//the start of a test run.
}

public function testRunFinished( result:Result ):void
public function testRunFinished( result:Result ):void
{
sendResults(END_OF_TEST_RUN);
}

public function testStarted( description:IDescription ):void
public function testStarted( description:IDescription ):void
{
// called before each test
}

public function testFinished( description:IDescription ):void
public function testFinished( description:IDescription ):void
{
// called after each test
if(!lastFailedTest || description.displayName != lastFailedTest.displayName){
var desc:Descriptor = getDescriptorFromDescription(description);
sendResults("<testcase classname=\""+desc.suite+"\" name=\""+desc.method+"\" time=\"" + lastTestTime + "\" status=\""+SUCCESS+"\" />");
sendResults(<testcase classname={desc.suite} name={desc.method} time={lastTestTime} status={SUCCESS} />.toXMLString());
}
}

public function testAssumptionFailure( failure:Failure ):void
public function testAssumptionFailure( failure:Failure ):void
{
// called on assumptionFail
}

public function testIgnored( description:IDescription ):void
public function testIgnored( description:IDescription ):void
{
// called on ignored test if we want to send ignore to ant.
var descriptor:Descriptor = getDescriptorFromDescription(description);

var xml:String =
"<testcase classname=\""+descriptor.suite+"\" name=\""+descriptor.method+"\" time=\"" + lastTestTime + "\" status=\""+IGNORE+"\">"
+ "<skipped />"
+ "</testcase>";
var xml:XML =
<testcase classname={descriptor.suite} name={descriptor.method} time={lastTestTime} status={IGNORE}>
<skipped />
</testcase>;

sendResults( xml );
sendResults( xml.toXMLString() );
}


public function testFailure( failure:Failure ):void
public function testFailure( failure:Failure ):void
{
// called on a test failure
lastFailedTest = failure.description;
Expand All @@ -197,32 +196,29 @@ package org.flexunit.listeners
var methodName : String = descriptor.method;

if ( stackTrace != null ) stackTrace = stackTrace.toString();

stackTrace = FailureFormatter.xmlEscapeMessage( stackTrace );
message = FailureFormatter.xmlEscapeMessage( message );

var xml : String = null;

if(FailureFormatter.isError(failure.exception))

var xml : XML = null;

if(FailureFormatter.isError(failure.exception))
{
xml =
"<testcase classname=\""+descriptor.suite+"\" name=\""+descriptor.method+"\" time=\"" + lastTestTime + "\" status=\""+ERROR+"\">"
+ "<error message=\"" + message + "\" type=\""+ type +"\" >"
+ "<![CDATA[" + stackTrace + "]]>"
+ "</error>"
+ "</testcase>";
<testcase classname={descriptor.suite} name={methodName} time={lastTestTime} status={ERROR}>
<error message={message} type={type}>
{stackTrace}
</error>
</testcase>;
}
else
else
{
xml =
"<testcase classname=\""+descriptor.suite+"\" name=\""+descriptor.method+"\" time=\"" + lastTestTime + "\" status=\""+FAILURE+"\">"
+ "<failure message=\"" + message + "\" type=\""+ type +"\" >"
+ "<![CDATA[" + stackTrace + "]]>"
+ "</failure>"
+ "</testcase>";
<testcase classname={descriptor.suite} name={methodName} time={lastTestTime} status={FAILURE}>
<failure message={message} type={type}>
{stackTrace}
</failure>
</testcase>;
}

sendResults(xml);
sendResults(xml.toXMLString());
}

/*
Expand All @@ -238,18 +234,18 @@ package org.flexunit.listeners
* and formats accordingly.
**/
var descriptor:Descriptor = new Descriptor();
var descriptionArray:Array = description.displayName.split("::");
var descriptionArray:Array = description.displayName.split("::", 2);
var classMethod:String;
if ( descriptionArray.length > 1 )
if ( descriptionArray.length > 1 )
{
descriptor.path = descriptionArray[0];
classMethod = descriptionArray[1];
}
else
}
else
{
classMethod = descriptionArray[0];
}
var classMethodArray:Array = classMethod.split(".");
var classMethodArray:Array = classMethod.split(".", 2);
descriptor.suite = ( descriptor.path == "" ) ? classMethodArray[0] :
descriptor.path + "::" + classMethodArray[0];
descriptor.method = classMethodArray[1];
Expand All @@ -260,7 +256,7 @@ package org.flexunit.listeners
{
if(socket.connected)
{
socket.send( msg );
socket.send(msg);
}

trace(msg);
Expand Down Expand Up @@ -291,7 +287,7 @@ package org.flexunit.listeners
{
var data : String = event.data;

// If we received an acknowledgement on startup, the java server is read and we can start sending.
// If we received an acknowledgement on startup, the java server is read and we can start sending.
if ( data == START_OF_TEST_RUN_ACK ) {
setStatusReady();
} else if ( data == END_OF_TEST_ACK ) {
Expand All @@ -310,4 +306,4 @@ package org.flexunit.listeners
this.closer.close();
}
}
}
}