mirror/gaps
1
0
Fork 0
mirror of https://github.com/JasonHHouse/gaps.git synced 2026-01-26 05:09:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Adding end to end testing

Browse Source
This commit is contained in:
jhouse
2020-01-16 11:13:15 +09:00
parent 9510c62045
commit 3186354c0a
10 changed files with 220 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/main/java/com/jasonhhouse/gaps/Movie.java
View File

@@ -117,13 +117,13 @@ public final class Movie implements Comparable<Movie>, MovieMetadata {
//Compare tvdb id first
if (tvdbId != -1 && tvdbId == movie.tvdbId) {
//System.out.println("Movie - tvdbId equals() true: " + tvdbId);
//LOGGER.info("Movie - tvdbId equals() true: " + tvdbId);
return true;
}
//Compare imdb id next
if (StringUtils.isNotEmpty(imdbId) && imdbId.equals(movie.imdbId)) {
//System.out.println("Movie - imdbId equals() true: " + imdbId);
//LOGGER.info("Movie - imdbId equals() true: " + imdbId);
return true;
}

4
Core/src/main/java/com/jasonhhouse/gaps/OwnedMovie.java
View File

@@ -99,13 +99,13 @@ public class OwnedMovie implements Comparable<OwnedMovie>, MovieMetadata {
//Compare tvdb id first
if (tvdbId != -1 && tvdbId == movie.tvdbId) {
//System.out.println("Movie - tvdbId equals() true: " + tvdbId);
//LOGGER.info("Movie - tvdbId equals() true: " + tvdbId);
return true;
}
//Compare imdb id next
if (StringUtils.isNotEmpty(imdbId) && imdbId.equals(movie.imdbId)) {
//System.out.println("Movie - imdbId equals() true: " + imdbId);
//LOGGER.info("Movie - imdbId equals() true: " + imdbId);
return true;
}

2
GapsWeb/pom.xml
View File

@@ -111,7 +111,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>28.1-jre</version>
<version>28.2-jre</version>
</dependency>
<dependency>

12
GapsWeb/src/main/java/com/jasonhhouse/gaps/service/GapsSearchService.java
View File

@@ -152,8 +152,8 @@ public class GapsSearchService implements GapsSearch {
watch.start();
searchForMovies();
watch.stop();
System.out.println("Time Elapsed: " + TimeUnit.MILLISECONDS.toSeconds(watch.getTime()) + " seconds.");
System.out.println("Times used TVDB ID: " + tempTvdbCounter);
LOGGER.info("Time Elapsed: " + TimeUnit.MILLISECONDS.toSeconds(watch.getTime()) + " seconds.");
LOGGER.info("Times used TVDB ID: " + tempTvdbCounter);
/*if (StringUtils.isNotEmpty(gaps.getMovieDbListId())) {
createTmdbList(sessionId);
@@ -177,14 +177,14 @@ public class GapsSearchService implements GapsSearch {
template.convertAndSend("/finishedSearching", true);
LOGGER.info("OWNED");
LOGGER.info("Owned");
for (OwnedMovie ownedMovie : ownedMovies) {
System.out.println(ownedMovie.toString());
LOGGER.info(ownedMovie.toString());;
}
LOGGER.info("RESULTS");
LOGGER.info("Recommended");
for (Movie movie : recommended) {
System.out.println(movie.toString());
LOGGER.info(movie.toString());
}
}

2
GapsWeb/src/main/resources/application.yaml
View File

@@ -24,7 +24,7 @@ logging:
level:
root: INFO
server:
port: 8484
port: 8443
compression:
enabled: true
mime-types: text/html,text/xml,text/plain,text/css,text/javascript,application/javascript,application/json

4
GapsWeb/src/main/resources/static/css/input.css
View File

@@ -24,4 +24,8 @@
.thumbnail {
max-width: 96px;
height: auto;
}
.bottom-margin {
margin-top: 16px;
}

2
GapsWeb/src/main/resources/static/css/input.min.css vendored
View File

@@ -1 +1 @@
.top-margin{margin-top:16px}.all-padding{padding:16px}.gaps-hide{display:none}.thumbnail{max-width:96px;height:auto}
.top-margin{margin-top:16px}.all-padding{padding:16px}.gaps-hide{display:none}.thumbnail{max-width:96px;height:auto}.bottom-margin{margin-top:16px}

10
GapsWeb/src/main/resources/templates/plexMovieList.html
View File

@@ -49,7 +49,7 @@
</ol>
</nav>
<div class="container">
<div class="container bottom-margin">
<div id="copiedToClipboard" class="alert alert-primary alert-dismissible fade show gaps-hide" role="alert">
Copied to Clipboard
@@ -64,11 +64,9 @@
<p id="searchDescription">Finding all movies in Plex</p>
</div>
<div id="progressContainer" class="top-margin">
<div class="progress">
<div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="75"
aria-valuemin="0" aria-valuemax="100" style="width: 100%"></div>
</div>
<div id="progressContainer" class="progress top-margin">
<div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="75"
aria-valuemin="0" aria-valuemax="100" style="width: 100%"></div>
</div>
<h3 class="top-margin">Missing Movies</h3>

192
Selenium/Mac/Gaps.side
View File

@@ -4,24 +4,24 @@
"name": "Gaps",
"url": "https://localhost:8443",
"tests": [{
"id": "1594f19c-c2ed-47db-91dd-278ea476e75d",
"name": "Gaps - Greg Movies",
"id": "23bb1956-3519-4666-abbb-0b913893354c",
"name": "Gaps - Greg Disney",
"commands": [{
"id": "0a8fceaf-89de-4a99-9088-9d3fd59c370f",
"id": "a5e165e8-a2ef-4fe8-a966-55c1a95b8152",
"comment": "",
"command": "open",
"target": "/",
"targets": [],
"value": ""
}, {
"id": "67d00276-f594-4ae1-a4a8-ab547c93840d",
"id": "f4466b74-de5e-4cff-94e7-65c62ad7a450",
"comment": "",
"command": "setWindowSize",
"target": "1680x1027",
"targets": [],
"value": ""
}, {
"id": "37c880ed-8d93-4ca1-9a41-94c1d105e0f1",
"id": "4e050040-8480-42a1-8956-fc2f6d89e71c",
"comment": "",
"command": "click",
"target": "id=plex",
@@ -35,7 +35,7 @@
],
"value": ""
}, {
"id": "c5c7e7bb-00d6-486b-9815-5e628560b4d4",
"id": "7a8d2995-0aac-4bf2-bd19-07c7f72ce312",
"comment": "",
"command": "click",
"target": "css=.btn-primary",
@@ -47,7 +47,7 @@
],
"value": ""
}, {
"id": "f1c82627-8ad7-46e5-9a02-d4045e02164a",
"id": "32c01a97-8465-4a4a-b04a-17798d2d99cd",
"comment": "",
"command": "click",
"target": "name=selectedLibraries",
@@ -59,7 +59,7 @@
],
"value": ""
}, {
"id": "8ea37f7f-2a8e-4930-91f0-e764b35acfc1",
"id": "f108b09e-8757-49a5-883d-27e68ed017d0",
"comment": "",
"command": "click",
"target": "css=.btn-primary",
@@ -70,6 +70,182 @@
["xpath=//button[contains(.,'Next')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "871957a6-8587-4c94-88ee-b8d9d638a2ce",
"comment": "",
"command": "waitForElementNotVisible",
"target": "id=progressContainer",
"targets": [],
"value": "100000"
}, {
"id": "41526ef6-e151-4725-aae9-dd17ebdc5cc6",
"comment": "Must show movies are found",
"command": "verifyText",
"target": "id=searchDescription",
"targets": [],
"value": "15 movies to add to complete your collections. Below is everything Gaps found that is missing from your movie collections."
}]
}, {
"id": "a2928b49-cc10-4348-9893-121a045a9de7",
"name": "Gaps - Greg RSS",
"commands": [{
"id": "71942413-a9b3-4641-ab74-686f84d0776c",
"comment": "",
"command": "open",
"target": "/",
"targets": [],
"value": ""
}, {
"id": "e9c8939d-46c1-476f-9d35-4b6d9005431d",
"comment": "",
"command": "setWindowSize",
"target": "1680x1027",
"targets": [],
"value": ""
}, {
"id": "e00edd4c-70ad-4f23-9bb3-fa5b905886f9",
"comment": "",
"command": "click",
"target": "css=body",
"targets": [
["css=body", "css:finder"],
["xpath=//body", "xpath:position"]
],
"value": ""
}, {
"id": "341aaa0a-0fff-4fa0-b376-5ac51570ffd4",
"comment": "",
"command": "click",
"target": "linkText=RSS",
"targets": [
["linkText=RSS", "linkText"],
["css=.nav-item:nth-child(3) > .nav-link", "css:finder"],
["xpath=//a[contains(text(),'RSS')]", "xpath:link"],
["xpath=//div[@id='navbarColor01']/ul/li[3]/a", "xpath:idRelative"],
["xpath=//a[contains(@href, '/rssCheck')]", "xpath:href"],
["xpath=//li[3]/a", "xpath:position"],
["xpath=//a[contains(.,'RSS')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "6ccf744f-e7bd-495a-9fa9-c9e914ea9b0f",
"comment": "",
"command": "click",
"target": "css=body",
"targets": [
["css=body", "css:finder"],
["xpath=//body", "xpath:position"]
],
"value": ""
}, {
"id": "dd2a72ca-a34c-4d02-8bf8-fd24d3cbb182",
"comment": "",
"command": "verifyText",
"target": "css=body",
"targets": [
["css=body", "css:finder"],
["xpath=//body", "xpath:position"]
],
"value": "[{\"imdb_id\":\"tt0113198\",\"release_date\":1995,\"tvdb_id\":15789,\"title\":\"A Goofy Movie\",\"poster_path\":\"\"},{\"imdb_id\":\"tt0118692\",\"release_date\":1997,\"tvdb_id\":13313,\"title\":\"Beauty and the Beast: The Enchanted Christmas\",\"poster_path\":\"\"},{\"imdb_id\":\"tt0167038\",\"release_date\":1998,\"tvdb_id\":20235,\"title\":\"Belle's Magical World\",\"poster_path\":\"\"},{\"imdb_id\":\"tt0401398\",\"release_date\":2005,\"tvdb_id\":13417,\"title\":\"Kronk's New Groove\",\"poster_path\":\"\"},{\"imdb_id\":\"tt0486761\",\"release_date\":2006,\"tvdb_id\":21316,\"title\":\"Leroy & Stitch\",\"poster_path\":\"\"},{\"imdb_id\":\"tt0457993\",\"release_date\":2005,\"tvdb_id\":20760,\"title\":\"Lilo & Stitch 2: Stitch Has a Glitch\",\"poster_path\":\"\"},{\"imdb_id\":\"tt5028340\",\"release_date\":2018,\"tvdb_id\":400650,\"title\":\"Mary Poppins Returns\",\"poster_path\":\"\"},{\"imdb_id\":\"tt0279967\",\"release_date\":2004,\"tvdb_id\":12242,\"title\":\"Mulan II\",\"poster_path\":\"\"},{\"imdb_id\":\"tt1623205\",\"release_date\":2013,\"tvdb_id\":68728,\"title\":\"Oz the Great and Powerful\",\"poster_path\":\"\"},{\"imdb_id\":\"tt0348124\",\"release_date\":2003,\"tvdb_id\":15567,\"title\":\"Stitch! The Movie\",\"poster_path\":\"\"},{\"imdb_id\":\"tt0313680\",\"release_date\":2002,\"tvdb_id\":13683,\"title\":\"Tarzan & Jane\",\"poster_path\":\"\"},{\"imdb_id\":\"tt0257778\",\"release_date\":2002,\"tvdb_id\":12448,\"title\":\"The Hunchback of Notre Dame II\",\"poster_path\":\"\"},{\"imdb_id\":\"tt0120131\",\"release_date\":1998,\"tvdb_id\":9732,\"title\":\"The Lion King II: Simba's Pride\",\"poster_path\":\"\"},{\"imdb_id\":\"tt0969647\",\"release_date\":2008,\"tvdb_id\":13676,\"title\":\"The Little Mermaid: Ariel's Beginning\",\"poster_path\":\"\"},{\"imdb_id\":\"tt0032138\",\"release_date\":1939,\"tvdb_id\":630,\"title\":\"The Wizard of Oz\",\"poster_path\":\"\"}]"
}]
}, {
"id": "550365ec-4dc1-4917-9647-904d29a15aac",
"name": "Gaps - Greg Recommended",
"commands": [{
"id": "d4511a68-6480-40a2-bf4f-6e535757109d",
"comment": "",
"command": "open",
"target": "/",
"targets": [],
"value": ""
}, {
"id": "d5c067cf-2478-4b3e-bb84-73da4726beeb",
"comment": "",
"command": "setWindowSize",
"target": "1680x1027",
"targets": [],
"value": ""
}, {
"id": "b84dcd48-1748-4286-b1d2-0632b1bc2a7d",
"comment": "",
"command": "click",
"target": "linkText=Recommended",
"targets": [
["linkText=Recommended", "linkText"],
["css=.nav-item:nth-child(2) > .nav-link", "css:finder"],
["xpath=//a[contains(text(),'Recommended')]", "xpath:link"],
["xpath=//div[@id='navbarColor01']/ul/li[2]/a", "xpath:idRelative"],
["xpath=//a[contains(@href, '/recommended')]", "xpath:href"],
["xpath=//li[2]/a", "xpath:position"],
["xpath=//a[contains(.,'Recommended')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "05cac5f3-a8d5-402a-84ba-d84aa93ac14f",
"comment": "",
"command": "verifyText",
"target": "id=movies_info",
"targets": [
["id=movies_info", "id"],
["css=#movies_info", "css:finder"],
["xpath=//div[@id='movies_info']", "xpath:attributes"],
["xpath=//div[@id='movies_wrapper']/div[3]", "xpath:idRelative"],
["xpath=//div/div[3]", "xpath:position"]
],
"value": "Showing 1 to 10 of 15 entries"
}]
}, {
"id": "1fd9abe4-7137-4073-8fc2-96dfdba28a0f",
"name": "Gaps - Greg Owned",
"commands": [{
"id": "c6aaa539-be7a-4e8d-9955-d64f103a2878",
"comment": "",
"command": "open",
"target": "/",
"targets": [],
"value": ""
}, {
"id": "b83717ee-c0ff-4f20-ac92-e1ea905a1d60",
"comment": "",
"command": "setWindowSize",
"target": "1680x1027",
"targets": [],
"value": ""
}, {
"id": "b1a90c70-d01c-4791-9f0c-3a776be3fe62",
"comment": "",
"command": "click",
"target": "linkText=Owned Movies",
"targets": [
["linkText=Owned Movies", "linkText"],
["css=.nav-item:nth-child(1) > .nav-link", "css:finder"],
["xpath=//a[contains(text(),'Owned Movies')]", "xpath:link"],
["xpath=//div[@id='navbarColor01']/ul/li/a", "xpath:idRelative"],
["xpath=//a[contains(@href, '/ownedMovies')]", "xpath:href"],
["xpath=//li/a", "xpath:position"],
["xpath=//a[contains(.,'Owned Movies')]", "xpath:innerText"]
],
"value": ""
}, {
"id": "332dd5e6-5b94-408e-a392-7f1901719395",
"comment": "",
"command": "pause",
"target": "",
"targets": [],
"value": "10"
}, {
"id": "88f5a347-b7cb-41cc-8320-8fb73f3f80ce",
"comment": "Should show entries 1 through 10",
"command": "verifyText",
"target": "id=movies_info",
"targets": [
["id=movies_info", "id"],
["css=#movies_info", "css:finder"],
["xpath=//div[@id='movies_info']", "xpath:attributes"],
["xpath=//div[@id='movies_wrapper']/div[3]", "xpath:idRelative"],
["xpath=//div/div[3]", "xpath:position"]
],
"value": "Showing 1 to 10 of 80 entries"
}]
}],
"suites": [{

15
pom.xml
View File

@@ -73,4 +73,19 @@
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.7</version>
<configuration>
<excludes>
<exclude>org.apache.commons:commons-collections4</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</project>