diff --git a/test/src/IOTests.java b/test/src/IOTests.java
index 25325ad3ede7347cc0dbe29843c1aa1fa6c83edb..421e000236dbf2e8d2a4b31ce89500c60465cab0 100644
--- a/test/src/IOTests.java
+++ b/test/src/IOTests.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2008-2009
+ * Copyright (C) INRIA, 2008-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
@@ -33,7 +33,7 @@ import org.semanticweb.owl.align.Alignment;
import fr.inrialpes.exmo.align.parser.AlignmentParser;
import fr.inrialpes.exmo.align.impl.URIAlignment;
-import fr.inrialpes.exmo.align.onto.Ontology;
+import fr.inrialpes.exmo.ontowrap.Ontology;
import java.io.ByteArrayOutputStream;
import java.io.PrintWriter;
diff --git a/test/src/JWNLTest.java b/test/src/JWNLTest.java
index 724713e1b8a26f904e842d99d22bcdba3a59e4f9..cd4602eb8ce9f2b8efe74dde960c9c2f917524aa 100644
--- a/test/src/JWNLTest.java
+++ b/test/src/JWNLTest.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2008-2009
+ * Copyright (C) INRIA, 2008-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
@@ -31,10 +31,8 @@ import org.semanticweb.owl.align.AlignmentVisitor;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.Alignment;
import org.semanticweb.owl.align.AlignmentProcess;
-import org.semanticweb.owl.align.Parameters;
import fr.inrialpes.exmo.align.impl.renderer.RDFRendererVisitor;
-import fr.inrialpes.exmo.align.impl.BasicParameters;
import fr.inrialpes.exmo.align.ling.JWNLAlignment;
import fr.inrialpes.exmo.ontosim.string.JWNLDistances;
@@ -45,6 +43,7 @@ import java.io.OutputStreamWriter;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Vector;
+import java.util.Properties;
/**
* These tests corresponds to the JWNL test of the README file in the main directory
@@ -68,10 +67,10 @@ public class JWNLTest {
$ setenv WNDIR ../WordNet-2.0/dict
$ java -jar lib/procalign.jar -Dwndict=$WNDIR file://$CWD/examples/rdf/edu.umbc.ebiquity.publication.owl file://$CWD/examples/rdf/edu.mit.visus.bibtex.owl -i fr.inrialpes.exmo.align.ling.JWNLAlignment -o examples/rdf/JWNL.rdf
*/
- Parameters params = new BasicParameters();
+ Properties params = new Properties();
//System.getenv("WNDIR");
- //params.setParameter( "wndict", "../WordNet-2.0/dict" );
- params.setParameter( "wndict", "../WordNet-3.0/dict" );
+ //params.setProperty( "wndict", "../WordNet-2.0/dict" );
+ params.setProperty( "wndict", "../WordNet-3.0/dict" );
alignment = new JWNLAlignment();
assertNotNull( alignment, "ObjectAlignment should not be null" );
assertEquals( alignment.nbCells(), 0 );
@@ -91,7 +90,7 @@ $ java -jar lib/procalign.jar -Dwndict=$WNDIR file://$CWD/examples/rdf/edu.umbc.
assertEquals( alignment.nbCells(), 38 );
// Different similarity
- params.setParameter( "wnfunction", "cosynonymySimilarity" );
+ params.setProperty( "wnfunction", "cosynonymySimilarity" );
alignment = new JWNLAlignment();
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 );
diff --git a/test/src/RendererTest.java b/test/src/RendererTest.java
index 80b3c59899500dc121fb429f874c61509894257d..0d71f1e44439dbb3344a5c80d0c8dd6fd903ca0f 100644
--- a/test/src/RendererTest.java
+++ b/test/src/RendererTest.java
@@ -1,7 +1,7 @@
/*
* $Id$
*
- * Copyright (C) INRIA, 2009
+ * Copyright (C) INRIA, 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
@@ -33,7 +33,6 @@ import org.semanticweb.owl.align.AlignmentVisitor;
import org.semanticweb.owl.align.AlignmentException;
import org.semanticweb.owl.align.AlignmentProcess;
import org.semanticweb.owl.align.Alignment;
-import org.semanticweb.owl.align.Parameters;
import org.semanticweb.owl.align.Evaluator;
import fr.inrialpes.exmo.align.impl.renderer.RDFRendererVisitor;
@@ -48,7 +47,6 @@ 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.BasicParameters;
//import fr.inrialpes.exmo.align.impl.URIAlignment;
import java.io.ByteArrayOutputStream;
@@ -59,6 +57,7 @@ import java.io.FileOutputStream;
import java.io.OutputStream;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.Properties;
/**
* These tests corresponds to the README file in the main directory
@@ -71,8 +70,8 @@ public class RendererTest {
// Create the Alignement that will be rendered by everyone
@BeforeClass(groups = { "full", "impl", "raw" })
private void init() throws Exception {
- Parameters params = new BasicParameters();
- params.setParameter( "stringFunction", "levenshteinDistance");
+ Properties params = new Properties();
+ params.setProperty( "stringFunction", "levenshteinDistance");
alignment = new StringDistAlignment();
assertNotNull( alignment, "ObjectAlignment should not be null" );
assertEquals( alignment.nbCells(), 0 );
@@ -92,8 +91,8 @@ public class RendererTest {
writer.flush();
writer.close();
assertEquals( stream.toString().length(), 14297, "Rendered differently" );
- Parameters params = new BasicParameters();
- params.setParameter( "embedded", "1");
+ Properties params = new Properties();
+ params.setProperty( "embedded", "1");
}
@Test(groups = { "full", "impl", "raw" })
@@ -107,8 +106,8 @@ public class RendererTest {
writer.flush();
writer.close();
assertEquals( stream.toString().length(), 7478, "Rendered differently" );
- Parameters params = new BasicParameters();
- params.setParameter( "embedded", "1");
+ Properties params = new Properties();
+ params.setProperty( "embedded", "1");
stream = new ByteArrayOutputStream();
writer = new PrintWriter (
new BufferedWriter(
@@ -119,7 +118,7 @@ public class RendererTest {
writer.flush();
writer.close();
assertEquals( stream.toString().length(), 7423, "Rendered differently" );
- params.setParameter( "pre2008", "1");
+ params.setProperty( "pre2008", "1");
stream = new ByteArrayOutputStream();
writer = new PrintWriter (
new BufferedWriter(