Skip to content

Order By Query Clauses Test #21

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

Merged
TimothyGillespie merged 23 commits into from
Apr 2, 2021
Merged

Order By Query Clauses Test #21

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b527ee2
Add ModelSetup to unify setup codes
TimothyGillespie Mar 21, 2021
480b883
Merge branch 'master' into TimothyGillespie/addOrderByTests
TimothyGillespie Mar 31, 2021
49e4fa0
Add assertOrderByContains method
TimothyGillespie Mar 31, 2021
8aaedb2
Add SectionIndexOutOfBoundException
TimothyGillespie Mar 31, 2021
1ae8ac8
Add retrieval methods for the sections
TimothyGillespie Mar 31, 2021
5d4e233
Add JavaDocs for getSectionList too
TimothyGillespie Mar 31, 2021
89c48dc
Add JavaDocs for getSectionList too
TimothyGillespie Mar 31, 2021
51907a4
Reorder methods more logically
TimothyGillespie Mar 31, 2021
ac7140e
Add assertSectionEquals method
TimothyGillespie Mar 31, 2021
5491a48
Remove OrderBy specific contains method
TimothyGillespie Mar 31, 2021
6f97433
Make assertion methods chainable
TimothyGillespie Mar 31, 2021
b73d7db
Add better fitting internal assert for the equal assertion
TimothyGillespie Mar 31, 2021
710b6c5
Add tests for OrderBy Clauses
TimothyGillespie Mar 31, 2021
9e857cf
Merge branch 'TimothyGillespie/addOrderByTests' of github.com:JavaWeb…
TimothyGillespie Mar 31, 2021
e4d3fc0
Remove explicit ASC as discussed
TimothyGillespie Apr 1, 2021
0037a3a
Merge branch 'TimothyGillespie/enableMultipleOrderBy' into TimothyGil…
TimothyGillespie Apr 2, 2021
fb00e4d
Adjust MySQL Query Building for the new OrderBy and fix OrderBy test
TimothyGillespie Apr 2, 2021
018ce02
Add test to assert the correct sort priority
TimothyGillespie Apr 2, 2021
c8e9a40
Add error case for calling order on same column twice
TimothyGillespie Apr 2, 2021
37ed312
Add note of purpose of OrderByClauseTest
TimothyGillespie Apr 2, 2021
5a74b53
Add JavaDocs to QueryOrderBy
TimothyGillespie Apr 2, 2021
5210447
Add JavaDocs to QueryOrderByElement
TimothyGillespie Apr 2, 2021
3bff425
Add JavaDocs to the order method on Query
TimothyGillespie Apr 2, 2021
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
Prev Previous commit
Next Next commit
Remove explicit ASC as discussed
  • Loading branch information
@TimothyGillespie
TimothyGillespie committed Apr 1, 2021
commit e4d3fc03c28e62a5e853d44130eb7fb3c4990119
16 changes: 8 additions & 8 deletions src/test/java/org/javawebstack/orm/test/querybuilding/OrderByClauseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,28 @@ public class OrderByClauseTest {
void testOneExistingColumnDefaultOrderBy() {
Query<Datatype> query = setUpModel(Datatype.class).query()
.order("wrapper_integer");
new QueryVerification(query).assertSectionEquals("ORDER BY", "`wrapper_integer` ASC");
new QueryVerification(query).assertSectionEquals("ORDER BY", "`wrapper_integer`");
}

@Test
void testOneNonExistingColumnDefaultOrderBy() {
Query<Datatype> query = setUpModel(Datatype.class).query()
.order("does_not_exist");
new QueryVerification(query).assertSectionEquals("ORDER BY", "`does_not_exist` ASC");
new QueryVerification(query).assertSectionEquals("ORDER BY", "`does_not_exist`");
}

@Test
void testOneExistingColumnASCOrderBy() {
Query<Datatype> query = setUpModel(Datatype.class).query()
.order("wrapper_integer", false);
new QueryVerification(query).assertSectionEquals("ORDER BY", "`wrapper_integer` ASC");
new QueryVerification(query).assertSectionEquals("ORDER BY", "`wrapper_integer`");
}

@Test
void testOneNonExistingColumnASCOrderBy() {
Query<Datatype> query = setUpModel(Datatype.class).query()
.order("does_not_exist", false);
new QueryVerification(query).assertSectionEquals("ORDER BY", "`does_not_exist` ASC");
new QueryVerification(query).assertSectionEquals("ORDER BY", "`does_not_exist`");
}

@Test
Expand All @@ -58,8 +58,8 @@ void testMultipleOrderByClausesOfASCOrder() {
.order("primitive_integer");

new QueryVerification(query)
.assertSectionContains("ORDER BY", "`wrapper_integer` ASC")
.assertSectionContains("ORDER BY", "`primitive_integer` ASC");
.assertSectionContains("ORDER BY", "`wrapper_integer`")
.assertSectionContains("ORDER BY", "`primitive_integer`");
}

@Test
Expand All @@ -80,7 +80,7 @@ void testMultipleOrderByClausesOfMixedOrder() {
.order("primitive_integer", true);

new QueryVerification(query)
.assertSectionContains("ORDER BY", "`wrapper_integer` ASC")
.assertSectionContains("ORDER BY", "`wrapper_integer`")
.assertSectionContains("ORDER BY", "`primitive_integer` DESC");
}

Expand All @@ -92,7 +92,7 @@ void testMultipleOrderByClausesOfMixedOrderReversed() {

new QueryVerification(query)
.assertSectionContains("ORDER BY", "`primitive_integer` DESC")
.assertSectionContains("ORDER BY", "`wrapper_integer` ASC");
.assertSectionContains("ORDER BY", "`wrapper_integer`");
}

}