Skip to content

Modify regex in TestTaskTwo.testSqlQuery() and TestTaskFour.testSqlQuery() #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tpenn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Modify regex in TestTaskTwo.testSqlQuery() and TestTaskFour.testSqlQuery() #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/test/java/org/launchcode/techjobs/persistent/TestTaskFour.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,10 @@ public void testJobSkillsRefactoring () throws ClassNotFoundException, NoSuchMet
public void testSqlQuery () throws IOException {
String queryFileContents = getFileContents("queries.sql");

Pattern queryPattern = Pattern.compile("SELECT\\s+\\*\\s+FROM\\s+skill" +
"\\s*(LEFT|INNER)?\\s+JOIN\\s+job_skills\\s+ON\\s+(skill.id\\s+=\\s+job_skills.skills_id|job_skills.skills_id\\s+=\\s+skill.id)" +
"(\\s*WHERE\\s+job_skills.jobs_id\\s+IS\\s+NOT\\s+NULL)?" +
Pattern queryPattern = Pattern.compile("(?=[^()]*(\\([^()]+\\)[^()]*)*$)" +
"SELECT\\s+\\*\\s+FROM\\s+skill" +
"\\s*(LEFT|INNER)?\\s+JOIN\\s+job_skills\\s+ON\\s+\\(?(skill.id\\s*=\\s*job_skills.skills_id|job_skills.skills_id\\s*=\\s*skill.id)\\)?" +
"(\\s*WHERE\\s+\\(?job_skills.jobs_id\\s+IS\\s+NOT\\s+NULL\\)?)?" +
"\\s*ORDER\\s+BY\\s+name\\s+ASC;", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
Matcher queryMatcher = queryPattern.matcher(queryFileContents);
boolean queryFound = queryMatcher.find();
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/launchcode/techjobs/persistent/TestTaskTwo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ public void testSkillRepositoryHasRepositoryAnnotation () throws ClassNotFoundEx
// public void testSqlQuery() throws IOException {
// String queryFileContents = getFileContents("queries.sql");
//
// Pattern queryPattern = Pattern.compile("SELECT\\s+name\\s+FROM\\s+employer\\s+WHERE\\s+location\\s+=\\s+\"St.\\s+Louis\\s+City\";", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
// Pattern queryPattern = Pattern.compile("SELECT\\s+name\\s+FROM\\s+employer\\s+WHERE\\s+location\\s*=\\s*\"St.\\s+Louis\\s+City\";", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
// Matcher queryMatcher = queryPattern.matcher(queryFileContents);
// boolean queryFound = queryMatcher.find();
// assertTrue(queryFound, "Task 2 SQL query is incorrect. Test your query against your database to find the error.");
Expand Down