Fix all broken unit tests

Author: hirokiterashima

pom.xml

@@ -502,13 +502,13 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>testcontainers</artifactId>
-      <version>1.20.6</version>
+      <version>2.0.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>junit-jupiter</artifactId>
-      <version>1.20.6</version>
+      <version>1.21.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/main/java/org/wise/portal/dao/peergroup/impl/HibernatePeerGroupDao.java

@@ -31,6 +31,7 @@
 import jakarta.persistence.TypedQuery;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Join;
 import jakarta.persistence.criteria.Predicate;
 import jakarta.persistence.criteria.Root;
 
@@ -103,8 +104,7 @@ public List<PeerGroup> getListByWorkgroup(Workgroup workgroup) {
     Root<WorkgroupImpl> workgroupImplRoot = cq.from(WorkgroupImpl.class);
     List<Predicate> predicates = new ArrayList<>();
     predicates.add(cb.equal(workgroupImplRoot.get("id"), workgroup.getId()));
-    predicates.add(cb.isMember(workgroupImplRoot.get("id"),
-        peerGroupImplRoot.<Set<Workgroup>> get("members")));
+    predicates.add(cb.isMember(workgroup, peerGroupImplRoot.<Set<Workgroup>> get("members")));
     cq.select(peerGroupImplRoot).where(predicates.toArray(new Predicate[predicates.size()]));
     TypedQuery<PeerGroupImpl> query = entityManager.createQuery(cq);
     List<PeerGroupImpl> resultList = query.getResultList();
@@ -117,13 +117,11 @@ public List<Workgroup> getWorkgroupsInPeerGroup(PeerGrouping peerGrouping, Group
     CriteriaBuilder cb = getCriteriaBuilder();
     CriteriaQuery<WorkgroupImpl> cq = cb.createQuery(WorkgroupImpl.class);
     Root<PeerGroupImpl> peerGroupImplRoot = cq.from(PeerGroupImpl.class);
-    Root<WorkgroupImpl> workgroupImplRoot = cq.from(WorkgroupImpl.class);
+    Join<PeerGroupImpl, WorkgroupImpl> membersJoin = peerGroupImplRoot.join("members");
     List<Predicate> predicates = new ArrayList<>();
-    predicates.add(cb.equal(peerGroupImplRoot.get("peerGrouping"), peerGrouping.getId()));
-    predicates.add(cb.equal(workgroupImplRoot.get("period"), period.getId()));
-    predicates.add(cb.isMember(workgroupImplRoot.get("id"),
-        peerGroupImplRoot.<Set<Workgroup>> get("members")));
-    cq.select(workgroupImplRoot).where(predicates.toArray(new Predicate[predicates.size()]));
+    predicates.add(cb.equal(peerGroupImplRoot.get("peerGrouping"), peerGrouping));
+    predicates.add(cb.equal(membersJoin.get("period"), period));
+    cq.select(membersJoin).where(predicates.toArray(new Predicate[predicates.size()]));
     TypedQuery<WorkgroupImpl> query = entityManager.createQuery(cq);
     List<WorkgroupImpl> resultList = query.getResultList();
     return (List<Workgroup>) (Object) resultList;

src/main/java/org/wise/portal/domain/workgroup/impl/WorkgroupImpl.java

@@ -35,6 +35,7 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.JoinTable;
 import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
@@ -75,15 +76,15 @@ public class WorkgroupImpl implements Workgroup, Comparable<WorkgroupImpl> {
   @Column(name = "OPTLOCK")
   private Integer version = null;
 
-  @OneToOne(targetEntity = RunImpl.class, fetch = FetchType.LAZY)
+  @ManyToOne(targetEntity = RunImpl.class, fetch = FetchType.LAZY)
   @JoinColumn(name = "run_fk", nullable = false)
   private Run run;
 
   @OneToOne(targetEntity = PersistentGroup.class, fetch = FetchType.LAZY)
   @JoinColumn(name = "group_fk", nullable = false)
   private Group group = new PersistentGroup();
 
-  @OneToOne(targetEntity = PersistentGroup.class, fetch = FetchType.LAZY)
+  @ManyToOne(targetEntity = PersistentGroup.class, fetch = FetchType.LAZY)
   @JoinColumn(name = "period")
   private Group period;
 

src/main/java/org/wise/portal/presentation/web/controllers/student/StudentAPIController.java

@@ -98,7 +98,7 @@ public class StudentAPIController extends UserAPIController {
   @Autowired
   private Properties i18nProperties;
 
-  @Value("${spring.security.oauth2.client.registration.google.client-id}")
+  @Value("${spring.security.oauth2.client.registration.google.client-id:}")
   private String googleClientId;
 
   @GetMapping("/runs")

src/main/java/org/wise/portal/presentation/web/controllers/teacher/GoogleClassroomAPIController.java

@@ -44,10 +44,10 @@ public class GoogleClassroomAPIController {
   @Autowired
   private UserDetailsService userDetailsService;
 
-  @Value("${spring.security.oauth2.client.registration.google.client-id}")
+  @Value("${spring.security.oauth2.client.registration.google.client-id:}")
   private String googleClientId;
 
-  @Value("${spring.security.oauth2.client.registration.google.client-secret}")
+  @Value("${spring.security.oauth2.client.registration.google.client-secret:}")
   private String googleClientSecret;
 
   @Value("${wise.name:}")

src/main/java/org/wise/portal/presentation/web/controllers/teacher/TeacherAPIController.java

@@ -58,10 +58,10 @@ public class TeacherAPIController extends UserAPIController {
   @Autowired
   private UserTagsService userTagsService;
 
-  @Value("${spring.security.oauth2.client.registration.google.client-id}")
+  @Value("${spring.security.oauth2.client.registration.google.client-id:}")
   private String googleClientId;
 
-  @Value("${spring.security.oauth2.client.registration.google.client-secret}")
+  @Value("${spring.security.oauth2.client.registration.google.client-secret:}")
   private String googleClientSecret;
 
   @GetMapping("/runs")

src/test/resources/application.properties

@@ -177,11 +177,12 @@ trustedAuthorAllowedProjectAssetContentTypes=text/html,application/javascript,ap
 
 ########## Optional Plugins ##########
 
-# OAuth2 Client Configuration for Google
-spring.security.oauth2.client.registration.google.client-id=
-spring.security.oauth2.client.registration.google.client-secret=
+# OAuth2 Client Configuration for Google (dummy values for tests)
+spring.security.oauth2.client.registration.google.client-id=test-client-id
+spring.security.oauth2.client.registration.google.client-secret=test-client-secret
 spring.security.oauth2.client.registration.google.scope=openid,email,profile
-spring.security.oauth2.client.registration.google.redirect-uri=
+spring.security.oauth2.client.registration.google.redirect-uri=http://localhost:8080/login/oauth2/code/google
+
 
 ### Discourse Single Sign-On ###
 # discourse_url: URL to your Discourse.