Skip to content

Remove redundant fabric-sdk-java integration test dependency #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bestbeforetoday merged 1 commit into from
Jul 26, 2023
Merged

Remove redundant fabric-sdk-java integration test dependency #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion fabric-chaincode-integration-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
dependencies {
implementation project(':fabric-chaincode-docker')
testImplementation 'org.hyperledger.fabric-sdk-java:fabric-sdk-java:1.4.4'
implementation project(':fabric-chaincode-shim')
implementation group: 'org.json', name: 'json', version: '20180813'
}
Expand Down
6 changes: 3 additions & 3 deletions ...test/java/org/hyperleder/fabric/shim/integration/contractinstall/ContractInstallTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ public static void setUp() throws Exception {
public void TestInstall(){

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

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

helper = InvokeHelper.newHelper("wrappermaven","sachannel");
text = helper.invoke("org1",new String[]{"whoami"});
text = helper.invoke("org1", "whoami");
assertThat(text, containsString("WrapperMaven"));
}

Expand Down
2 changes: 1 addition & 1 deletion ...c/test/java/org/hyperleder/fabric/shim/integration/ledgertests/LedgerIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public static void setUp() throws Exception {
public void TestLedgers(){
InvokeHelper helper = InvokeHelper.newHelper("ledgercc","sachannel");

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

}
Expand Down
8 changes: 4 additions & 4 deletions ...t/src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SACCIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@ public static void setUp() throws Exception {
public void TestLedger(){

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

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

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

text = helper.invoke("org1",new String[]{"getMetricsProviderName"});
text = helper.invoke("org1", "getMetricsProviderName");
System.out.println(text);
assertThat(text, containsString("org.hyperledger.fabric.metrics.impl.DefaultProvider"));
}
Expand Down
85 changes: 38 additions & 47 deletions .../src/test/java/org/hyperleder/fabric/shim/integration/shimtests/SBECCIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,8 @@
import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertThat;

import java.io.IOException;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.security.spec.InvalidKeySpecException;

import org.hyperleder.fabric.shim.integration.util.FabricState;
import org.hyperleder.fabric.shim.integration.util.InvokeHelper;
import org.hyperledger.fabric.sdk.exception.InvalidArgumentException;
import org.hyperledger.fabric.sdk.exception.ProposalException;
import org.junit.BeforeClass;
import org.junit.Test;

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

@Test
public void RunSBE_pub_setget() throws NoSuchAlgorithmException, InvalidKeySpecException, NoSuchProviderException,
IOException, ProposalException, InvalidArgumentException {
public void RunSBE_pub_setget() {
final String mode = "pub";

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

String text;

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

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

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

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

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

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

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

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

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

text = helper.invoke("org1",new String[] {"EndorsementCC:listorgs", mode});
text = helper.invoke("org1", "EndorsementCC:listorgs", mode);
assertThat(text, containsString("org2MSP"));
assertThat(text, containsString("org1MSP"));


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

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

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

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

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

text = helper.invoke("org1",new String[] {"EndorsementCC:listorgs", mode});
text = helper.invoke("org1", "EndorsementCC:listorgs", mode);
assertThat(text, containsString("org2MSP"));
assertThat(text, not(containsString("org1MSP")));

text = helper.invoke("org1",new String[] {"EndorsementCC:deleteval", mode});
text = helper.invoke("org1", "EndorsementCC:deleteval", mode);
assertThat(text, containsString("success"));
text = helper.invoke("org1",new String[] {"EndorsementCC:recordExists", mode});
text = helper.invoke("org1", "EndorsementCC:recordExists", mode);
assertThat(text, containsString("false"));

}

@Test
public void RunSBE_priv() throws NoSuchAlgorithmException, InvalidKeySpecException, NoSuchProviderException,
IOException, ProposalException, InvalidArgumentException {
public void RunSBE_priv() {
final String mode = "priv";

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

String text;

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

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

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

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

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

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

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

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

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

text = helper.invoke("org1",new String[] {"EndorsementCC:listorgs", mode});
text = helper.invoke("org1", "EndorsementCC:listorgs", mode);
assertThat(text, containsString("org2MSP"));
assertThat(text, containsString("org1MSP"));


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

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

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

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

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

text = helper.invoke("org1",new String[] {"EndorsementCC:listorgs", mode});
text = helper.invoke("org1", "EndorsementCC:listorgs", mode);
assertThat(text, containsString("org2MSP"));
assertThat(text, not(containsString("org1MSP")));

text = helper.invoke("org1",new String[] {"EndorsementCC:deleteval", mode});
text = helper.invoke("org1", "EndorsementCC:deleteval", mode);
assertThat(text, containsString("success"));
text = helper.invoke("org1",new String[] {"EndorsementCC:recordExists", mode});
text = helper.invoke("org1", "EndorsementCC:recordExists", mode);
assertThat(text, containsString("false"));

}
Expand Down
2 changes: 1 addition & 1 deletion ...code-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Bash.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
*
*/
public class Bash extends Command {
public final class Bash extends Command {

public static BashBuilder newBuilder(){
return new BashBuilder();
Expand Down
23 changes: 10 additions & 13 deletions ...e-integration-test/src/test/java/org/hyperleder/fabric/shim/integration/util/Command.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
package org.hyperleder.fabric.shim.integration.util;

import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintStream;
import java.lang.ProcessBuilder.Redirect;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand All @@ -22,25 +22,21 @@

public class Command {

protected List<String> cmd;
protected Map<String, String> env;
protected final List<String> cmd;
protected final Map<String, String> env = new HashMap<>();

Command(List<String> cmd, Map<String,String> additionalEnv){
this.cmd = cmd;
// this.env = new HashMap(System.getenv());
this.env = new HashMap();
this.env.putAll(additionalEnv);
}

Command(List<String> cmd) {
this.cmd = cmd;
this.env = new HashMap();
// this.env = new HashMap(System.getenv());
this(cmd, Collections.emptyMap());
}

public class Result {
public ArrayList<String> stdout;
public ArrayList<String> stderr;
public static final class Result {
public List<String> stdout;
public List<String> stderr;
public int exitcode;
}

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

System.out.println("Running:" + this.toString());
System.out.println("Running:" + this);
try {

processBuilder.redirectInput(Redirect.INHERIT);
Expand Down Expand Up @@ -103,7 +99,7 @@ public Result run(boolean quiet) {
CompletableFuture<ArrayList<String>> readOutStream(InputStream is, PrintStream stream) {
return CompletableFuture.supplyAsync(() -> {
try (InputStreamReader isr = new InputStreamReader(is); BufferedReader br = new BufferedReader(isr);) {
ArrayList<String> res = new ArrayList<String>();
ArrayList<String> res = new ArrayList<>();
String inputLine;
while ((inputLine = br.readLine()) != null) {
if (stream!=null) stream.println(inputLine);
Expand All @@ -121,6 +117,7 @@ public String toString() {
}

static public class Builder<T extends Command> implements Cloneable {
@SuppressWarnings("unchecked")
public Builder<T> duplicate() {
try {
return (Builder<T>) this.clone();
Expand Down
57 changes: 0 additions & 57 deletions ...tion-test/src/test/java/org/hyperleder/fabric/shim/integration/util/CommandSingleton.java
View file
Open in desktop

This file was deleted.

Loading