diff --git a/src/test/java/terms/DependencyTermTest.java b/src/test/java/terms/DependencyTermTest.java index f8ef97a..eaa726d 100644 --- a/src/test/java/terms/DependencyTermTest.java +++ b/src/test/java/terms/DependencyTermTest.java @@ -13,6 +13,7 @@ import models.terms.RDLTerm; import models.terms.Resource; import models.terms.meta.MatchConstraint; +import models.terms.meta.MetaDynamicTerm; import models.terms.meta.MetaRDLTerm; import models.terms.meta.MetaResource; import models.terms.meta.MetaTermPairGenerator; @@ -138,7 +139,7 @@ Resource a5 = new Resource("a5", Utils.INT, 4); DependencyTerm t1 = new DependencyTerm(a1, a2, a3, a4, a5); MetaResource x = new MetaResource(new Variable("x"), new Variable("n")); - MetaRDLTerm mt1 = new MetaRDLTerm(x, + MetaDynamicTerm mt1 = new MetaDynamicTerm(x, (MetaTermPairGenerator) (i, depth, isLast) -> new TermPair( new MetaResource(new Variable("x" + (2*i + 1)), Utils.parse("n-1-" + i)), @@ -154,7 +155,7 @@ @Test void DynamicMatchTest2() { MetaResource x = new MetaResource(new Variable("x")); - MetaRDLTerm mt1 = new MetaRDLTerm(x, (MetaTermPairGenerator) (i, depth, isLast) -> new TermPair(new MetaResource(new Variable("x" + i)), new MetaResource(new Variable("y"+i)))); + MetaDynamicTerm mt1 = new MetaDynamicTerm(x, (MetaTermPairGenerator) (i, depth, isLast) -> new TermPair(new MetaResource(new Variable("x" + i)), new MetaResource(new Variable("y"+i)))); DependencyTerm d1 = new DependencyTerm(a, b, c); DependencyTerm d2 = new DependencyTerm(a, b, c, d, e); assertTrue(! mt1.isMatchedBy(d1).isEmpty()); diff --git a/src/test/java/terms/DependencyTest.java b/src/test/java/terms/DependencyTest.java index 360ef2d..e296033 100644 --- a/src/test/java/terms/DependencyTest.java +++ b/src/test/java/terms/DependencyTest.java @@ -14,6 +14,7 @@ import models.terms.RDLTerm; import models.terms.Resource; import models.terms.meta.MatchConstraint; +import models.terms.meta.MetaDynamicTerm; import models.terms.meta.MetaRDLTerm; import models.terms.meta.MetaResource; import models.terms.meta.MetaTermGenerator; @@ -122,7 +123,7 @@ @Test void DynamicMatchTest() { MetaResource x = new MetaResource(new Variable("x")); - MetaRDLTerm md1 = new MetaRDLTerm(x, new MetaTermGenerator() { + MetaDynamicTerm md1 = new MetaDynamicTerm(x, new MetaTermGenerator() { @Override public MetaRDLTerm generate(int index, int depth, boolean isLast) { if (index != 0) {