From 1ca0ea50695a0eaa046156a7d58faf3fad33b81d Mon Sep 17 00:00:00 2001
From: GME <guillaume.meneroud@gmail.com>
Date: Thu, 14 Mar 2019 22:27:01 +0100
Subject: [PATCH] t

---
 .idea/workspace.xml                           | 192 ++++++++----------
 .../blockchain/query/QueryRegisterTest.java   |  53 +++++
 src/test/java/blockchain/query/QueryTest.java |   3 +-
 3 files changed, 143 insertions(+), 105 deletions(-)
 create mode 100644 src/test/java/blockchain/query/QueryRegisterTest.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e548aef..15eb1b0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7c8802f8-163e-48a6-9d7a-9324ac89091d" name="Default" comment="">
+      <change afterPath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryRegisterTest.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/msp/org1/admin.context" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
@@ -19,33 +18,33 @@
     <session id="-1607393105">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="15" />
+          <entry key="project.closed" value="16" />
           <entry key="project.open.time.5" value="3" />
           <entry key="project.open.time.6" value="11" />
-          <entry key="project.open.time.8" value="1" />
-          <entry key="project.opened" value="15" />
+          <entry key="project.open.time.8" value="2" />
+          <entry key="project.opened" value="16" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="class" value="3" />
-          <entry key="java" value="26" />
+          <entry key="java" value="29" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
           <entry key="CLASS" value="3" />
-          <entry key="JAVA" value="26" />
+          <entry key="JAVA" value="29" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="java" value="193" />
+          <entry key="java" value="277" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="193" />
+          <entry key="JAVA" value="277" />
         </counts>
       </usages-collector>
     </session>
@@ -53,10 +52,10 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
+        <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="575">
-              <caret line="37" column="64" selection-start-line="37" selection-start-column="64" selection-end-line="37" selection-end-column="64" />
+            <state relative-caret-position="442">
+              <caret line="36" column="40" selection-start-line="36" selection-start-column="40" selection-end-line="36" selection-end-column="40" />
             </state>
           </provider>
         </entry>
@@ -64,53 +63,26 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="272">
-              <caret line="26" column="63" selection-start-line="26" selection-start-column="63" selection-end-line="26" selection-end-column="63" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestEnrollAdmin.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="357">
-              <caret line="27" column="61" selection-start-line="27" selection-start-column="61" selection-end-line="27" selection-end-column="61" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/CreateChaincodeUserTest.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="748">
-              <caret line="57" column="13" selection-start-line="57" selection-start-column="13" selection-end-line="57" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="306">
-              <caret line="23" column="37" selection-start-line="23" selection-start-column="37" selection-end-line="23" selection-end-column="37" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/FabricClientWrapper.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="442">
-              <caret line="38" column="65" selection-start-line="38" selection-start-column="65" selection-end-line="38" selection-end-column="65" />
+            <state relative-caret-position="391">
+              <caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java">
+        <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryRegisterTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="425">
-              <caret line="35" column="37" selection-start-line="35" selection-start-column="37" selection-end-line="35" selection-end-column="37" />
+            <state relative-caret-position="192">
+              <caret line="28" column="47" selection-start-line="28" selection-start-column="47" selection-end-line="28" selection-end-column="47" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/ChaincodeTransactionTest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="147">
+              <caret line="44" column="123" lean-forward="true" selection-start-line="44" selection-start-column="123" selection-end-line="44" selection-end-column="123" />
             </state>
           </provider>
         </entry>
@@ -176,6 +148,7 @@
         <option value="$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java" />
         <option value="$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java" />
         <option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java" />
+        <option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryRegisterTest.java" />
       </list>
     </option>
   </component>
@@ -196,7 +169,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
@@ -407,12 +379,13 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552592496675" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552598554961" />
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -422,6 +395,9 @@
     <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
   </component>
   <component name="RecentsManager">
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="blockchain.query" />
+    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="D:\Group Project\java-api\msp\AdminFiles\admin" />
     </key>
