Skip to content

Commit 7c1708a

Browse files
bestbeforetodaybestbeforetoday
authored
Remove redundant fabric-sdk-java integration test dependency (#309)
Tidy-up integration test code, including removing redundant code. Signed-off-by: Mark S. Lewis <[email protected]>
1 parent 40126d0 commit 7c1708a

File tree

12 files changed

+68
-140
lines changed

12 files changed

+68
-140
lines changed

‎fabric-chaincode-integration-test/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
dependencies {
22
implementation project(':fabric-chaincode-docker')
3-
testImplementation 'org.hyperledger.fabric-sdk-java:fabric-sdk-java:1.4.4'
43
implementation project(':fabric-chaincode-shim')
54
implementation group: 'org.json', name: 'json', version: '20180813'
65
}

‎fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/contractinstall/ContractInstallTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ public static void setUp() throws Exception {
2828
public void TestInstall(){
2929

3030
InvokeHelper helper = InvokeHelper.newHelper("baregradlecc","sachannel");
31-
String text = helper.invoke("org1",new String[]{"whoami"});
31+
String text = helper.invoke("org1", "whoami");
3232
assertThat(text, containsString("BareGradle"));
3333

3434
helper = InvokeHelper.newHelper("baremaven","sachannel");
35-
text = helper.invoke("org1",new String[]{"whoami"});
35+
text = helper.invoke("org1", "whoami");
3636
assertThat(text, containsString("BareMaven"));
3737

3838
helper = InvokeHelper.newHelper("wrappermaven","sachannel");
39-
text = helper.invoke("org1",new String[]{"whoami"});
39+
text = helper.invoke("org1", "whoami");
4040
assertThat(text, containsString("WrapperMaven"));
4141
}
4242

‎fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/ledgertests/LedgerIntegrationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public static void setUp() throws Exception {
2929
public void TestLedgers(){
3030
InvokeHelper helper = InvokeHelper.newHelper("ledgercc","sachannel");
3131

32-
String text = helper.invoke("org1",new String[]{"accessLedgers"});
32+
String text = helper.invoke("org1", "accessLedgers");
3333
assertThat(text, containsString("success"));
3434

3535
}

‎fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SACCIntegrationTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ public static void setUp() throws Exception {
2828
public void TestLedger(){
2929

3030
InvokeHelper helper = InvokeHelper.newHelper("shimcc", "sachannel");
31-
String text = helper.invoke("org1",new String[]{"putBulkStates"});
31+
String text = helper.invoke("org1", "putBulkStates");
3232
assertThat(text, containsString("success"));
3333

34-
text = helper.invoke("org1",new String[]{"getByRange","key120","key170"});
34+
text = helper.invoke("org1", "getByRange","key120","key170");
3535
assertThat(text, containsString("50"));
3636

37-
text = helper.invoke("org1",new String[]{"getByRangePaged","key120","key170","10",""});
37+
text = helper.invoke("org1", "getByRangePaged","key120","key170","10","");
3838
System.out.println(text);
3939
assertThat(text, containsString("key130"));
4040

41-
text = helper.invoke("org1",new String[]{"getMetricsProviderName"});
41+
text = helper.invoke("org1", "getMetricsProviderName");
4242
System.out.println(text);
4343
assertThat(text, containsString("org.hyperledger.fabric.metrics.impl.DefaultProvider"));
4444
}

‎fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SBECCIntegrationTest.java‎

Lines changed: 38 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,8 @@
99
import static org.hamcrest.Matchers.not;
1010
import static org.junit.Assert.assertThat;
1111

12-
import java.io.IOException;
13-
import java.security.NoSuchAlgorithmException;
14-
import java.security.NoSuchProviderException;
15-
import java.security.spec.InvalidKeySpecException;
16-
1712
import org.hyperleder.fabric.shim.integration.util.FabricState;
1813
import org.hyperleder.fabric.shim.integration.util.InvokeHelper;
19-
import org.hyperledger.fabric.sdk.exception.InvalidArgumentException;
20-
import org.hyperledger.fabric.sdk.exception.ProposalException;
2114
import org.junit.BeforeClass;
2215
import org.junit.Test;
2316

@@ -31,134 +24,132 @@ public static void setUp() throws Exception {
3124
}
3225

3326
@Test
34-
public void RunSBE_pub_setget() throws NoSuchAlgorithmException, InvalidKeySpecException, NoSuchProviderException,
35-
IOException, ProposalException, InvalidArgumentException {
27+
public void RunSBE_pub_setget() {
3628
final String mode = "pub";
3729

3830
final InvokeHelper helper = InvokeHelper.newHelper("shimcc", "sachannel");
3931

4032
String text;
4133

42-
text = helper.invoke("org1",new String[] {"EndorsementCC:setval", mode, "foo"});
34+
text = helper.invoke("org1", "EndorsementCC:setval", mode, "foo");
4335
assertThat(text, containsString("success"));
4436

45-
text = helper.invoke("org1",new String[] {"EndorsementCC:getval", mode});
37+
text = helper.invoke("org1", "EndorsementCC:getval", mode);
4638
assertThat(text, containsString("foo"));
4739

48-
text = helper.invoke("org1",new String[] {"EndorsementCC:addorgs", mode, "org1MSP"});
40+
text = helper.invoke("org1", "EndorsementCC:addorgs", mode, "org1MSP");
4941
assertThat(text, containsString("success"));
5042

51-
text = helper.invoke("org1",new String[] {"EndorsementCC:listorgs", mode});
43+
text = helper.invoke("org1", "EndorsementCC:listorgs", mode);
5244
assertThat(text, containsString("org1MSP"));
5345

54-
text = helper.invoke("org1",new String[] {"EndorsementCC:setval", mode, "val1"});
46+
text = helper.invoke("org1", "EndorsementCC:setval", mode, "val1");
5547
assertThat(text, containsString("success"));
5648

57-
text = helper.invoke("org1",new String[] {"EndorsementCC:getval", mode});
49+
text = helper.invoke("org1", "EndorsementCC:getval", mode);
5850
assertThat(text, containsString("val1"));
5951

60-
text = helper.invoke("org1",new String[] {"EndorsementCC:setval", mode, "val2"});
52+
text = helper.invoke("org1", "EndorsementCC:setval", mode, "val2");
6153

62-
text = helper.invoke("org1",new String[] {"EndorsementCC:getval", mode});
54+
text = helper.invoke("org1", "EndorsementCC:getval", mode);
6355
assertThat(text, containsString("val2"));
6456

65-
text = helper.invoke("org1",new String[] {"EndorsementCC:addorgs", mode, "org2MSP"});
57+
text = helper.invoke("org1", "EndorsementCC:addorgs", mode, "org2MSP");
6658
assertThat(text, containsString("success"));
6759

68-
text = helper.invoke("org1",new String[] {"EndorsementCC:listorgs", mode});
60+
text = helper.invoke("org1", "EndorsementCC:listorgs", mode);
6961
assertThat(text, containsString("org2MSP"));
7062
assertThat(text, containsString("org1MSP"));
7163

7264

73-
text = helper.invoke("org1",new String[] {"EndorsementCC:setval", mode, "val3"});
65+
text = helper.invoke("org1", "EndorsementCC:setval", mode, "val3");
7466
assertThat(text, containsString("success"));
7567

76-
text = helper.invoke("org1",new String[] {"EndorsementCC:getval", mode});
68+
text = helper.invoke("org1", "EndorsementCC:getval", mode);
7769
assertThat(text, containsString("val3"));
7870

79-
text = helper.invoke("org1",new String[] {"EndorsementCC:setval", mode, "val4"});
71+
text = helper.invoke("org1", "EndorsementCC:setval", mode, "val4");
8072
assertThat(text, containsString("success"));
8173

82-
text = helper.invoke("org1",new String[] {"EndorsementCC:getval", mode});
74+
text = helper.invoke("org1", "EndorsementCC:getval", mode);
8375
assertThat(text, containsString("val4"));
8476

85-
text = helper.invoke("org1",new String[] {"EndorsementCC:delorgs", mode, "org1MSP"});
77+
text = helper.invoke("org1", "EndorsementCC:delorgs", mode, "org1MSP");
8678
assertThat(text, containsString("success"));
8779

88-
text = helper.invoke("org1",new String[] {"EndorsementCC:listorgs", mode});
80+
text = helper.invoke("org1", "EndorsementCC:listorgs", mode);
8981
assertThat(text, containsString("org2MSP"));
9082
assertThat(text, not(containsString("org1MSP")));
9183

92-
text = helper.invoke("org1",new String[] {"EndorsementCC:deleteval", mode});
84+
text = helper.invoke("org1", "EndorsementCC:deleteval", mode);
9385
assertThat(text, containsString("success"));
94-
text = helper.invoke("org1",new String[] {"EndorsementCC:recordExists", mode});
86+
text = helper.invoke("org1", "EndorsementCC:recordExists", mode);
9587
assertThat(text, containsString("false"));
9688

9789
}
9890

9991
@Test
100-
public void RunSBE_priv() throws NoSuchAlgorithmException, InvalidKeySpecException, NoSuchProviderException,
101-
IOException, ProposalException, InvalidArgumentException {
92+
public void RunSBE_priv() {
10293
final String mode = "priv";
10394

10495
final InvokeHelper helper = InvokeHelper.newHelper("shimcc", "sachannel");
10596

10697
String text;
10798

108-
text = helper.invoke("org1",new String[] {"EndorsementCC:setval", mode, "foo"});
99+
text = helper.invoke("org1", "EndorsementCC:setval", mode, "foo");
109100
assertThat(text, containsString("success"));
110101

111-
text = helper.invoke("org1",new String[] {"EndorsementCC:getval", mode});
102+
text = helper.invoke("org1", "EndorsementCC:getval", mode);
112103
assertThat(text, containsString("foo"));
113104

114-
text = helper.invoke("org1",new String[] {"EndorsementCC:addorgs", mode, "org1MSP"});
105+
text = helper.invoke("org1", "EndorsementCC:addorgs", mode, "org1MSP");
115106
assertThat(text, containsString("success"));
116107

117-
text = helper.invoke("org1",new String[] {"EndorsementCC:listorgs", mode});
108+
text = helper.invoke("org1", "EndorsementCC:listorgs", mode);
118109
assertThat(text, containsString("org1MSP"));
119110

120-
text = helper.invoke("org1",new String[] {"EndorsementCC:setval", mode, "val1"});
111+
text = helper.invoke("org1", "EndorsementCC:setval", mode, "val1");
121112
assertThat(text, containsString("success"));
122113

123-
text = helper.invoke("org1",new String[] {"EndorsementCC:getval", mode});
114+
text = helper.invoke("org1", "EndorsementCC:getval", mode);
124115
assertThat(text, containsString("val1"));
125116

126-
text = helper.invoke("org1",new String[] {"EndorsementCC:setval", mode, "val2"});
117+
text = helper.invoke("org1", "EndorsementCC:setval", mode, "val2");
127118
assertThat(text, containsString("success"));
128119

129-
text = helper.invoke("org1",new String[] {"EndorsementCC:getval", mode});
120+
text = helper.invoke("org1", "EndorsementCC:getval", mode);
130121
assertThat(text, containsString("val2"));
131122

132-
text = helper.invoke("org1",new String[] {"EndorsementCC:addorgs", mode, "org2MSP"});
123+
text = helper.invoke("org1", "EndorsementCC:addorgs", mode, "org2MSP");
133124
assertThat(text, containsString("success"));
134125

135-
text = helper.invoke("org1",new String[] {"EndorsementCC:listorgs", mode});
126+
text = helper.invoke("org1", "EndorsementCC:listorgs", mode);
136127
assertThat(text, containsString("org2MSP"));
137128
assertThat(text, containsString("org1MSP"));
138129

139130

140-
text = helper.invoke("org1",new String[] {"EndorsementCC:setval", mode, "val3"});
131+
text = helper.invoke("org1", "EndorsementCC:setval", mode, "val3");
141132
assertThat(text, containsString("success"));
142133

143-
text = helper.invoke("org1",new String[] {"EndorsementCC:getval", mode});
134+
text = helper.invoke("org1", "EndorsementCC:getval", mode);
144135
assertThat(text, containsString("val3"));
145136

146-
text = helper.invoke("org1",new String[] {"EndorsementCC:setval", mode, "val4"});
137+
text = helper.invoke("org1", "EndorsementCC:setval", mode, "val4");
147138
assertThat(text, containsString("success"));
148139

149-
text = helper.invoke("org1",new String[] {"EndorsementCC:getval", mode});
140+
text = helper.invoke("org1", "EndorsementCC:getval", mode);
150141
assertThat(text, containsString("val4"));
151142

152-
text = helper.invoke("org1",new String[] {"EndorsementCC:delorgs", mode, "org1MSP"});
143+
text = helper.invoke("org1", "EndorsementCC:delorgs", mode, "org1MSP");
153144
assertThat(text, containsString("success"));
154145

155-
text = helper.invoke("org1",new String[] {"EndorsementCC:listorgs", mode});
146+
text = helper.invoke("org1", "EndorsementCC:listorgs", mode);
156147
assertThat(text, containsString("org2MSP"));
157148
assertThat(text, not(containsString("org1MSP")));
158149

159-
text = helper.invoke("org1",new String[] {"EndorsementCC:deleteval", mode});
150+
text = helper.invoke("org1", "EndorsementCC:deleteval", mode);
160151
assertThat(text, containsString("success"));
161-
text = helper.invoke("org1",new String[] {"EndorsementCC:recordExists", mode});
152+
text = helper.invoke("org1", "EndorsementCC:recordExists", mode);
162153
assertThat(text, containsString("false"));
163154

164155
}

‎fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Bash.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
*
1616
*/
17-
public class Bash extends Command {
17+
public final class Bash extends Command {
1818

1919
public static BashBuilder newBuilder(){
2020
return new BashBuilder();

‎fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Command.java‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
package org.hyperleder.fabric.shim.integration.util;
88

99
import java.io.BufferedReader;
10-
import java.io.File;
1110
import java.io.IOException;
1211
import java.io.InputStream;
1312
import java.io.InputStreamReader;
1413
import java.io.PrintStream;
1514
import java.lang.ProcessBuilder.Redirect;
1615
import java.util.ArrayList;
16+
import java.util.Collections;
1717
import java.util.HashMap;
1818
import java.util.List;
1919
import java.util.Map;
@@ -22,25 +22,21 @@
2222

2323
public class Command {
2424

25-
protected List<String> cmd;
26-
protected Map<String, String> env;
25+
protected final List<String> cmd;
26+
protected final Map<String, String> env = new HashMap<>();
2727

2828
Command(List<String> cmd, Map<String,String> additionalEnv){
2929
this.cmd = cmd;
30-
// this.env = new HashMap(System.getenv());
31-
this.env = new HashMap();
3230
this.env.putAll(additionalEnv);
3331
}
3432

3533
Command(List<String> cmd) {
36-
this.cmd = cmd;
37-
this.env = new HashMap();
38-
// this.env = new HashMap(System.getenv());
34+
this(cmd, Collections.emptyMap());
3935
}
4036

41-
public class Result {
42-
public ArrayList<String> stdout;
43-
public ArrayList<String> stderr;
37+
public static final class Result {
38+
public List<String> stdout;
39+
public List<String> stderr;
4440
public int exitcode;
4541
}
4642

@@ -62,7 +58,7 @@ public Result run(boolean quiet) {
6258
processBuilder.environment().putAll(env);
6359
final Result result = new Result();
6460

65-
System.out.println("Running:" + this.toString());
61+
System.out.println("Running:" + this);
6662
try {
6763

6864
processBuilder.redirectInput(Redirect.INHERIT);
@@ -103,7 +99,7 @@ public Result run(boolean quiet) {
10399
CompletableFuture<ArrayList<String>> readOutStream(InputStream is, PrintStream stream) {
104100
return CompletableFuture.supplyAsync(() -> {
105101
try (InputStreamReader isr = new InputStreamReader(is); BufferedReader br = new BufferedReader(isr);) {
106-
ArrayList<String> res = new ArrayList<String>();
102+
ArrayList<String> res = new ArrayList<>();
107103
String inputLine;
108104
while ((inputLine = br.readLine()) != null) {
109105
if (stream!=null) stream.println(inputLine);
@@ -121,6 +117,7 @@ public String toString() {
121117
}
122118

123119
static public class Builder<T extends Command> implements Cloneable {
120+
@SuppressWarnings("unchecked")
124121
public Builder<T> duplicate() {
125122
try {
126123
return (Builder<T>) this.clone();

‎fabric-chaincode-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/CommandSingleton.java‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

0 commit comments

Comments
 (0)