Merge branch 'main' into...
Merge branch 'main' into 77-as-a-user-i-want-to-be-able-to-use-the-application-on-any-device-e-g-iphone-ipad-laptop # Conflicts: # src/test/resources/application.properties
Showing
- src/main/java/Team5/SmartTowns/users/UserRepositoryJDBC.java 5 additions, 2 deletionssrc/main/java/Team5/SmartTowns/users/UserRepositoryJDBC.java
- src/test/java/Team5/SmartTowns/DataSourceConfig.java 20 additions, 0 deletionssrc/test/java/Team5/SmartTowns/DataSourceConfig.java
- src/test/java/Team5/SmartTowns/testUsers.java 79 additions, 0 deletionssrc/test/java/Team5/SmartTowns/testUsers.java
- src/test/resources/application.properties 2 additions, 2 deletionssrc/test/resources/application.properties
- src/test/resources/schema-test.sql 110 additions, 0 deletionssrc/test/resources/schema-test.sql
- src/test/resources/test-data.sql 68 additions, 0 deletionssrc/test/resources/test-data.sql
Loading
Please register or sign in to comment