From 89bd8eb9dcde008e3de7f3bcad28c0d422f2d338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Tue, 5 Mar 2013 16:53:59 +0000
Subject: [PATCH] Fixed default namespace in bibtex.owl

---
 examples/rdf/edu.mit.visus.bibtex.owl |  8 +++++++-
 test/src/AlgTest.java                 |  2 +-
 test/src/JWNLTest.java                | 10 +++++-----
 test/src/RendererTest.java            | 26 +++++++++++++-------------
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/examples/rdf/edu.mit.visus.bibtex.owl b/examples/rdf/edu.mit.visus.bibtex.owl
index 7dab8eb7..102063f1 100644
--- a/examples/rdf/edu.mit.visus.bibtex.owl
+++ b/examples/rdf/edu.mit.visus.bibtex.owl
@@ -10,7 +10,11 @@
 	<!ENTITY bibtex		"http://purl.org/net/nknouf/ns/bibtex#">
 	<!ENTITY dcterms 	"http://purl.org/dc/terms/">
     <!ENTITY dctype 	"http://purl.org/dc/dcmitype/"> ]>
-	
+
+<!--
+    xmlns="http://alignapi.gforge.inria.fr/tutorial/edu.mit.visus.bibtex.owl#"
+    xml:base="http://alignapi.gforge.inria.fr/tutorial/edu.mit.visus.bibtex.owl#"
+-->	
 <rdf:RDF
     xmlns:units		="&units;"
     xmlns:foaf		="http://xmlns.com/foaf/0.1/"
@@ -22,6 +26,8 @@
     xmlns:dc		="&dc;"
     xmlns:dcterms	="&dcterms;"
     xmlns:dctype	="&dctype;"
+    xmlns="&bibtex;"
+    xml:base="&bibtex;"
     xmlns:bibtex	="&bibtex;">
   	
 <owl:Ontology rdf:about="">
diff --git a/test/src/AlgTest.java b/test/src/AlgTest.java
index 14bc0888..c9521357 100644
--- a/test/src/AlgTest.java
+++ b/test/src/AlgTest.java
@@ -141,6 +141,6 @@ public class AlgTest {
 	new NameAndPropertyAlignment().init( new URI("file:examples/rdf/edu.umbc.ebiquity.publication.owl"), new URI("file:examples/rdf/edu.mit.visus.bibtex.owl"));
 	assertEquals( al.getOntology1(), alignment1.getOntology1() );
 	assertEquals( al.getOntology2(), align2.getOntology2() );
-	assertEquals( al.nbCells(), 5/*4*/ );
+	assertEquals( al.nbCells(), 4/*4*/ );
     }
 }
diff --git a/test/src/JWNLTest.java b/test/src/JWNLTest.java
index 94a8fa38..85c47634 100644
--- a/test/src/JWNLTest.java
+++ b/test/src/JWNLTest.java
@@ -83,7 +83,7 @@ $ java -jar lib/procalign.jar -Dwndict=$WNDIR file://$CWD/examples/rdf/edu.umbc.
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertEquals( stream.toString().length(), 411462, "Rendered differently" );
+	assertEquals( stream.toString().length(), 459804, "Rendered differently" );
 	alignment.cut( "hard", 0.4 );
 	assertEquals( alignment.nbCells(), 122 );
 
@@ -108,7 +108,7 @@ $ java -jar lib/procalign.jar -Dwndict=$WNDIR file://$CWD/examples/rdf/edu.umbc.
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertEquals( stream.toString().length(), 1985, "Rendered differently" );
+	assertEquals( stream.toString().length(), 2087, "Rendered differently" );
 	alignment.cut( "hard", 0.4 );
 	assertEquals( alignment.nbCells(), 3 );
     }
@@ -132,7 +132,7 @@ $ java -jar lib/procalign.jar -Dwndict=$WNDIR file://$CWD/examples/rdf/edu.umbc.
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertEquals( stream.toString().length(), 4037, "Rendered differently" );
+	assertEquals( stream.toString().length(), 4391, "Rendered differently" );
 	alignment.cut( "hard", 0.4 );
 	assertEquals( alignment.nbCells(), 10 );
     }
@@ -156,7 +156,7 @@ $ java -jar lib/procalign.jar -Dwndict=$WNDIR file://$CWD/examples/rdf/edu.umbc.
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertEquals( stream.toString().length(), 13081, "Rendered differently" );
+	assertEquals( stream.toString().length(), 14515, "Rendered differently" );
 	alignment.cut( "hard", 0.4 );
 	assertEquals( alignment.nbCells(), 35 );
     }
@@ -180,7 +180,7 @@ $ java -jar lib/procalign.jar -Dwndict=$WNDIR file://$CWD/examples/rdf/edu.umbc.
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertEquals( stream.toString().length(), 10757, "Rendered differently" );
+	assertEquals( stream.toString().length(), 11903, "Rendered differently" );
 	alignment.cut( "hard", 0.4 );
 	assertEquals( alignment.nbCells(), 10 );
     }
