Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Team 5 - Smart Towns
Manage
Activity
Members
Labels
Plan
Issues
34
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Rhys Evans
Team 5 - Smart Towns
Commits
7dfc96a3
Commit
7dfc96a3
authored
1 year ago
by
Rhys Evans
Browse files
Options
Downloads
Patches
Plain Diff
further work
parent
2fa2e246
No related branches found
Branches containing commit
No related tags found
1 merge request
!34
Resolve "As a user, I would like a town specific page which shows all trails for that town so that I can easily see my progress"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/Team5/SmartTowns/Towns/TownController.java
+7
-1
7 additions, 1 deletion
src/main/java/Team5/SmartTowns/Towns/TownController.java
src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java
+14
-11
14 additions, 11 deletions
...est/java/Team5/SmartTowns/SmartTownsApplicationTests.java
with
21 additions
and
12 deletions
src/main/java/Team5/SmartTowns/Towns/TownController.java
+
7
−
1
View file @
7dfc96a3
...
...
@@ -41,7 +41,13 @@ public class TownController {
return
modelAndView
;
}
public
List
<
Location
>
filterByLocationForTrails
(
List
<
Location
>)
public
List
<
Location
>
filterByLocationForTrails
(
List
<
Location
>
locationList
,
String
town
){
List
<
Location
>
filteredList
;
for
(
location:
locationList
){
}
}
}
This diff is collapsed.
Click to expand it.
src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java
+
14
−
11
View file @
7dfc96a3
package
Team5.SmartTowns
;
import
Team5.SmartTowns.Data.Location
;
import
Team5.SmartTowns.Towns.TownController
;
import
org.junit.jupiter.api.BeforeAll
;
import
org.junit.jupiter.api.Test
;
...
...
@@ -14,23 +15,25 @@ class SmartTownsApplicationTests {
private
static
TownController
townController
;
@Autowired
private
Team5
.
SmartTowns
.
Data
.
locationRepository
locationRepository
;
private
Team5
.
SmartTowns
.
Data
.
Location
location
;
// @BeforeAll
// public static void before(){}
//
townController= new townController
();
//
location = new Location
();
//}
@Test
void
contextLoads
()
{
}
@Test
public
void
whenFilteringTownsByLocationsReturnOneTown
()
{
townController
.
filterByLocationForTrails
()
assertEquals
(,
townController
.
filterByLocationForTrails
);
}
//
@Test
//
public void whenFilteringTownsByLocationsReturnOneTown() {
//
//
townController.filterByLocationForTrails()
//
//
//
assertEquals(, townController.filterByLocationForTrails);
//
}
//
//
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment