From 463de613854dbbb6d56b4bf5c68cc93e1f52f5f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Tue, 14 Jan 2014 18:04:26 +0000
Subject: [PATCH] - Adapted tests to the last and new fixes
---
.../align/impl/renderer/OWLAxiomsRendererVisitor.java | 3 ++-
test/src/EDOALExportTest.java | 4 ++--
test/src/READMETest.java | 10 +++++-----
test/src/RendererTest.java | 9 +++++----
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java
index 4506a4d6..7e3816cd 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/OWLAxiomsRendererVisitor.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2003-2004, 2007-2013
+ * Copyright (C) INRIA, 2003-2004, 2007-2014
*
* 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
@@ -118,6 +118,7 @@ public class OWLAxiomsRendererVisitor extends IndentedRendererVisitor implements
onto1 = (LoadedOntology)((ObjectAlignment)alignment).getOntologyObject1();
onto2 = (LoadedOntology)((ObjectAlignment)alignment).getOntologyObject2();
} else if ( align instanceof EDOALAlignment ) {
+ alignment = align;
edoal = true;
} else {
try {
diff --git a/test/src/EDOALExportTest.java b/test/src/EDOALExportTest.java
index 7c3e2deb..33cb4a1e 100644
--- a/test/src/EDOALExportTest.java
+++ b/test/src/EDOALExportTest.java
@@ -3,7 +3,7 @@
*
* Copyright (C) 2006 Digital Enterprise Research Insitute (DERI) Innsbruck
* Sourceforge version 1.3 -- 2007
- * Copyright (C) INRIA, 2009-2013
+ * Copyright (C) INRIA, 2009-2014
*
* 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
@@ -180,7 +180,7 @@ public class EDOALExportTest {
writer.close();
String str1 = stream.toString();
//System.err.println(str1);
- assertEquals( str1.length(), 1372 );
+ assertEquals( str1.length(), 1315 );
}
@Test(groups = { "full", "omwg", "raw" }, dependsOnMethods = {"testOWLRendering0"})
diff --git a/test/src/READMETest.java b/test/src/READMETest.java
index bbee258b..2a2a94f0 100644
--- a/test/src/READMETest.java
+++ b/test/src/READMETest.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2008-2011, 2013
+ * Copyright (C) INRIA, 2008-2011, 2013-2014
*
* 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
@@ -396,11 +396,11 @@ $ java -cp lib/procalign.jar fr.inrialpes.exmo.align.cli.EvalAlign -i fr.inrialp
eval.write( writer );
writer.flush();
writer.close();
- assertEquals( eval.getPrecision(), 0.8732495020298934 );
+ assertEquals( eval.getPrecision(), 0.9140795712224283 );
assertEquals( eval.getRecall(), 1.0 );
- assertEquals( eval.getNoise(), 0.12675049797010662 );
- assertEquals( eval.getFmeasure(), 0.9323365639052582 );
- assertEquals( eval.getOverall(), 0.8548519092476188 );
+ assertEquals( eval.getNoise(), 0.08592042877757167 );
+ assertEquals( eval.getFmeasure(), 0.9551113600137854 );
+ assertEquals( eval.getOverall(), 0.9060033376933831 );
}
@Test(groups = { "full", "impl", "raw" })
diff --git a/test/src/RendererTest.java b/test/src/RendererTest.java
index 512528b1..bb8116ac 100644
--- a/test/src/RendererTest.java
+++ b/test/src/RendererTest.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2009-2013
+ * Copyright (C) INRIA, 2009-2014
*
* 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
@@ -139,7 +139,7 @@ public class RendererTest {
writer.flush();
writer.close();
//System.err.println( stream.toString() );
- assertTrue( valueSimilarTo( stream.toString().length(), 6868 ), "Rendered differently: expected "+6868+" but was "+stream.toString().length() );
+ assertTrue( valueSimilarTo( stream.toString().length(), 6818 ), "Rendered differently: expected "+6818+" but was "+stream.toString().length() );
}
@Test(groups = { "full", "impl", "raw" })
@@ -166,7 +166,8 @@ public class RendererTest {
oalignment.render( renderer ); // test error with alignment
writer.flush();
writer.close();
- assertTrue( valueSimilarTo( stream.toString().length(), 33811 ), "Rendered differently: expected "+33811+" but was "+stream.toString().length() );
+ //System.err.println( stream.toString() );
+ assertTrue( valueSimilarTo( stream.toString().length(), 33716 ), "Rendered differently: expected "+33716+" but was "+stream.toString().length() );
}
@Test(groups = { "full", "impl", "raw" })
@@ -193,7 +194,7 @@ public class RendererTest {
writer.flush();
writer.close();
//System.err.println( stream.toString() );
- assertTrue( valueSimilarTo( stream.toString().length(), 12638 ), "Rendered differently: expected "+12638+" but was "+stream.toString().length() );
+ assertTrue( valueSimilarTo( stream.toString().length(), 12588 ), "Rendered differently: expected "+12588+" but was "+stream.toString().length() );
}
@Test(groups = { "full", "impl", "raw" })
--
GitLab