@@ -438,7 +414,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.QueryTest">
+  <component name="RunManager" selected="JUnit.QueryRegisterTest">
     <configuration default="true" type="Application" factoryName="Application">
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <method v="2">
@@ -460,6 +436,21 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="QueryRegisterTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="java-api" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="blockchain.query.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="blockchain.query" />
+      <option name="MAIN_CLASS_NAME" value="blockchain.query.QueryRegisterTest" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="QueryTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="java-api" />
       <extension name="coverage">
@@ -475,21 +466,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="ReadUserTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="java-api" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="blockchain.utility.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="blockchain.utility" />
-      <option name="MAIN_CLASS_NAME" value="blockchain.utility.ReadUserTest" />
-      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="TestEnrollAdmin" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="java-api" />
       <extension name="coverage">
@@ -547,15 +523,15 @@
       <item itemvalue="JUnit.TestRegisterEnrollUser" />
       <item itemvalue="JUnit.TestEnrollAdmin" />
       <item itemvalue="JUnit.QueryChannelTest" />
-      <item itemvalue="JUnit.ReadUserTest" />
+      <item itemvalue="JUnit.QueryRegisterTest" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.QueryRegisterTest" />
         <item itemvalue="JUnit.QueryTest" />
         <item itemvalue="JUnit.TestEnrollAdmin" />
         <item itemvalue="JUnit.QueryChannelTest" />
         <item itemvalue="JUnit.TestRegisterEnrollUser" />
-        <item itemvalue="JUnit.ReadUserTest" />
       </list>
     </recent_temporary>
   </component>
@@ -598,19 +574,11 @@
       <workItem from="1551295665994" duration="704000" />
       <workItem from="1552248848133" duration="108000" />
       <workItem from="1552592166048" duration="379000" />
+      <workItem from="1552597573100" duration="981000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="QueryTest - 2019.02.26 at 19h 53m 12s.xml">
-      <configuration name="QueryTest" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="QueryChannelTest - 2019.02.26 at 19h 53m 28s.xml">
-      <configuration name="QueryChannelTest" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="QueryTest - 2019.02.26 at 19h 53m 38s.xml">
-      <configuration name="QueryTest" configurationId="JUnit" />
-    </history-entry>
     <history-entry file="QueryChannelTest - 2019.02.26 at 19h 54m 09s.xml">
       <configuration name="QueryChannelTest" configurationId="JUnit" />
     </history-entry>
@@ -632,14 +600,23 @@
     <history-entry file="QueryTest - 2019.03.14 at 20h 41m 41s.xml">
       <configuration name="QueryTest" configurationId="JUnit" />
     </history-entry>
+    <history-entry file="QueryRegisterTest - 2019.03.14 at 22h 11m 03s.xml">
+      <configuration name="QueryRegisterTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="QueryTest - 2019.03.14 at 22h 11m 39s.xml">
+      <configuration name="QueryTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="QueryRegisterTest - 2019.03.14 at 22h 12m 09s.xml">
+      <configuration name="QueryRegisterTest" configurationId="JUnit" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="43473000" />
+    <option name="totallyTimeSpent" value="44454000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="2576" height="1416" extended-state="6" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2810016" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.28338632" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -650,7 +627,7 @@
       <window_info id="Capture Tool" order="8" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.83942765" weight="0.5210608" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.8390302" weight="0.5210608" />
       <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.71510416" weight="0.3995749" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -659,7 +636,7 @@
       <window_info anchor="bottom" id="Messages" order="8" />
       <window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="10" />
-      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.16057234" side_tool="true" visible="true" weight="0.5210608" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.1609698" side_tool="true" visible="true" weight="0.5210608" />
       <window_info anchor="bottom" id="Spring" order="12" />
       <window_info anchor="bottom" id="Java Enterprise" order="13" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -685,7 +662,7 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java</url>
-          <line>37</line>
+          <line>38</line>
           <properties />
           <option name="timeStamp" value="1" />
         </line-breakpoint>
