diff --git a/test/src/AlgTest.java b/test/src/AlgTest.java index 2662f158e1beea2aefb474b8eaf834e4ad9e455f..6612d5be28ed690c5794f10bc7034d8dc1e2cabb 100644 --- a/test/src/AlgTest.java +++ b/test/src/AlgTest.java @@ -32,12 +32,10 @@ import org.testng.annotations.Test; 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.Annotations; import fr.inrialpes.exmo.align.impl.Namespace; -import fr.inrialpes.exmo.align.impl.BasicParameters; import fr.inrialpes.exmo.align.impl.BasicAlignment; import fr.inrialpes.exmo.align.impl.URIAlignment; import fr.inrialpes.exmo.align.impl.ObjectAlignment; @@ -58,6 +56,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 @@ -70,7 +69,7 @@ public class AlgTest { @Test(groups = { "full", "impl", "raw" }) public void initTest() throws Exception { - Parameters params = new BasicParameters(); + Properties params = new Properties(); AlignmentProcess alignment1 = new StringDistAlignment(); alignment1.init( new URI("file:examples/rdf/onto1.owl"), new URI("file:examples/rdf/onto2.owl")); alignment1.align( (Alignment)null, params ); @@ -99,7 +98,7 @@ public class AlgTest { public void fullTest() throws Exception { AlignmentProcess alignment1 = new NameAndPropertyAlignment(); alignment1.init( new URI("file:examples/rdf/edu.umbc.ebiquity.publication.owl"), new URI("file:examples/rdf/edu.mit.visus.bibtex.owl")); - alignment1.align( (Alignment)null, new BasicParameters() ); + alignment1.align( (Alignment)null, new Properties() ); align1 = alignment1; assertEquals( align1.nbCells(), 37 ); assertEquals( align2.nbCells(), 10 ); @@ -132,7 +131,7 @@ public class AlgTest { public void composeTest() throws Exception { AlignmentProcess alignment1 = new NameAndPropertyAlignment(); alignment1.init( new URI("file:examples/rdf/edu.mit.visus.bibtex.owl"), new URI("file:examples/rdf/edu.umbc.ebiquity.publication.owl")); - alignment1.align( (Alignment)null, new BasicParameters() ); + alignment1.align( (Alignment)null, new Properties() ); assertEquals( alignment1.nbCells(), 38 ); assertEquals( align2.nbCells(), 10 ); diff --git a/test/src/MatcherTest.java b/test/src/MatcherTest.java index 7b2c7f3ec93e9bcb5cabe1ebc02327ada90b7431..e22d562cdb33a9c9634be6f0a58ab66a39c10d49 100644 --- a/test/src/MatcherTest.java +++ b/test/src/MatcherTest.java @@ -33,14 +33,12 @@ 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; import fr.inrialpes.exmo.align.impl.method.StringDistAlignment; import fr.inrialpes.exmo.ontosim.string.StringDistances; import fr.inrialpes.exmo.align.impl.eval.PRecEvaluator; -import fr.inrialpes.exmo.align.impl.BasicParameters; import fr.inrialpes.exmo.align.impl.URIAlignment; import fr.inrialpes.exmo.align.onto.OntologyCache; import fr.inrialpes.exmo.align.parser.AlignmentParser; @@ -55,6 +53,7 @@ import java.io.OutputStream; import java.net.URI; import java.net.URISyntaxException; import java.util.Vector; +import java.util.Properties; /** * These tests corresponds to the README file in the main directory @@ -71,9 +70,9 @@ public class MatcherTest { /* $ java -jar lib/Procalign.jar file://$CWD/examples/rdf/edu.umbc.ebiquity.publication.owl file://$CWD/examples/rdf/edu.mit.visus.bibtex.owl -i fr.inrialpes.exmo.align.impl.method.StringDistAlignment -DstringFunction=levenshteinDistance -o examples/rdf/bibref.rdf */ - Parameters params = new BasicParameters(); - params.setParameter( "stringFunction", "levenshteinDistance"); - params.setParameter( "noinst", "1"); + Properties params = new Properties(); + params.setProperty( "stringFunction", "levenshteinDistance"); + params.setProperty( "noinst", "1"); alignment = new StringDistAlignment(); assertNotNull( alignment, "ObjectAlignment should not be null" ); assertEquals( alignment.nbCells(), 0 ); @@ -107,9 +106,9 @@ $ java -jar lib/Procalign.jar file://$CWD/examples/rdf/edu.umbc.ebiquity.publica /* This tests an error when the distance name is incorrect */ @Test(groups = { "full", "impl", "raw" }, expectedExceptions = AlignmentException.class) public void routineTest9() throws Exception { - Parameters params = new BasicParameters(); - params.setParameter( "stringFunction", "teinDistance"); - params.setParameter( "noinst", "1"); + Properties params = new Properties(); + params.setProperty( "stringFunction", "teinDistance"); + params.setProperty( "noinst", "1"); alignment = new StringDistAlignment(); assertNotNull( alignment, "ObjectAlignment should not be null" ); assertEquals( alignment.nbCells(), 0 );