Skip to content

Commit

Permalink
Merge branch 'notation-shift'
Browse files Browse the repository at this point in the history
  • Loading branch information
@peacekeeper
peacekeeper committed Jul 5, 2014
2 parents 53f585d + 3bcccdd commit 2224dd1
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 38 deletions.
50 changes: 25 additions & 25 deletions core/src/test/java/xdi2/tests/core/util/StatementUtilTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ public class StatementUtilTest extends TestCase {
public void testStatementUtil() throws Exception {

String contextNodeStatements[] = new String[] {
"=markus//[<+email>]",
"=markus//[<#email>]",
"=markus//",
"//=markus"
};

String relationStatements[] = new String[] {
"=markus/+friend/=animesh",
"=markus/#friend/=animesh",
"=markus/$ref/[=]!1111",
"()/$is$ref/[=]!1111",
"[=]!1111/$ref/",
"[=]!1111+tel/+home+fax/[=]!1111+tel!1"
"[=]!1111#tel/#home#fax/[=]!1111#tel!1"
};

String literalStatements[] = new String[] {
"=markus<+name>&/&/\"Markus Sabadello\"",
"[=]!1111<+tel>&/&/\"+1-206-555-1212\"",
"[=]!1111<+tel>[1]&/&/\"+1.206.555.1111\""
"=markus<#name>&/&/\"Markus Sabadello\"",
"[=]!1111<#tel>&/&/\"+1-206-555-1212\"",
"[=]!1111<#tel>[1]&/&/\"+1.206.555.1111\""
};

String invalidStatements[] = new String[] {
Expand Down Expand Up @@ -78,47 +78,47 @@ public void testStatementUtil() throws Exception {

public void testremoveStartXriStatement() throws Exception {

XDI3Statement contextStatement = XDI3Statement.create("=markus+full//<+name>");
XDI3Statement contextStatement = XDI3Statement.create("=markus<#full>//<#name>");

XDI3Statement reducedContextStatement = StatementUtil.removeStartXriStatement(contextStatement, XDI3Segment.create("=markus"));

assertEquals(reducedContextStatement, XDI3Statement.create("+full//<+name>"));
assertEquals(reducedContextStatement.getSubject(), XDI3Segment.create("+full"));
assertEquals(reducedContextStatement, XDI3Statement.create("<#full>//<#name>"));
assertEquals(reducedContextStatement.getSubject(), XDI3Segment.create("<#full>"));
assertEquals(reducedContextStatement.getPredicate(), XDI3Segment.create(""));
assertEquals(reducedContextStatement.getObject(), "<+name>");
assertEquals(reducedContextStatement.getObject(), "<#name>");

assertEquals(StatementUtil.removeStartXriStatement(reducedContextStatement, XDI3Segment.create("{}"), false, false), XDI3Statement.create("//<+name>"));
assertEquals(StatementUtil.removeStartXriStatement(reducedContextStatement, XDI3Segment.create("{}"), false, true), XDI3Statement.create("//<#name>"));

XDI3Statement literalStatement = XDI3Statement.create("=markus<+name>&/&/\"Markus Sabadello\"");
XDI3Statement literalStatement = XDI3Statement.create("=markus<#name>&/&/\"Markus Sabadello\"");

XDI3Statement reducedLiteralStatement = StatementUtil.removeStartXriStatement(literalStatement, XDI3Segment.create("=markus"));

assertEquals(reducedLiteralStatement, XDI3Statement.create("<+name>&/&/\"Markus Sabadello\""));
assertEquals(reducedLiteralStatement.getSubject(), XDI3Segment.create("<+name>&"));
assertEquals(reducedLiteralStatement, XDI3Statement.create("<#name>&/&/\"Markus Sabadello\""));
assertEquals(reducedLiteralStatement.getSubject(), XDI3Segment.create("<#name>&"));
assertEquals(reducedLiteralStatement.getPredicate(), XDI3Segment.create("&"));
assertEquals(reducedLiteralStatement.getObject(), "Markus Sabadello");

assertEquals(StatementUtil.removeStartXriStatement(reducedLiteralStatement, XDI3Segment.create("{}"), false, false), XDI3Statement.create("&/&/\"Markus Sabadello\""));
assertEquals(StatementUtil.removeStartXriStatement(reducedLiteralStatement, XDI3Segment.create("{}{}"), false, false), XDI3Statement.create("/&/\"Markus Sabadello\""));
assertEquals(StatementUtil.removeStartXriStatement(reducedLiteralStatement, XDI3Segment.create("{}"), false, true), XDI3Statement.create("&/&/\"Markus Sabadello\""));
assertEquals(StatementUtil.removeStartXriStatement(reducedLiteralStatement, XDI3Segment.create("{}{}"), false, true), XDI3Statement.create("/&/\"Markus Sabadello\""));

XDI3Statement relationStatement = XDI3Statement.create("=markus<+name>/$ref/=markus+full<+name>");
XDI3Statement relationStatement = XDI3Statement.create("=markus<#name>/$ref/=markus<#full><#name>");

XDI3Statement reducedRelationStatement1 = StatementUtil.removeStartXriStatement(relationStatement, XDI3Segment.create("=markus"));

assertEquals(reducedRelationStatement1, XDI3Statement.create("<+name>/$ref/+full<+name>"));
assertEquals(reducedRelationStatement1.getSubject(), XDI3Segment.create("<+name>"));
assertEquals(reducedRelationStatement1, XDI3Statement.create("<#name>/$ref/=markus<#full><#name>"));
assertEquals(reducedRelationStatement1.getSubject(), XDI3Segment.create("<#name>"));
assertEquals(reducedRelationStatement1.getPredicate(), XDI3Segment.create("$ref"));
assertEquals(reducedRelationStatement1.getObject(), "+full<+name>");
assertEquals(reducedRelationStatement1.getObject(), "=markus<#full><#name>");

assertEquals(StatementUtil.removeStartXriStatement(reducedRelationStatement1, XDI3Segment.create("{}"), true, false), XDI3Statement.create("/$ref/<+name>"));
assertEquals(StatementUtil.removeStartXriStatement(reducedRelationStatement1, XDI3Segment.create("{}"), false, true), XDI3Statement.create("/$ref/=markus<#full><#name>"));

XDI3Statement reducedRelationStatement2 = StatementUtil.removeStartXriStatement(relationStatement, XDI3Segment.create("=markus"));

assertEquals(reducedRelationStatement2, XDI3Statement.create("<+name>/$ref/=markus+full<+name>"));
assertEquals(reducedRelationStatement2.getSubject(), XDI3Segment.create("<+name>"));
assertEquals(reducedRelationStatement2, XDI3Statement.create("<#name>/$ref/=markus<#full><#name>"));
assertEquals(reducedRelationStatement2.getSubject(), XDI3Segment.create("<#name>"));
assertEquals(reducedRelationStatement2.getPredicate(), XDI3Segment.create("$ref"));
assertEquals(reducedRelationStatement2.getObject(), "=markus+full<+name>");
assertEquals(reducedRelationStatement2.getObject(), "=markus<#full><#name>");

assertEquals(StatementUtil.removeStartXriStatement(reducedRelationStatement2, XDI3Segment.create("{}"), false, false), XDI3Statement.create("/$ref/=markus+full<+name>"));
assertEquals(StatementUtil.removeStartXriStatement(reducedRelationStatement2, XDI3Segment.create("{}"), false, true), XDI3Statement.create("/$ref/=markus<#full><#name>"));
}
}
4 changes: 2 additions & 2 deletions ...g/src/test/resources/xdi2/messaging/tests/target/interceptor/impl/linkcontract/graph1.xdi
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(=markus)/$ref/
/$is$ref/(=markus)
=markus/=markus/($do$if/$true/({$from}/$is/=drummond))
=markus/=markus/($do$if/$true/({$from}/$is/=markus))
(=markus/=markus)($do$if/$true){$from}/$is/=drummond
(=markus/=markus)($do$if/$true){$from}/$is/=markus
(=markus/=markus)$do/$get/=markus<#age>
(=markus/=markus)$do/$set/=markus
=markus<#age>&/&/"33"
Expand Down
4 changes: 2 additions & 2 deletions ...g/src/test/resources/xdi2/messaging/tests/target/interceptor/impl/linkcontract/graph2.xdi
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
([=]!:uuid:1111)/$ref/
/$is$ref/([=]!:uuid:1111)
([=]!:uuid:1111/[=]!:uuid:1111)$do/$all/
[=]!:uuid:1111/[=]!:uuid:1111/($do$if$and/$true/({$from}/$is/[=]!:uuid:1111))
[=]!:uuid:1111/[=]!:uuid:1111/($do$if$and/$true/({$msg}$secret<$token>&/$equals/$secret<$token>&))
([=]!:uuid:1111/[=]!:uuid:1111)($do$if$and/$true){$from}/$is/[=]!:uuid:1111
([=]!:uuid:1111/[=]!:uuid:1111)($do$if$and/$true){$msg}$secret<$token>&/$equals/$secret<$token>&
[=]!:uuid:1111<#email>&/&/"markus.sabadello@gmail.com"
$secret<$token>&/&/"s3cr3t"
2 changes: 1 addition & 1 deletion ...g/src/test/resources/xdi2/messaging/tests/target/interceptor/impl/linkcontract/graph3.xdi
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
([=]!:uuid:1111)/$ref/
/$is$ref/([=]!:uuid:1111)
([=]!:uuid:1111/#friend)$do/$get/[=]!:uuid:1111
[=]!:uuid:1111/#friend/($do$if/$true/([=]!:uuid:1111/#friend/{$from}))
([=]!:uuid:1111/#friend)($do$if/$true)[=]!:uuid:1111/#friend/{$from}
[=]!:uuid:1111<#email>&/&/"markus.sabadello@gmail.com"
[=]!:uuid:1111/#friend/[=]!1111
[=]!:uuid:1111/#friend/[=]!2222
4 changes: 2 additions & 2 deletions ...g/src/test/resources/xdi2/messaging/tests/target/interceptor/impl/linkcontract/graph4.xdi
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
([=]!:uuid:1111)/$ref/
/$is$ref/([=]!:uuid:1111)
([=]!:uuid:1111/#trusted)[$do]!:uuid:1234/$all/
[=]!:uuid:1111/#trusted/([$do]!:uuid:1234$if$or/$true/({$msg}<$ip>&/&/"127.0.0.1"))
[=]!:uuid:1111/#trusted/([$do]!:uuid:1234$if$or/$true/({$msg}<$sig><$valid>&/&/true))
([=]!:uuid:1111/#trusted)([$do]!:uuid:1234$if$or/$true){$msg}<$ip>&/&/"127.0.0.1"
([=]!:uuid:1111/#trusted)([$do]!:uuid:1234$if$or/$true){$msg}<$sig><$valid>&/&/true
[=]!:uuid:1111<#email>&/&/"markus.sabadello@gmail.com"
$secret<$token>&/&/"s3cr3t"
12 changes: 6 additions & 6 deletions ...g/src/test/resources/xdi2/messaging/tests/target/interceptor/impl/linkcontract/graph5.xdi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
/$is$ref/([=]!1111)
[=]!1111/#friend/[=]!2222
([=]!1111/[=]!2222)$do/$do$signal/[=]!1111[#channel]!23[#event]
[=]!1111/[=]!2222/($do$if$and/$true/({$msg}$do/$do$signal/([=]!1111[#channel]!23[#event]!44/#domain/#cloudos)))
[=]!1111/[=]!2222/($do$if$and[$or]!1/$true/({$msg}$do/$do$signal/([=]!1111[#channel]!23[#event]!44/#type/#notification)))
[=]!1111/[=]!2222/($do$if$and[$or]!1/$true/({$msg}$do/$do$signal/([=]!1111[#channel]!23[#event]!44/#type/#subscription)))
[=]!1111/[=]!2222/($do$if$and[$or]!1/$true/({$msg}$do/$do$signal/([=]!1111[#channel]!23[#event]!44/#type/#deletion)))
[=]!1111/[=]!2222/($do$if$and[$or]!2/$true/([=]!1111/#friend/{$from}))
[=]!1111/[=]!2222/($do$if$and[$or]!2/$true/([=]!1111/$is/{$from}))
([=]!1111/[=]!2222)($do$if$and/$true)({$msg}$do/$do$signal)[=]!1111[#channel]!23[#event]!44/#domain/#cloudos
([=]!1111/[=]!2222)($do$if$and[$or]!1/$true)({$msg}$do/$do$signal)[=]!1111[#channel]!23[#event]!44/#type/#notification
([=]!1111/[=]!2222)($do$if$and[$or]!1/$true)({$msg}$do/$do$signal)[=]!1111[#channel]!23[#event]!44/#type/#subscription
([=]!1111/[=]!2222)($do$if$and[$or]!1/$true)({$msg}$do/$do$signal)[=]!1111[#channel]!23[#event]!44/#type/#deletion
([=]!1111/[=]!2222)($do$if$and[$or]!2/$true)[=]!1111/#friend/{$from}
([=]!1111/[=]!2222)($do$if$and[$or]!2/$true)[=]!1111/$is/{$from}

0 comments on commit 2224dd1

Please sign in to comment.