@@ -875,13 +852,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/ChaincodeTransactionTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="578">
-          <caret line="50" selection-start-line="50" selection-end-line="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/org/hyperledger/fabric-sdk-java/fabric-sdk-java/1.2.1/fabric-sdk-java-1.2.1.jar!/org/hyperledger/fabric/sdk/HFClient.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="17">
@@ -891,18 +861,11 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="575">
+        <state relative-caret-position="629">
           <caret line="37" column="64" selection-start-line="37" selection-start-column="64" selection-end-line="37" selection-end-column="64" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="26" column="63" selection-start-line="26" selection-start-column="63" selection-end-line="26" selection-end-column="63" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestEnrollAdmin.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="357">
@@ -938,10 +901,31 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="391">
+          <caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="425">
-          <caret line="35" column="37" selection-start-line="35" selection-start-column="37" selection-end-line="35" selection-end-column="37" />
+        <state relative-caret-position="442">
+          <caret line="36" column="40" selection-start-line="36" selection-start-column="40" selection-end-line="36" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/ChaincodeTransactionTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="44" column="123" lean-forward="true" selection-start-line="44" selection-start-column="123" selection-end-line="44" selection-end-column="123" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryRegisterTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="28" column="47" selection-start-line="28" selection-start-column="47" selection-end-line="28" selection-end-column="47" />
         </state>
       </provider>
     </entry>
diff --git a/src/test/java/blockchain/query/QueryRegisterTest.java b/src/test/java/blockchain/query/QueryRegisterTest.java
new file mode 100644
index 0000000..bc187cf
--- /dev/null
+++ b/src/test/java/blockchain/query/QueryRegisterTest.java
@@ -0,0 +1,53 @@
+package blockchain.query;
+
+import blockchain.client.ChannelClientWrapper;
+import blockchain.client.FabricClientWrapper;
+import blockchain.configuration.Config;
+import blockchain.user.UserContext;
+import blockchain.utility.Util;
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.Logger;
+import org.hyperledger.fabric.sdk.ChaincodeResponse;
+import org.hyperledger.fabric.sdk.ProposalResponse;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.util.Collection;
+
+
+//Test to get balance of a User
+@Ignore
+public class QueryRegisterTest {
+    private static Logger logger = Logger.getLogger(QueryRegisterTest.class);
+
+    @Test
+    public void TestAQueryChannels() {
+        BasicConfigurator.configure();
+
+        //UserContext user = Util.readUserContext(Config.ORG1,Config.ADMIN);
+        UserContext user = Util.readUserContext(Config.ORG1,"admin");
+        //TODO BASE ON ChaincodeTransactionTest
+        try{
+            String chaincode = Config.CHAINCODE_NAME;
+            FabricClientWrapper fabricClientWrapper = new FabricClientWrapper(user);
+
+            ChannelClientWrapper channelClientWrapper = ChannelClientWrapper.setupChannel(fabricClientWrapper);
+
+
+            String[] args1 = {"user_test","100"};
+
+            Collection<ProposalResponse> responseQuery = channelClientWrapper.queryByChainCode(chaincode,"register",args1);
+            for(ProposalResponse pres : responseQuery){
+                ChaincodeResponse.Status status = pres.getStatus();
+                if(status.getStatus()!=200){
+                    throw new Exception(pres.getMessage());
+                }
+                String stringResponse = new String(pres.getChaincodeActionResponsePayload());
+                logger.info("RESPONSE : "+stringResponse);
+            }
+
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/src/test/java/blockchain/query/QueryTest.java b/src/test/java/blockchain/query/QueryTest.java
index f1b6af0..4dc7982 100644
--- a/src/test/java/blockchain/query/QueryTest.java
+++ b/src/test/java/blockchain/query/QueryTest.java
@@ -33,7 +33,8 @@ public class QueryTest {
 
             //String[] args1 = {"a"};
             //String[] args1 = {"chef"};
-            String[] args1 = {"bitman"};
+            //String[] args1 = {"bitman"};
+            String[] args1 = {"user_test"};
 
             Collection<ProposalResponse> responseQuery = channelClientWrapper.queryByChainCode(chaincode,"query",args1);
             for(ProposalResponse pres : responseQuery){