diff --git a/src/test/java/hibernateTest/entities/User.java b/src/test/java/hibernateTest/entities/User.java
index 43f6644..bfa0d39 100644
--- a/src/test/java/hibernateTest/entities/User.java
+++ b/src/test/java/hibernateTest/entities/User.java
@@ -11,6 +11,7 @@
}
+
public User(String name, String uId,String uri,String pw,String iconUri) {
setuId(uId);
setUri(uri);
diff --git a/src/test/java/hibernateTest/models/Users.java b/src/test/java/hibernateTest/models/Users.java
index e3edc3d..09ccffc 100644
--- a/src/test/java/hibernateTest/models/Users.java
+++ b/src/test/java/hibernateTest/models/Users.java
@@ -63,8 +63,9 @@
public static String createToken(String uId) {
//Tokenを作成しuIdと関連付けしDBに保存し作成したTokenを返す
- String token = UUID.randomUUID().toString();
- return token;
+ //String token = UUID.randomUUID().toString();
+ //return token;
+ return null;
}
public static String createUId() {
@@ -78,7 +79,7 @@
Session session = sessionFactory.openSession();
session.beginTransaction();
//名前、パスワード、アイコンイメージを保存
- User testUser = new User("test",getInstance().createUId(), "http://test.com","testpw","http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg");
+ User testUser = new User(name,getInstance().createUId(), "http://test.com",pw,iconImage);
System.out.println(testUser.getUri());
session.save(testUser);
//hibernateテスト出力用
@@ -99,7 +100,7 @@
Session session = sessionFactory.openSession();
session.beginTransaction();
- User testUser = new User("test",getInstance().createUId(), "http://test.com", "testpw", "http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg");
+ User testUser = new User(name,uId,"http://test.com",pw,iconImage);
Criteria criteria = session.createCriteria(Request.class).add(Restrictions.eq("rId", "333"));
Request editRequest = (Request) criteria.uniqueResult();
if(editRequest != null) {
@@ -162,9 +163,10 @@
}
public static Token login(String uId) {
- Token testtoken = new Token(getInstance().createToken(uId));
+ //Token testtoken = new Token(getInstance().createToken(uId));
//tokenを作成後値を返す
- return testtoken;//testToken
+ //return testtoken;//testToken
+ return null;
}
public static DeleteResult logout(String token) {
diff --git a/src/test/java/hibernateTest/models/UsersMain.java b/src/test/java/hibernateTest/models/UsersMain.java
index 7fd848e..3a2b42f 100644
--- a/src/test/java/hibernateTest/models/UsersMain.java
+++ b/src/test/java/hibernateTest/models/UsersMain.java
@@ -6,8 +6,9 @@
public class UsersMain {
public static void main(String args[]){
Users.setUp();
- Users.createUser("test","1234","http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg");
- Users.getUserById("1234");
+ Users.createUser("test1","test1","http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg");
+ Users.createUser("test2","test2","http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg");
+ Users.getUserById("testId");
Users.tearDown();
}
}
diff --git a/src/test/resources/hibernate.cfg.xml b/src/test/resources/hibernate.cfg.xml
index f590b6b..34f57fb 100644
--- a/src/test/resources/hibernate.cfg.xml
+++ b/src/test/resources/hibernate.cfg.xml
@@ -35,10 +35,10 @@
create
+
-
\ No newline at end of file