From ef9863a8be9508c40d70e3aba7ece8ed53ea2825 Mon Sep 17 00:00:00 2001 From: GME Date: Wed, 3 Apr 2019 17:32:49 +0200 Subject: [PATCH] test, fix and improve code Test UserImplementation (OK) Test SessionImplementation (OK) Test WalletImplmeentation - must correct queryWalletByOwner, setSoldOnWallet in chaincode --- sql/sequence_session_script.sql | 6 +- sql/sequence_wallet_script.sql | 6 +- sql/table_session_script.sql | 4 +- .../java/blockchain/configuration/Config.java | 2 +- .../java/blockchain/query/QueryWrapper.java | 1 + src/main/java/database/DatabaseHelper.java | 4 +- src/main/java/database/Wallet/Wallet.java | 4 +- src/main/java/database/Wallet/WalletDao.java | 4 +- src/main/java/database/session/Session.java | 4 +- .../java/database/session/SessionDao.java | 13 ++- .../SessionImplementation.java | 15 ++- .../WalletImplementation.java | 27 +++-- src/main/java/restService/WalletResource.java | 8 +- .../blockchain/query/User/DeleteUserTest.java | 2 +- .../blockchain/query/User/ReadUserTest.java | 2 +- .../query/Wallet/QueryWalletByOwnerTest.java | 3 +- .../query/Wallet/QueryWalletHistory.java | 2 +- .../query/Wallet/ReadWalletTest.java | 8 +- .../SessionImplementationTest.java | 40 ++++++++ .../UserImplementationTest.java | 61 +++++++----- .../WalletImplementationTest.java | 98 ++++++++++++++++++- 21 files changed, 240 insertions(+), 74 deletions(-) create mode 100644 src/test/java/restImplementation/SessionImplementationTest.java diff --git a/sql/sequence_session_script.sql b/sql/sequence_session_script.sql index ff80c48..91173a2 100644 --- a/sql/sequence_session_script.sql +++ b/sql/sequence_session_script.sql @@ -1,8 +1,8 @@ --- SEQUENCE: public."T_SESSION_session_id_seq" +-- SEQUENCE: public."session_id_seq" --- DROP SEQUENCE public."T_SESSION_session_id_seq"; +-- DROP SEQUENCE public."session_id_seq"; CREATE SEQUENCE public."t_session_id_seq"; ALTER SEQUENCE public."t_session_id_seq" - OWNER TO postgres; \ No newline at end of file + OWNER TO monnethicadmin; \ No newline at end of file diff --git a/sql/sequence_wallet_script.sql b/sql/sequence_wallet_script.sql index c549d4f..c22a683 100644 --- a/sql/sequence_wallet_script.sql +++ b/sql/sequence_wallet_script.sql @@ -1,8 +1,8 @@ --- SEQUENCE: public."T_WALLET_wallet_id_seq" +-- SEQUENCE: public."t_wallet_id_seq" --- DROP SEQUENCE public."T_WALLET_wallet_id_seq"; +-- DROP SEQUENCE public."t_wallet_id_seq"; CREATE SEQUENCE public."t_wallet_id_seq"; -ALTER SEQUENCE public."t__wallet_id_seq" +ALTER SEQUENCE public."t_wallet_id_seq" OWNER TO monnethicadmin; \ No newline at end of file diff --git a/sql/table_session_script.sql b/sql/table_session_script.sql index c783284..ed0ee83 100644 --- a/sql/table_session_script.sql +++ b/sql/table_session_script.sql @@ -7,7 +7,7 @@ CREATE TABLE public."T_SESSION" session_id integer NOT NULL DEFAULT nextval('"t_session_id_seq"'::regclass), user_id bigint NOT NULL, start_session bigint NOT NULL, - end_session bigint NOT NULL, + end_session bigint, CONSTRAINT "T_SESSION_pkey" PRIMARY KEY (session_id) ) WITH ( @@ -16,4 +16,4 @@ WITH ( TABLESPACE pg_default; ALTER TABLE public."T_SESSION" - OWNER to postgres; \ No newline at end of file + OWNER to monnethicadmin; \ No newline at end of file diff --git a/src/main/java/blockchain/configuration/Config.java b/src/main/java/blockchain/configuration/Config.java index 01a7deb..45dd2ca 100644 --- a/src/main/java/blockchain/configuration/Config.java +++ b/src/main/java/blockchain/configuration/Config.java @@ -36,7 +36,7 @@ public class Config { public static final String CHANNEL_NAME = "mychannel"; //public static final String CHAINCODE_NAME = "mycc"; - public static final String CHAINCODE_NAME = "monnethic"; + public static final String CHAINCODE_NAME = "monnethic_2"; //public static final String CHAINCODE_NAME = "monnethic-dev-4"; public static final String CHAINCODE_PROD = "monnethic-prod"; diff --git a/src/main/java/blockchain/query/QueryWrapper.java b/src/main/java/blockchain/query/QueryWrapper.java index 720e752..f9c0fe0 100644 --- a/src/main/java/blockchain/query/QueryWrapper.java +++ b/src/main/java/blockchain/query/QueryWrapper.java @@ -30,6 +30,7 @@ public class QueryWrapper { queryByChaincodeRequest.setArgs(args); queryByChaincodeRequest.setFcn(functionName); queryByChaincodeRequest.setChaincodeID(chaincodeID); + queryByChaincodeRequest.setProposalWaitTime(12000); Collection queryProposals; diff --git a/src/main/java/database/DatabaseHelper.java b/src/main/java/database/DatabaseHelper.java index 1170f2f..48101f2 100644 --- a/src/main/java/database/DatabaseHelper.java +++ b/src/main/java/database/DatabaseHelper.java @@ -4,10 +4,8 @@ import com.j256.ormlite.jdbc.JdbcConnectionSource; import com.j256.ormlite.support.ConnectionSource; public class DatabaseHelper { - private static final String DATABASE_NAME = "monnethic"; - //private static final String DATABASE_USER = "postgres"; + private static final String DATABASE_NAME = "monnethic_test"; private static final String DATABASE_USER = "monnethicadmin"; - //private static final String DATABASE_PWD = "L-*q~Ytaha{;u+7yJ8"; private static final String DATABASE_PWD = "vHEQszGXcJ6;/)}z!V"; private final static String DATABASE_URL = "jdbc:postgresql://37.187.101.44:5432/"+DATABASE_NAME; diff --git a/src/main/java/database/Wallet/Wallet.java b/src/main/java/database/Wallet/Wallet.java index ef526b9..05c6ed8 100644 --- a/src/main/java/database/Wallet/Wallet.java +++ b/src/main/java/database/Wallet/Wallet.java @@ -6,7 +6,7 @@ import com.j256.ormlite.table.DatabaseTable; @DatabaseTable(tableName = "T_WALLET") public class Wallet { - @DatabaseField(canBeNull = false) + @DatabaseField(generatedId = true) private int wallet_id; @DatabaseField(canBeNull = false) private String wallet_hash; @@ -80,7 +80,7 @@ public class Wallet { public Double getBalance() { return balance; } - public void setBalance(Double sold) { + public void setBalance(Double balance) { this.balance = balance; } diff --git a/src/main/java/database/Wallet/WalletDao.java b/src/main/java/database/Wallet/WalletDao.java index ed87983..b064b77 100644 --- a/src/main/java/database/Wallet/WalletDao.java +++ b/src/main/java/database/Wallet/WalletDao.java @@ -69,13 +69,13 @@ public class WalletDao { updateBuilder.update(); } - public void deleteWallet(String walletHash) throws Exception{ + public void deleteWallet(String walletHash, String userHash) throws Exception{ walletDao = createWalletDaoConnection(); UpdateBuilder updateBuilder = walletDao.updateBuilder(); updateBuilder.updateColumnValue("is_active",false); Timestamp timestamp = new Timestamp(System.currentTimeMillis()); updateBuilder.updateColumnValue("modification_date",timestamp.getTime()); - updateBuilder.where().eq("walletHash",walletHash); + updateBuilder.where().eq("wallet_hash",walletHash).and().eq("user_hash",userHash); updateBuilder.update(); } diff --git a/src/main/java/database/session/Session.java b/src/main/java/database/session/Session.java index 0e05d10..4209f87 100644 --- a/src/main/java/database/session/Session.java +++ b/src/main/java/database/session/Session.java @@ -1,7 +1,9 @@ package database.session; import com.j256.ormlite.field.DatabaseField; +import com.j256.ormlite.table.DatabaseTable; +@DatabaseTable(tableName = "T_SESSION") public class Session { @DatabaseField(generatedId = true) private int session_id; @@ -9,7 +11,7 @@ public class Session { private int user_id; @DatabaseField(canBeNull = false) private long start_session; - @DatabaseField(canBeNull = false) + @DatabaseField private long end_session; public Session(){} diff --git a/src/main/java/database/session/SessionDao.java b/src/main/java/database/session/SessionDao.java index da1ef76..e415d0d 100644 --- a/src/main/java/database/session/SessionDao.java +++ b/src/main/java/database/session/SessionDao.java @@ -4,8 +4,7 @@ import com.j256.ormlite.dao.Dao; import com.j256.ormlite.dao.DaoManager; import com.j256.ormlite.stmt.UpdateBuilder; import database.DatabaseHelper; - -import java.sql.Timestamp; +import java.time.Instant; public class SessionDao { private DatabaseHelper dbh = new DatabaseHelper(); @@ -20,17 +19,17 @@ public class SessionDao { } } - public int setStartSession(int userId) throws Exception { + public int setStartSession(Session session) throws Exception { sessionDao = createSessionDaoConnection(); - Timestamp timestamp = new Timestamp(System.currentTimeMillis()); - return sessionDao.updateRaw("INSERT INTO T_SESSION (user_id,start_session) VALUES ("+userId+","+timestamp+") RETURNING session_id"); + sessionDao.create(session); + return session.getSession_id(); } public void setEndSession(int session_id) throws Exception { sessionDao = createSessionDaoConnection(); UpdateBuilder updateBuilder = sessionDao.updateBuilder(); - Timestamp timestamp = new Timestamp(System.currentTimeMillis()); - updateBuilder.updateColumnValue("end_session",timestamp); + long now = Instant.now().toEpochMilli(); + updateBuilder.updateColumnValue("end_session",now); updateBuilder.where().eq("session_id",session_id); updateBuilder.update(); } diff --git a/src/main/java/restImplementation/SessionImplementation.java b/src/main/java/restImplementation/SessionImplementation.java index 9e7d787..607ff63 100644 --- a/src/main/java/restImplementation/SessionImplementation.java +++ b/src/main/java/restImplementation/SessionImplementation.java @@ -1,18 +1,27 @@ package restImplementation; +import database.session.Session; import database.session.SessionDao; +import java.time.Instant; + public class SessionImplementation { public int startSession(String userHash, String userEmail) throws Exception { SessionDao sessionDao = new SessionDao(); UserImplementation userImplementation = new UserImplementation(); int userId = userImplementation.getUserId(userHash,userEmail); - return sessionDao.setStartSession(userId); + + Session session = new Session(); + session.setUser_id(userId); + long now = Instant.now().toEpochMilli(); + session.setStart_session(now); + + return sessionDao.setStartSession(session); } - public void endSession(int userId) throws Exception { + public void endSession(int sessionId) throws Exception { SessionDao sessionDao = new SessionDao(); - sessionDao.setEndSession(userId); + sessionDao.setEndSession(sessionId); } } diff --git a/src/main/java/restImplementation/WalletImplementation.java b/src/main/java/restImplementation/WalletImplementation.java index fd6b149..adc72b9 100644 --- a/src/main/java/restImplementation/WalletImplementation.java +++ b/src/main/java/restImplementation/WalletImplementation.java @@ -37,6 +37,7 @@ public class WalletImplementation { wallet.setCreation_date(now); wallet.setModification_date(now); + walletDao.addWallet(wallet); // add wallet to replica DB response.put("walletHash",wallet.getWallet_hash()); @@ -77,18 +78,24 @@ public class WalletImplementation { return wallet; } - //setSold - public void setSoldToWallet(String walletHash, double balance) throws Exception { + //setBalance + public void setBalanceToWallet(String walletHash, double amount) throws Exception { + double newBalance = 0.0; TransactionWrapper transactionWrapper = new TransactionWrapper(); - transactionWrapper.sendTransaction("setSoldOnWallet",new String[]{walletHash,String.valueOf(balance)}); + transactionWrapper.sendTransaction("setSoldOnWallet",new String[]{walletHash,String.valueOf(amount)}); + + + Wallet wallet = getWallet(walletHash); + if(wallet!=null){ + newBalance=wallet.getBalance(); + WalletDao walletDao = new WalletDao(); + walletDao.updateWalletBalance(walletHash,newBalance); + } else { + throw new Exception("ERROR QUERY WALLET"); + } - WalletDao walletDao = new WalletDao(); - walletDao.updateWalletBalance(walletHash,balance); } - //addMoney - //TODO - //transfer public void transferWallet(String walletHash, String newUserHash) throws Exception { TransactionWrapper transactionWrapper = new TransactionWrapper(); @@ -100,12 +107,12 @@ public class WalletImplementation { //delete - public void deleteWallet(String walletHash) throws Exception { + public void deleteWallet(String walletHash, String userHash) throws Exception { TransactionWrapper transactionWrapper = new TransactionWrapper(); transactionWrapper.sendTransaction("deleteWallet",new String[]{walletHash}); WalletDao walletDao = new WalletDao(); - walletDao.deleteWallet(walletHash); + walletDao.deleteWallet(walletHash,userHash); } diff --git a/src/main/java/restService/WalletResource.java b/src/main/java/restService/WalletResource.java index 1f9b4cb..ad5b4d1 100644 --- a/src/main/java/restService/WalletResource.java +++ b/src/main/java/restService/WalletResource.java @@ -76,7 +76,7 @@ public class WalletResource { public ResponseEntity setBalance(@RequestBody Wallet wallet){ WalletImplementation walletImplementation = new WalletImplementation(); try{ - walletImplementation.setSoldToWallet(wallet.getWallet_hash(),wallet.getBalance()); + walletImplementation.setBalanceToWallet(wallet.getWallet_hash(),wallet.getBalance()); return ResponseEntity.status(HttpStatus.OK).body("{\"response\":\"ok\"}"); } catch (Exception e){ StringResponse responseS = new StringResponse(e.getMessage()); @@ -99,11 +99,11 @@ public class WalletResource { } - @RequestMapping(value = "/delete/{walletHash}", method = RequestMethod.DELETE) - public ResponseEntity deleteWallet(@PathVariable("walletHash") String walletHash){ + @RequestMapping(value = "/{userHash}/delete/{walletHash}", method = RequestMethod.DELETE) + public ResponseEntity deleteWallet(@PathVariable("walletHash") String walletHash, @PathVariable("userHash") String userHash){ WalletImplementation walletImplementation = new WalletImplementation(); try{ - walletImplementation.deleteWallet(walletHash); + walletImplementation.deleteWallet(walletHash,userHash); return ResponseEntity.status(HttpStatus.OK).body("{\"response\":\"ok\"}"); }catch (Exception e){ StringResponse responseS = new StringResponse(e.getMessage()); diff --git a/src/test/java/blockchain/query/User/DeleteUserTest.java b/src/test/java/blockchain/query/User/DeleteUserTest.java index 7260f4e..715704e 100644 --- a/src/test/java/blockchain/query/User/DeleteUserTest.java +++ b/src/test/java/blockchain/query/User/DeleteUserTest.java @@ -19,7 +19,7 @@ public class DeleteUserTest { try{ TransactionWrapper transactionWrapper = new TransactionWrapper(); String functionName = "deleteUser"; - String[] args = new String[]{"$2a$10$04YjBhcKPG.DD8abC/AnhOwTIbYH1x0Gr78XXVhAd6551c3Cb21i2"}; + String[] args = new String[]{"$2a$10$tpC8fILKiQqyApJ8/jTPE.YX0grzZsEtmWUyJAidmHOuWGQ4FBdfy"}; BlockEvent.TransactionEvent responseEvent = transactionWrapper.sendTransaction(functionName,args); logger.info("Event transaction id : "+responseEvent.getTransactionID()); //print transaction id }catch (Exception e){ diff --git a/src/test/java/blockchain/query/User/ReadUserTest.java b/src/test/java/blockchain/query/User/ReadUserTest.java index 5976b0b..09f93d6 100644 --- a/src/test/java/blockchain/query/User/ReadUserTest.java +++ b/src/test/java/blockchain/query/User/ReadUserTest.java @@ -22,7 +22,7 @@ public class ReadUserTest { try{ QueryWrapper queryWrapper = new QueryWrapper(); String functionName = "readUser"; - String[] args = new String[]{"$2a$10$tpC8fILKiQqyApJ8/jTPE.YX0grzZsEtmWUyJAidmHOuWGQ4FBdfy"}; + String[] args = new String[]{"$2a$10$tdkMwJ7BQSOXO2uofu/fEOlncUfuX7SsjB.2N9KVsXJUQiarAQzpG"}; String response = queryWrapper.sendQuery(functionName,args); if(response != null){ JsonReader reader = Json.createReader(new StringReader(response)); diff --git a/src/test/java/blockchain/query/Wallet/QueryWalletByOwnerTest.java b/src/test/java/blockchain/query/Wallet/QueryWalletByOwnerTest.java index 7757616..ce9c78e 100644 --- a/src/test/java/blockchain/query/Wallet/QueryWalletByOwnerTest.java +++ b/src/test/java/blockchain/query/Wallet/QueryWalletByOwnerTest.java @@ -24,8 +24,7 @@ public class QueryWalletByOwnerTest { try{ QueryWrapper queryWrapper = new QueryWrapper(); String functionName = "queryWalletsByOwner"; - //String[] args = new String[]{"usera"}; - String[] args = new String[]{"bitman"}; + String[] args = new String[]{"$2a$10$tdkMwJ7BQSOXO2uofu/fEOlncUfuX7SsjB.2N9KVsXJUQiarAQzpG"}; String response = queryWrapper.sendQuery(functionName,args); logger.info("response : "+response); diff --git a/src/test/java/blockchain/query/Wallet/QueryWalletHistory.java b/src/test/java/blockchain/query/Wallet/QueryWalletHistory.java index 2596dec..5d1dabe 100644 --- a/src/test/java/blockchain/query/Wallet/QueryWalletHistory.java +++ b/src/test/java/blockchain/query/Wallet/QueryWalletHistory.java @@ -18,7 +18,7 @@ public class QueryWalletHistory { try{ QueryWrapper queryWrapper = new QueryWrapper(); String functionName = "getHistoryForWallet"; - String[] args = new String[]{"qerh654d5f5hdsf1515"}; + String[] args = new String[]{"$2a$10$X2xW3CH/q7nij8yJpQTao.vEnuV31lNSMPhTCjGNl4oFp6MXW/6w6"}; String response = queryWrapper.sendQuery(functionName,args); logger.info("response : "+response); }catch (Exception e){ diff --git a/src/test/java/blockchain/query/Wallet/ReadWalletTest.java b/src/test/java/blockchain/query/Wallet/ReadWalletTest.java index fbc1907..cb3b79e 100644 --- a/src/test/java/blockchain/query/Wallet/ReadWalletTest.java +++ b/src/test/java/blockchain/query/Wallet/ReadWalletTest.java @@ -17,14 +17,14 @@ import java.io.StringReader; public class ReadWalletTest { private static Logger logger = Logger.getLogger(ReadWalletTest.class); - /* + @Test public void SuccessTestReadWalletTest() { BasicConfigurator.configure(); try{ QueryWrapper queryWrapper = new QueryWrapper(); String functionName = "readWallet"; - String[] args = new String[]{"qerh654d5f5h46q4fdh6h65fh00"}; + String[] args = new String[]{"$2a$10$PuJBO70uMfzUwbQ/Qz9kTe7JYJppwetyLyP0e6JAITr3B6pQf0cbe"}; String response = queryWrapper.sendQuery(functionName,args); if(response!=null){ @@ -40,8 +40,9 @@ public class ReadWalletTest { e.printStackTrace(); } } - */ + + /* @Test public void FailTestReadWalletTest() { BasicConfigurator.configure(); @@ -66,4 +67,5 @@ public class ReadWalletTest { e.printStackTrace(); } } + */ } diff --git a/src/test/java/restImplementation/SessionImplementationTest.java b/src/test/java/restImplementation/SessionImplementationTest.java new file mode 100644 index 0000000..7f9e91a --- /dev/null +++ b/src/test/java/restImplementation/SessionImplementationTest.java @@ -0,0 +1,40 @@ +package restImplementation; + +import org.apache.log4j.BasicConfigurator; +import org.apache.log4j.Logger; +import org.junit.Ignore; +import org.junit.Test; + +@Ignore +public class SessionImplementationTest { + private static Logger logger = Logger.getLogger(SessionImplementationTest.class); + + @Test + public void testAstartSession() { //OK + BasicConfigurator.configure(); + String userHash = "$2a$10$tdkMwJ7BQSOXO2uofu/fEOlncUfuX7SsjB.2N9KVsXJUQiarAQzpG"; + String userEmail = "TotoEmail@gmail.com"; + SessionImplementation sessionImplementation = new SessionImplementation(); + + try{ + int responseSessionId = sessionImplementation.startSession(userHash,userEmail); + logger.info("SESSION ID : "+responseSessionId); + } catch (Exception e){ + logger.warn("Error: "+e); + } + } + + + @Test + public void testBendSession(){ //OK + BasicConfigurator.configure(); + SessionImplementation sessionImplementation = new SessionImplementation(); + try{ + sessionImplementation.endSession(1); + } catch (Exception e){ + logger.warn("Error: "+e); + } + } + + +} diff --git a/src/test/java/restImplementation/UserImplementationTest.java b/src/test/java/restImplementation/UserImplementationTest.java index b711a0b..fb791bc 100644 --- a/src/test/java/restImplementation/UserImplementationTest.java +++ b/src/test/java/restImplementation/UserImplementationTest.java @@ -11,11 +11,14 @@ import java.util.Map; @Ignore public class UserImplementationTest { private static Logger logger = Logger.getLogger(UserImplementationTest.class); + String userHash1 = null; + String userHash2 = null; + /* @Test - public void RegisterUserWithoutPhone() { + public void RegisterUserWithoutPhone() { //OK BasicConfigurator.configure(); User userTest = new User("TotoName","TotoFirstName","TotoEmail@gmail.com","totoPassword1234$","gonette"); UserImplementation userImplementation = new UserImplementation(); @@ -25,17 +28,16 @@ public class UserImplementationTest { logger.info("response is: "+response.get("response")); if(Boolean.parseBoolean(response.get("response"))){ StringResponse responseS = new StringResponse("Ok",response.get("userHash")); + userHash1 = responseS.getUserHash(); logger.info("StringResponse is: "+responseS.getResponse()+". User hash: "+responseS.getUserHash()); } } catch (Exception e){ logger.warn("Error: "+e); } } - */ - /* @Test - public void RegisterUserWithPhone() { + public void RegisterUserWithPhone() { //OK BasicConfigurator.configure(); User userTest = new User("TataName","TataFirstName","TataEmail@gmail.com","tataPassword1234$","0607080900","gonette"); UserImplementation userImplementation = new UserImplementation(); @@ -45,6 +47,7 @@ public class UserImplementationTest { logger.info("response is: "+responseTest.get("response")); if(Boolean.parseBoolean(responseTest.get("response"))){ StringResponse responseS = new StringResponse("Ok",responseTest.get("userHash")); + userHash2 = responseS.getUserHash(); logger.info("StringResponse is: "+responseS.getResponse()+". User hash: "+responseS.getUserHash()); } }catch (Exception e){ @@ -52,9 +55,34 @@ public class UserImplementationTest { } } + @Test + public void approveUser1Test() { //ok + BasicConfigurator.configure(); + User userTest = new User("TotoEmail@gmail.com",userHash1); + UserImplementation userImplementation = new UserImplementation(); + try { + userImplementation.approveUser(userTest); + }catch (Exception e){ + logger.warn("Error: "+e); + } + } @Test - public void userLoggerTest(){ + public void approveUser2Test() { //ok + BasicConfigurator.configure(); + User userTest = new User("TataEmail@gmail.com",userHash2); + UserImplementation userImplementation = new UserImplementation(); + try { + userImplementation.approveUser(userTest); + }catch (Exception e){ + logger.warn("Error: "+e); + } + } + + + + @Test + public void userLoggerTest(){ //OK BasicConfigurator.configure(); User userTest = new User("TataName","TataFirstName","TataEmail@gmail.com","tataPassword1234$","0607080900","gonette"); UserImplementation userImplementation = new UserImplementation(); @@ -69,28 +97,13 @@ public class UserImplementationTest { } } - */ + @Test - public void approveUserTest() { + public void deleteUserTest(){ //OK BasicConfigurator.configure(); - User userTest = new User("TotoEmail@gmail.com","$2a$10$tpC8fILKiQqyApJ8/jTPE.YX0grzZsEtmWUyJAidmHOuWGQ4FBdfy"); - UserImplementation userImplementation = new UserImplementation(); - try { - userImplementation.approveUser(userTest); - }catch (Exception e){ - logger.warn("Error: "+e); - } - } - - /* - - - @Test - public void deleteUserTest(){ - BasicConfigurator.configure(); - User userTest = new User("TataEmail@gmail.com","$2a$10$N1C1lPeVMZ6oY4hSyX2cbuKBoGtJ0yWSXIgBaZ1RsI8QfaoTHCYi2"); + User userTest = new User("TotoEmail@gmail.com","$2a$10$AFlLoL3MpyILTmI4CAnVce8XYagrqkqQ9Be8pVAzadNDvexbBXZHm"); UserImplementation userImplementation = new UserImplementation(); try{ userImplementation.deleteUser(userTest); @@ -101,4 +114,6 @@ public class UserImplementationTest { */ + + } diff --git a/src/test/java/restImplementation/WalletImplementationTest.java b/src/test/java/restImplementation/WalletImplementationTest.java index d2f8667..391818a 100644 --- a/src/test/java/restImplementation/WalletImplementationTest.java +++ b/src/test/java/restImplementation/WalletImplementationTest.java @@ -12,10 +12,11 @@ import java.util.Map; public class WalletImplementationTest { private static Logger logger = Logger.getLogger(UserImplementationTest.class); + /* @Test - public void CreateWallet() { + public void UserACreateWallet() { // OK BasicConfigurator.configure(); - Wallet wallet = new Wallet("client","$2a$10$tpC8fILKiQqyApJ8/jTPE.YX0grzZsEtmWUyJAidmHOuWGQ4FBdfy"); + Wallet wallet = new Wallet("client","$2a$10$tdkMwJ7BQSOXO2uofu/fEOlncUfuX7SsjB.2N9KVsXJUQiarAQzpG"); WalletImplementation walletImplementation = new WalletImplementation(); try{ @@ -31,8 +32,101 @@ public class WalletImplementationTest { } catch (Exception e){ logger.warn("Error: "+e.getMessage()); } + } + */ + /* + @Test + public void UserBCreateWallet() { //OK + BasicConfigurator.configure(); + Wallet wallet = new Wallet("fournisseur","$2a$10$iMk/RWukka34xhF7drB7z.mb3YWbRh0qtunTpPXLbTBaZu2TxAOAW"); + + WalletImplementation walletImplementation = new WalletImplementation(); + try{ + Map walletResponse = walletImplementation.createWallet(wallet); + Wallet returnWallet = new Wallet(); + returnWallet.setWallet_hash(walletResponse.get("walletHash")); + returnWallet.setBalance(Double.parseDouble(walletResponse.get("walletSold"))); + returnWallet.setType(walletResponse.get("walletType")); + + logger.info("wallet hash: "+returnWallet.getWallet_hash()); + logger.info("wallet sold: "+returnWallet.getBalance()); + logger.info("wallet type: "+returnWallet.getType()); + } catch (Exception e){ + logger.warn("Error: "+e.getMessage()); + } + } + */ + + /* + @Test + public void UserB2CreateWallet() { //OK + BasicConfigurator.configure(); + Wallet wallet = new Wallet("client","$2a$10$iMk/RWukka34xhF7drB7z.mb3YWbRh0qtunTpPXLbTBaZu2TxAOAW"); + + WalletImplementation walletImplementation = new WalletImplementation(); + try{ + Map walletResponse = walletImplementation.createWallet(wallet); + Wallet returnWallet = new Wallet(); + returnWallet.setWallet_hash(walletResponse.get("walletHash")); + returnWallet.setBalance(Double.parseDouble(walletResponse.get("walletSold"))); + returnWallet.setType(walletResponse.get("walletType")); + + logger.info("wallet hash: "+returnWallet.getWallet_hash()); + logger.info("wallet sold: "+returnWallet.getBalance()); + logger.info("wallet type: "+returnWallet.getType()); + } catch (Exception e){ + logger.warn("Error: "+e.getMessage()); + } + } + */ + + /* + @Test + public void TestDeleteWallet() { //OK + BasicConfigurator.configure(); + WalletImplementation walletImplementation = new WalletImplementation(); + try{ + walletImplementation.deleteWallet("$2a$10$X2xW3CH/q7nij8yJpQTao.vEnuV31lNSMPhTCjGNl4oFp6MXW/6w6","$2a$10$iMk/RWukka34xhF7drB7z.mb3YWbRh0qtunTpPXLbTBaZu2TxAOAW"); + } catch (Exception e){ + logger.warn("Error: "+e.getMessage()); + } + } + */ + + + /* + @Test + public void TestGetWallet(){ //OK + BasicConfigurator.configure(); + WalletImplementation walletImplementation = new WalletImplementation(); + try{ + Wallet wallet = walletImplementation.getWallet("$2a$10$PuJBO70uMfzUwbQ/Qz9kTe7JYJppwetyLyP0e6JAITr3B6pQf0cbe"); + logger.info("Wallet hash : "+wallet.getWallet_hash()); + logger.info("Wallet owner : "+wallet.getUser_hash()); + logger.info("Wallet type : "+wallet.getType()); + logger.info("Wallet balance : "+wallet.getBalance()); + } catch (Exception e){ + logger.warn("Error: "+e.getMessage()); + } + } + */ + + + + @Test + public void TestSetBalance(){ //TODO + BasicConfigurator.configure(); + WalletImplementation walletImplementation = new WalletImplementation(); + try{ + walletImplementation.setBalanceToWallet("$2a$10$PuJBO70uMfzUwbQ/Qz9kTe7JYJppwetyLyP0e6JAITr3B6pQf0cbe",20.0); + } catch (Exception e){ + logger.warn("Error: "+e.getMessage()); + } } + + + }