rife2/rife2
rife2/rife2
2
0
Fork 0
mirror of https://github.com/ethauvin/rife2.git synced 2025-05-01 02:58:12 -07:00
Code Activity

Attempt to fix the GQM MySQL tests on GitHub

Browse source
This commit is contained in:
Geert Bevin 2022-12-31 21:40:28 -05:00
parent f39d5d6437
commit 55b56f9e5e
3 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/gradle.yml vendored
View file

@ -48,7 +48,8 @@ jobs:
java-version: [ 19 ]
steps:
- uses: actions/checkout@v3
- name: Checkout source repository
uses: actions/checkout@v3
with:
fetch-depth: 0
@ -63,4 +64,4 @@ jobs:
run: chmod +x gradlew
- name: Test with Gradle
run: ./gradlew -Dtest.postgres=true -Dtest.mysql=true clean :lib:test --stacktrace --tests TestGenericQueryManagerManyToMany
run: ./gradlew -Dtest.postgres=true -Dtest.mysql=true clean :lib:test --stacktrace --tests "rife.database.querymanagers.generic*"

16
lib/src/test/java/rife/database/querymanagers/generic/TestGenericQueryManagerManyToMany.java
View file

@ -242,8 +242,8 @@ public class TestGenericQueryManagerManyToMany {
assertEquals(2, new DbQueryManager(datasource)
.executeGetFirstInt(new Select(datasource)
.field("count(*)")
.from("mmfirstbean_mmsecondbean")
.where("mmfirstbean_identifier", "=", id1)));
.from("MMFirstBean_MMSecondBean")
.where("MMFirstBean_identifier", "=", id1)));
assertEquals(2, secondManager_.count());
// delete the first bean
@ -254,8 +254,8 @@ public class TestGenericQueryManagerManyToMany {
assertEquals(0, new DbQueryManager(datasource)
.executeGetFirstInt(new Select(datasource)
.field("count(*)")
.from("mmfirstbean_mmsecondbean")
.where("mmfirstbean_identifier", "=", id1)));
.from("MMFirstBean_MMSecondBean")
.where("MMFirstBean_identifier", "=", id1)));
assertEquals(2, secondManager_.count());
// add another many-to-many relationship
@ -271,8 +271,8 @@ public class TestGenericQueryManagerManyToMany {
assertEquals(3, new DbQueryManager(datasource)
.executeGetFirstInt(new Select(datasource)
.field("count(*)")
.from("mmfirstbean_mmsecondbean")
.where("mmfirstbean_identifier", "=", id2)));
.from("MMFirstBean_MMSecondBean")
.where("MMFirstBean_identifier", "=", id2)));
assertEquals(3, secondManager_.count());
// delete the second bean
@ -283,8 +283,8 @@ public class TestGenericQueryManagerManyToMany {
assertEquals(0, new DbQueryManager(datasource)
.executeGetFirstInt(new Select(datasource)
.field("count(*)")
.from("mmfirstbean_mmsecondbean")
.where("mmfirstbean_identifier", "=", id2)));
.from("MMFirstBean_MMSecondBean")
.where("MMFirstBean_identifier", "=", id2)));
assertEquals(3, secondManager_.count());
} finally {
tearDown();

6
lib/src/test/java/rife/database/querymanagers/generic/TestRestoreQuery.java
View file

@ -937,7 +937,7 @@ public class TestRestoreQuery {
query = manager_.getRestoreQuery();
query
.fields("simplebean", SimpleBean.class);
.fields("SimpleBean", SimpleBean.class);
bean_list = manager_.restore(query);
@ -954,7 +954,7 @@ public class TestRestoreQuery {
query = manager_.getRestoreQuery();
query
.fieldsExcluded("simplebean", SimpleBean.class, "testString");
.fieldsExcluded("SimpleBean", SimpleBean.class, "testString");
bean_list = manager_.restore(query);
@ -965,7 +965,7 @@ public class TestRestoreQuery {
query = manager_.getRestoreQuery();
query
.fields("linkBean");
.fields("LinkBean");
bean_list = manager_.restore(query);