diff --git a/src/main/java/com/example/cosmos_serversb/models/Groups.java b/src/main/java/com/example/cosmos_serversb/models/Groups.java index 7be0ecd..924caed 100644 --- a/src/main/java/com/example/cosmos_serversb/models/Groups.java +++ b/src/main/java/com/example/cosmos_serversb/models/Groups.java @@ -19,33 +19,8 @@ private static String baseURI = "http://nitta-lab-www.is.konan-u.ac.jp/"; private static String AppName = "cosmos"; - public static void setUp() { - // A SessionFactory is set up once for an application! - final StandardServiceRegistry registry = new StandardServiceRegistryBuilder() - .configure() // configures settings from hibernate.cfg.xml - .build(); - try { - sessionFactory = new MetadataSources( registry ).buildMetadata().buildSessionFactory(); - } - catch (Exception e) { - // The registry would be destroyed by the SessionFactory, but we had trouble building the SessionFactory - // so destroy it manually. - StandardServiceRegistryBuilder.destroy( registry ); - } - } - - public static void tearDown() { - try { - if ( sessionFactory != null ) { - sessionFactory.close(); - } - } catch (Exception e) { - System.out.println("Exception!"); - } - } - private Groups(){ - setUp(); + sessionFactory = SessionFactoryManager.getInstance().getSessionFactory(); } public static Groups getInstance(){ diff --git a/src/main/java/com/example/cosmos_serversb/models/SessionFactoryManager.java b/src/main/java/com/example/cosmos_serversb/models/SessionFactoryManager.java index c0a0e56..965cb6a 100644 --- a/src/main/java/com/example/cosmos_serversb/models/SessionFactoryManager.java +++ b/src/main/java/com/example/cosmos_serversb/models/SessionFactoryManager.java @@ -49,4 +49,8 @@ } } + public static SessionFactory getSessionFactory(){ + return sessionFactory; + } + } diff --git a/src/test/java/hibernateTest/models/Groups.java b/src/test/java/hibernateTest/models/Groups.java index 3852f0c..a3f6d81 100644 --- a/src/test/java/hibernateTest/models/Groups.java +++ b/src/test/java/hibernateTest/models/Groups.java @@ -2,7 +2,6 @@ import hibernateTest.entities.Group; import hibernateTest.entities.Request; -import hibernateTest.entities.Event; import com.example.cosmos_serversb.models.DeleteResult; import org.hibernate.Session; import org.hibernate.SessionFactory; @@ -11,43 +10,23 @@ import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import javax.inject.Singleton; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.UUID; @Singleton public class Groups { private static Groups theInstance = null; + private static ArrayList groups = new ArrayList<>(); private static SessionFactory sessionFactory; - - public static void setUp() { - // A SessionFactory is set up once for an application! - final StandardServiceRegistry registry = new StandardServiceRegistryBuilder() - .configure() // configures settings from hibernate.cfg.xml - .build(); - try { - sessionFactory = new MetadataSources( registry ).buildMetadata().buildSessionFactory(); - } - catch (Exception e) { - // The registry would be destroyed by the SessionFactory, but we had trouble building the SessionFactory - // so destroy it manually. - StandardServiceRegistryBuilder.destroy( registry ); - } - } - - public static void tearDown() { - try { - if ( sessionFactory != null ) { - sessionFactory.close(); - } - } catch (Exception e) { - System.out.println("Exception!"); - } - } + private static String baseURI = "http://nitta-lab-www.is.konan-u.ac.jp/"; + private static String AppName = "cosmos"; private Groups(){ - + sessionFactory = SessionFactoryManager.getInstance().getSessionFactory(); } public static Groups getInstance(){ @@ -57,28 +36,32 @@ return theInstance; } + public static String createGId() { + //gIdを作成し既存していないかチェック後DBに保存し作成したgIdを返す + String gId = UUID.randomUUID().toString(); + return gId; + } + + public static String createRId() { + //rIdを作成し既存していないかチェック後DBに保存し作成したrIdを返す + String rId = UUID.randomUUID().toString(); + return rId; + } + public static HashMap getGroupsListByUid(String uId){ return createTestHashMap(); } public static Group createGroup(String name, String uId){ //先にGidとuriの発行を行う - Group testGroup = new Group("123456789", "http://test.com", name, uId); + String gId = getInstance().createGId(); + String uri = baseURI + AppName + "/groups/" + gId; + Group testGroup = new Group(gId, uri, name, uId); Session session = sessionFactory.openSession(); session.beginTransaction(); session.save(testGroup); session.getTransaction().commit(); session.close(); - - Session output = sessionFactory.openSession(); - output.beginTransaction(); - //hibernateテスト用出力 - List groupResult = output.createQuery( "from Group" ).list(); - for ( hibernateTest.entities.Group group : (List) groupResult ) { - System.out.println( "Group (" + group.getgId() + ") : " + group.getUri() + ": " + group.getName()); - } - output.getTransaction().commit(); - output.close(); return testGroup; } @@ -87,7 +70,7 @@ Session session = sessionFactory.openSession(); session.beginTransaction(); List groupResult = session.createQuery( "from Group" ).list(); - for ( hibernateTest.entities.Group group : (List) groupResult ) { + for ( Group group : (List) groupResult ) { editGroup = group; if (editGroup.getgId().equals(gId)) { session.getTransaction().commit(); @@ -127,8 +110,10 @@ public static Request addRequests(String gId, String uId, String product, String deadline, int location){ //テスト用 - Request testRequest = new Request("123456789", "http://test.com", "1999/01/01/15:00:00", - uId, product, "1999/01/01/15:00:00", 999); + String rId = getInstance().createRId(); + String uri = baseURI + AppName + "/groups/" + gId + "/requests/" + rId; + Request testRequest = new Request(rId, uri, "1999/01/01/15:00:00", + uId, product, "1999/01/01/15:00:00", 999); return testRequest; } @@ -139,8 +124,8 @@ public static Request updateRequest(String gId, String rId, String uId, String product, String deadline, int location, boolean done){ //テスト用 - Request testRequest = new Request("123456789", "http://test.com", "1999/01/01/15:00:00", - uId, product, "1999/01/01/15:00:00", 999); + Request testRequest = new Request(rId, "http://test.com", "1999/01/01/15:00:00", + uId, product, "1999/01/01/15:00:00", 999); return testRequest; } @@ -160,10 +145,9 @@ for (String key : TestMap.keySet()) { System.out.println(key + " " + TestMap.get(key)); } - */ + */ + return testMap; } - - -} +} \ No newline at end of file diff --git a/src/test/java/hibernateTest/models/SessionFactoryManager.java b/src/test/java/hibernateTest/models/SessionFactoryManager.java index 2cc5df9..afd6404 100644 --- a/src/test/java/hibernateTest/models/SessionFactoryManager.java +++ b/src/test/java/hibernateTest/models/SessionFactoryManager.java @@ -49,4 +49,8 @@ } } + public static SessionFactory getSessionFactory(){ + return sessionFactory; + } + }