Skip to content

Commit

Permalink
fix broken test case due to enodeId name change
Browse files Browse the repository at this point in the history
  • Loading branch information
apratt3377 committed Nov 12, 2019
1 parent d8c3a7a commit 0dc83c8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,6 @@ public void testPermissionGetOrgDetails() throws Exception {
web3j.quorumPermissionGetOrgDetails("orgId").send();

verifyResult(
"{\"jsonrpc\":\"2.0\",\"method\":\"quorumPermission_getOrgDetails\",\"params\":[\"orgId\",{\"from\":\"FROM\",\"to\":\"TO\",\"gas\":\"0xa\",\"value\":\"0xa\",\"data\":\"0xDATA\",\"nonce\":\"0x1\",\"privateFrom\":\"privateFrom\",\"privateFor\":[\"privateFor1\",\"privateFor2\"]}],\"id\":1}");
"{\"jsonrpc\":\"2.0\",\"method\":\"quorumPermission_getOrgDetails\",\"params\":[\"orgId\"],\"id\":1}");
}
}
4 changes: 2 additions & 2 deletions src/integration-test/java/org/web3j/quorum/ResponseTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,12 @@ public void testPermissionExecStatusInfoResponse() {
@Test
public void testPermissionGetOrgDetails() {
buildResponse(
"{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":{\"acctList\":[{\"acctId\":\"0xed9d02e382b34818e88b88a309c7fe71e65f419d\",\"isOrgAdmin\":\"true\",\"orgId\":\"INITORG\",\"roleId\":\"NWADMIN\",\"status\":\"2\"}],\"nodeList\":[{\"orgId\":\"INITORG\",\"status\":\"2\",\"url\":\"enode://72c0572f7a2492cffb5efc3463ef350c68a0446402a123dacec9db5c378789205b525b3f5f623f7548379ab0e5957110bffcf43a6115e450890f97a9f65a681a@127.0.0.1:21000?discport=0\"},{\"orgId\":\"INITORG\",\"status\":\"2\",\"url\":\"enode://7a1e3b5c6ad614086a4e5fb55b6fe0a7cf7a7ac92ac3a60e6033de29df14148e7a6a7b4461eb70639df9aa379bd77487937bea0a8da862142b12d326c7285742@127.0.0.1:21001?discport=0\"}],\"roleList\":[{\"access\":\"3\",\"active\":\"true\",\"isAdmin\":\"true\",\"isVoter\":\"true\",\"orgId\":\"INITORG\",\"roleId\":\"NWADMIN\"}],\"subOrgList\":[]}}");
"{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":{\"acctList\":[{\"acctId\":\"0xed9d02e382b34818e88b88a309c7fe71e65f419d\",\"isOrgAdmin\":\"true\",\"orgId\":\"INITORG\",\"roleId\":\"NWADMIN\",\"status\":\"2\"}],\"nodeList\":[{\"orgId\":\"INITORG\",\"status\":\"2\",\"enodeId\":\"enode://72c0572f7a2492cffb5efc3463ef350c68a0446402a123dacec9db5c378789205b525b3f5f623f7548379ab0e5957110bffcf43a6115e450890f97a9f65a681a@127.0.0.1:21000?discport=0\"},{\"orgId\":\"INITORG\",\"status\":\"2\",\"enodeId\":\"enode://7a1e3b5c6ad614086a4e5fb55b6fe0a7cf7a7ac92ac3a60e6033de29df14148e7a6a7b4461eb70639df9aa379bd77487937bea0a8da862142b12d326c7285742@127.0.0.1:21001?discport=0\"}],\"roleList\":[{\"access\":\"3\",\"active\":\"true\",\"isAdmin\":\"true\",\"isVoter\":\"true\",\"orgId\":\"INITORG\",\"roleId\":\"NWADMIN\"}],\"subOrgList\":[]}}");

OrgDetailsInfo orgDetails = deserialiseResponse(OrgDetailsInfo.class);
assertThat(
orgDetails.getOrgDetails().toString(),
is(
"OrgDetails(roleList=[PermissionRoleInfo(isVoter=true, active=true, orgId=INITORG, roleId=NWADMIN, access=3, isAdmin=true)], acctList=[PermissionAccountInfo(acctId=0xed9d02e382b34818e88b88a309c7fe71e65f419d, isOrgAdmin=true, orgId=INITORG, roleId=NWADMIN, status=2)], nodeList=[PermissionNodeInfo(orgId=INITORG, url=enode://72c0572f7a2492cffb5efc3463ef350c68a0446402a123dacec9db5c378789205b525b3f5f623f7548379ab0e5957110bffcf43a6115e450890f97a9f65a681a@127.0.0.1:21000?discport=0, status=2), PermissionNodeInfo(orgId=INITORG, url=enode://7a1e3b5c6ad614086a4e5fb55b6fe0a7cf7a7ac92ac3a60e6033de29df14148e7a6a7b4461eb70639df9aa379bd77487937bea0a8da862142b12d326c7285742@127.0.0.1:21001?discport=0, status=2)], subOrgList=[])"));
"OrgDetails(roleList=[PermissionRoleInfo(isVoter=true, active=true, orgId=INITORG, roleId=NWADMIN, access=3, isAdmin=true)], acctList=[PermissionAccountInfo(acctId=0xed9d02e382b34818e88b88a309c7fe71e65f419d, isOrgAdmin=true, orgId=INITORG, roleId=NWADMIN, status=2)], nodeList=[PermissionNodeInfo(orgId=INITORG, enodeId=enode://72c0572f7a2492cffb5efc3463ef350c68a0446402a123dacec9db5c378789205b525b3f5f623f7548379ab0e5957110bffcf43a6115e450890f97a9f65a681a@127.0.0.1:21000?discport=0, status=2), PermissionNodeInfo(orgId=INITORG, enodeId=enode://7a1e3b5c6ad614086a4e5fb55b6fe0a7cf7a7ac92ac3a60e6033de29df14148e7a6a7b4461eb70639df9aa379bd77487937bea0a8da862142b12d326c7285742@127.0.0.1:21001?discport=0, status=2)], subOrgList=[])"));
}
}

0 comments on commit 0dc83c8

Please sign in to comment.