diff --git a/test/src/RendererTest.java b/test/src/RendererTest.java
index d9215265..80846e4c 100644
--- a/test/src/RendererTest.java
+++ b/test/src/RendererTest.java
@@ -1,7 +1,7 @@
 /*
  * $Id$
  *
- * Copyright (C) INRIA, 2009-2012
+ * Copyright (C) INRIA, 2009-2013
  *
  * 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
@@ -87,7 +87,7 @@ public class RendererTest {
 	writer.flush();
 	writer.close();
 	//System.err.println( stream.toString() );
-	assertTrue( valueSimilarTo( stream.toString().length(), 10417 ), "Rendered differently: expected "+10417+" but was "+stream.toString().length() );
+	assertTrue( valueSimilarTo( stream.toString().length(), 11563 ), "Rendered differently: expected "+11563+" but was "+stream.toString().length() );
 	Properties params = new Properties();
 	params.setProperty( "embedded", "1");
     }
@@ -102,7 +102,7 @@ public class RendererTest {
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertTrue( valueSimilarTo( stream.toString().length(), 5553 ), "Rendered differently: expected "+5553+" but was "+stream.toString().length() );
+	assertTrue( valueSimilarTo( stream.toString().length(), 6705 ), "Rendered differently: expected "+6705+" but was "+stream.toString().length() );
 	Properties params = new Properties();
 	params.setProperty( "embedded", "1");
 	stream = new ByteArrayOutputStream();
@@ -114,7 +114,7 @@ public class RendererTest {
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertTrue( valueSimilarTo( stream.toString().length(), 5498 ), "Rendered differently: expected "+5498+" but was "+stream.toString().length() );
+	assertTrue( valueSimilarTo( stream.toString().length(), 6650 ), "Rendered differently: expected "+6650+" but was "+stream.toString().length() );
 	params.setProperty( "pre2008", "1");
 	stream = new ByteArrayOutputStream(); 
 	writer = new PrintWriter (
@@ -125,7 +125,7 @@ public class RendererTest {
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertTrue( valueSimilarTo( stream.toString().length(), 5407 ), "Rendered differently: expected "+5407+" but was "+stream.toString().length() );
+	assertTrue( valueSimilarTo( stream.toString().length(), 6559 ), "Rendered differently: expected "+6559+" but was "+stream.toString().length() );
     }
 
     @Test(groups = { "full", "impl", "raw" })
@@ -139,7 +139,7 @@ public class RendererTest {
 	writer.flush();
 	writer.close();
 	//System.err.println( stream.toString() );
-	assertTrue( valueSimilarTo( stream.toString().length(), 5830 ), "Rendered differently: expected "+5830+" but was "+stream.toString().length() );
+	assertTrue( valueSimilarTo( stream.toString().length(), 6868 ), "Rendered differently: expected "+6868+" but was "+stream.toString().length() );
     }
 
     @Test(groups = { "full", "impl", "raw" })
@@ -153,7 +153,7 @@ public class RendererTest {
 	oalignment.render( renderer ); // test error with alignment
 	writer.flush();
 	writer.close();
-	assertTrue( valueSimilarTo( stream.toString().length(), 4820 ), "Rendered differently: expected "+4820+" but was "+stream.toString().length() );
+	assertTrue( valueSimilarTo( stream.toString().length(), 5966 ), "Rendered differently: expected "+5966+" but was "+stream.toString().length() );
     }
 
     @Test(groups = { "full", "impl", "raw" })
@@ -166,7 +166,7 @@ public class RendererTest {
 	oalignment.render( renderer ); // test error with alignment
 	writer.flush();
 	writer.close();
-	assertTrue( valueSimilarTo( stream.toString().length(), 16141 ), "Rendered differently: expected "+16141+" but was "+stream.toString().length() );
+	assertTrue( valueSimilarTo( stream.toString().length(), 17293 ), "Rendered differently: expected "+17293+" but was "+stream.toString().length() );
     }
 
     @Test(groups = { "full", "impl", "raw" })
@@ -179,7 +179,7 @@ public class RendererTest {
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertTrue( valueSimilarTo( stream.toString().length(), 6133 ), "Rendered differently: expected "+6133+" but was "+stream.toString().length() );
+	assertTrue( valueSimilarTo( stream.toString().length(), 6164 ), "Rendered differently: expected "+6164+" but was "+stream.toString().length() );
     }
 
     @Test(groups = { "full", "impl", "raw" })
@@ -193,7 +193,7 @@ public class RendererTest {
 	writer.flush();
 	writer.close();
 	//System.err.println( stream.toString() );
-	assertTrue( valueSimilarTo( stream.toString().length(), 11492 ), "Rendered differently: expected "+11492+" but was "+stream.toString().length() );
+	assertTrue( valueSimilarTo( stream.toString().length(), 12638 ), "Rendered differently: expected "+12638+" but was "+stream.toString().length() );
     }
 
     @Test(groups = { "full", "impl", "raw" })
@@ -207,7 +207,7 @@ public class RendererTest {
 	writer.flush();
 	writer.close();
 	//System.err.println( stream.toString() );
-	assertTrue( valueSimilarTo( stream.toString().length(), 13589 ), "Rendered differently: expected "+13589+" but was "+stream.toString().length() );
+	assertTrue( valueSimilarTo( stream.toString().length(), 15881 ), "Rendered differently: expected "+15881+" but was "+stream.toString().length() );
     }
 
     @Test(groups = { "full", "impl", "raw" })
@@ -221,7 +221,7 @@ public class RendererTest {
 	writer.flush();
 	writer.close();
 	//System.err.println( stream.toString() );
-	assertTrue( valueSimilarTo( stream.toString().length(), 8414 ), "Rendered differently: expected "+8414+" but was "+stream.toString().length() );
+	assertTrue( valueSimilarTo( stream.toString().length(), 9560 ), "Rendered differently: expected "+9560+" but was "+stream.toString().length() );
     }
 
     @Test(groups = { "full", "impl", "raw" })
@@ -234,7 +234,7 @@ public class RendererTest {
 	alignment.render( renderer );
 	writer.flush();
 	writer.close();
-	assertTrue( valueSimilarTo( stream.toString().length(), 770 ), "Rendered differently: expected "+770+" but was "+stream.toString().length() );
+	assertTrue( valueSimilarTo( stream.toString().length(), 764 ), "Rendered differently: expected "+764+" but was "+stream.toString().length() );
     }
 
 
-- 
GitLab