- adjusted test results to new format

- introduced new test result comparison
- dealt with EDOAL (new renderer)

test/src/RendererTest.java

 /*
  * $Id$
  *
- * Copyright (C) INRIA, 2010
+ * Copyright (C) INRIA, 2009-2010
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -46,8 +46,6 @@ import fr.inrialpes.exmo.align.impl.renderer.XMLMetadataRendererVisitor;
 import fr.inrialpes.exmo.align.impl.renderer.XSLTRendererVisitor;
 
 import fr.inrialpes.exmo.align.impl.method.StringDistAlignment;
-//import fr.inrialpes.exmo.align.impl.eval.PRecEvaluator;
-//import fr.inrialpes.exmo.align.impl.URIAlignment;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
@@ -67,6 +65,11 @@ public class RendererTest {
 
     private AlignmentProcess alignment = null;
 
+    private boolean valueSimilarTo( int obtained, int expected ) {
+	if ( (expected-1 <= obtained) && (obtained <= expected+1) ) return true;
+	else return false;
+    }
+
     // Create the Alignement that will be rendered by everyone
     @BeforeClass(groups = { "full", "impl", "raw" })
     private void init() throws Exception {
@@ -78,6 +81,7 @@ public class RendererTest {
 	alignment.init( new URI("file:examples/rdf/edu.umbc.ebiquity.publication.owl"), new URI("file:examples/rdf/edu.mit.visus.bibtex.owl"));
 	alignment.align( (Alignment)null, params );
 	assertEquals( alignment.nbCells(), 44 );
+	// Suppress the time label 
     }
 
     @Test(groups = { "full", "impl", "raw" })
@@ -90,7 +94,8 @@ public class RendererTest {
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertEquals( stream.toString().length(), 14297, "Rendered differently" );
+	//System.err.println( stream.toString() );
+	assertTrue( valueSimilarTo( stream.toString().length(), 14285 ), "Rendered differently: expected "+14285+" but was "+stream.toString().length() );
 	Properties params = new Properties();
 	params.setProperty( "embedded", "1");
     }
@@ -105,7 +110,7 @@ public class RendererTest {
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertEquals( stream.toString().length(), 7478, "Rendered differently" );
+	assertTrue( valueSimilarTo( stream.toString().length(), 7479 ), "Rendered differently: expected "+7479+" but was "+stream.toString().length() );
 	Properties params = new Properties();
 	params.setProperty( "embedded", "1");
 	stream = new ByteArrayOutputStream();
@@ -117,7 +122,7 @@ public class RendererTest {
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertEquals( stream.toString().length(), 7423, "Rendered differently" );
+	assertTrue( valueSimilarTo( stream.toString().length(), 7424 ), "Rendered differently: expected "+7424+" but was "+stream.toString().length() );
 	params.setProperty( "pre2008", "1");
 	stream = new ByteArrayOutputStream(); 
 	writer = new PrintWriter (
@@ -128,7 +133,7 @@ public class RendererTest {
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertEquals( stream.toString().length(), 7296, "Rendered differently" );
+	assertTrue( valueSimilarTo( stream.toString().length(), 7297 ), "Rendered differently: expected "+7297+" but was "+stream.toString().length() );
     }
 
     @Test(groups = { "full", "impl", "raw" })
@@ -141,7 +146,7 @@ public class RendererTest {
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertEquals( stream.toString().length(), 7666, "Rendered differently" );
+	assertTrue( valueSimilarTo( stream.toString().length(), 7667 ), "Rendered differently: expected "+7667+" but was "+stream.toString().length() );
     }
 
     @Test(groups = { "full", "impl", "raw" })
@@ -155,7 +160,7 @@ public class RendererTest {
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertEquals( stream.toString().length(), 6551, "Rendered differently" );
+	assertTrue( valueSimilarTo( stream.toString().length(), 6552 ), "Rendered differently: expected "+6552+" but was "+stream.toString().length() );
     }
 
     @Test(groups = { "full", "impl", "raw" })
@@ -168,7 +173,7 @@ public class RendererTest {
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertEquals( stream.toString().length(), 21699, "Rendered differently" );
+	assertTrue( valueSimilarTo( stream.toString().length(), 21700 ), "Rendered differently: expected "+21700+" but was "+stream.toString().length() );
     }
 
     @Test(groups = { "full", "impl", "raw" })
@@ -181,7 +186,7 @@ public class RendererTest {
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertEquals( stream.toString().length(), 8203, "Rendered differently" );
+	assertTrue( valueSimilarTo( stream.toString().length(), 8204 ), "Rendered differently: expected "+8204+" but was "+stream.toString().length() );
     }
 
     @Test(groups = { "full", "impl", "raw" })
@@ -194,7 +199,7 @@ public class RendererTest {
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertEquals( stream.toString().length(), 15394, "Rendered differently" );
+	assertTrue( valueSimilarTo( stream.toString().length(), 15395 ), "Rendered differently: expected "+15395+" but was "+stream.toString().length() );
     }
 
     @Test(groups = { "full", "impl", "raw" })
@@ -207,7 +212,8 @@ public class RendererTest {
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertEquals( stream.toString().length(), 18393, "Rendered differently" );
+	//System.err.println( stream.toString() );
+	assertTrue( valueSimilarTo( stream.toString().length(), 18394 ), "Rendered differently: expected "+18394+" but was "+stream.toString().length() );
     }
 
     @Test(groups = { "full", "impl", "raw" })
@@ -220,7 +226,7 @@ public class RendererTest {
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertEquals( stream.toString().length(), 772, "Rendered differently" );
+	assertTrue( valueSimilarTo( stream.toString().length(), 770 ), "Rendered differently: expected "+770+" but was "+stream.toString().length() );
     }