From c281465c451ab1b1744cfb9fec3ff2b98c55c499 Mon Sep 17 00:00:00 2001
From: Callum Gran <callum.gran@gmail.com>
Date: Tue, 26 Apr 2022 13:50:03 +0200
Subject: [PATCH] fixed tests
---
src/main/java/edu/ntnu/idatt1002/k1g4/dao/TeamDAO.java | 10 +++++++++-
src/test/java/edu/ntnu/idatt1002/k1g4/TeamDAOTest.java | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/edu/ntnu/idatt1002/k1g4/dao/TeamDAO.java b/src/main/java/edu/ntnu/idatt1002/k1g4/dao/TeamDAO.java
index 0fb2e169..13313789 100644
--- a/src/main/java/edu/ntnu/idatt1002/k1g4/dao/TeamDAO.java
+++ b/src/main/java/edu/ntnu/idatt1002/k1g4/dao/TeamDAO.java
@@ -98,7 +98,15 @@ public class TeamDAO {
preparedStatement = connection.prepareStatement(sql);
preparedStatement.setString(1, name);
resultSet = preparedStatement.executeQuery();
- team = getTeamFromResultSet(resultSet);
+ try {
+ if (resultSet.next()) {
+ team = new Team();
+ team.setTeamId(resultSet.getInt("teamId"));
+ team.setName(resultSet.getString("teamName"));
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ }
} catch (SQLException e) {
e.printStackTrace();
} finally {
diff --git a/src/test/java/edu/ntnu/idatt1002/k1g4/TeamDAOTest.java b/src/test/java/edu/ntnu/idatt1002/k1g4/TeamDAOTest.java
index 8c201e02..24dffb29 100644
--- a/src/test/java/edu/ntnu/idatt1002/k1g4/TeamDAOTest.java
+++ b/src/test/java/edu/ntnu/idatt1002/k1g4/TeamDAOTest.java
@@ -39,7 +39,7 @@ public class TeamDAOTest {
@Test
public void testGetTeamByName() {
- Team team = teamDAO.getTeamByName("Jims Warriors", 1);
+ Team team = teamDAO.getTeamByName("Jims Warriors");
assertEquals("Jims Warriors", team.getName());
}
--
GitLab