Move integration tests into their own crate

Author: knutwalker

.github/workflows/checks.yml

@@ -27,40 +27,13 @@ env:
   HACK: hack --package neo4rs --each-feature --exclude-features unstable-serde-packstream-format,unstable-bolt-protocol-impl-v2,unstable-result-summary
 
 jobs:
-  check:
-    name: Compile on MSRV
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
-
-      - name: Set up Rust
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ env.MSRV }}
-
-      - name: Set up Rust cache
-        uses: Swatinem/rust-cache@v2
-
-      - name: Install cargo-hack
-        uses: taiki-e/install-action@cargo-hack
-
-      - name: Prepare MSRV lockfile
-        run: cp ci/Cargo.lock.msrv Cargo.lock
-
-      - name: Run cargo check
-        run: cargo +$MSRV --locked ${{ env.HACK }} check
-
   fmt:
     name: Check formatting
     runs-on: ubuntu-latest
     steps:
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 2
 
@@ -82,7 +55,7 @@ jobs:
     steps:
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 2
 
@@ -114,14 +87,14 @@ jobs:
     steps:
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 2
 
       - name: Set up Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: stable
+          toolchain: ${{ env.MSRV }}
 
       - name: Set up Rust cache
         uses: Swatinem/rust-cache@v2
@@ -132,8 +105,11 @@ jobs:
       - name: Install cargo-nextest
         uses: taiki-e/install-action@nextest
 
+      - name: Prepare MSRV lockfile
+        run: cp ci/Cargo.lock.msrv Cargo.lock
+
       - name: Run unit tests
-        run: cargo ${{ env.HACK }} nextest run --lib
+        run: cargo +$MSRV --locked ${{ env.HACK }} nextest run --lib
 
   integration-tests:
     name: Run integration tests
@@ -158,14 +134,14 @@ jobs:
     steps:
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 2
 
       - name: Set up Rust
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: ${{ env.MSRV }}
+          toolchain: stable
 
       - name: Set up Rust cache
         uses: Swatinem/rust-cache@v2
@@ -176,22 +152,11 @@ jobs:
       - name: Install cargo-nextest
         uses: taiki-e/install-action@nextest
 
-      - name: Prepare MSRV lockfile
-        run: cp ci/Cargo.lock.msrv Cargo.lock
-
       - name: Run integration tests
-        run: cargo +$MSRV --locked ${{ env.HACK }} nextest run -E 'kind(test)'
+        run: cargo {{ env.HACK }} nextest run -E 'kind(test)'
 
-  msrv:
-    name: Validate MSRV and minimal dependency versions
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - file: Cargo.lock.msrv
-            name: MSRV
-          - file: Cargo.lock.min
-            name: minimal dependency versions
+  min_dep:
+    name: Validate minimal dependency versions
     runs-on: ubuntu-latest
     steps:
 
@@ -203,21 +168,21 @@ jobs:
         with:
           toolchain: ${{ env.MSRV }}
 
-      - name: Prepare ${{ matrix.name }} lockfile
-        run: cp ci/${{ matrix.file }} Cargo.lock
-
       - name: Set up Rust cache
         uses: Swatinem/rust-cache@v2
 
       - name: Install cargo-nextest
         uses: taiki-e/install-action@nextest
 
-      - name: Run ${{ matrix.name }} unit tests
-        run: cargo +$MSRV nextest run --lib --all-features --locked
+      - name: Prepare minimal dependency versions lockfile
+        run: cp ci/Cargo.lock.min Cargo.lock
+
+      - name: Run minimal dependency versions unit tests
+        run: cargo +$MSRV nextest --package neo4rs run --lib --all-features --locked
 
   release:
     name: Release
-    needs: [ check, fmt, clippy, unit-tests, integration-tests, msrv ]
+    needs: [ fmt, clippy, unit-tests, integration-tests, min_dep ]
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:

.github/workflows/create-release-pr.yml

@@ -32,7 +32,7 @@ jobs:
     steps:
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 2
 

include_snippet/Cargo.toml

@@ -1,9 +1,9 @@
 [package]
-name = "include_snippet"
-version = "0.0.0"
+name = "neo4rs_include_snippet"
+version = "0.9.0-rc.8"
 edition = "2021"
 description = "Internal proc macro for the include_snippet! macro"
-publish = false
+publish = true
 
 [lib]
 proc-macro = true

integrationtests/Cargo.toml

@@ -0,0 +1,49 @@
+[package]
+name = "neo4rs_tests"
+version = "0.0.0"
+edition = "2024"
+description = "Rust driver for Neo4j"
+license = "MIT"
+repository = "https://github.com/neo4j-labs/neo4rs"
+documentation = "https://docs.rs/neo4rs"
+readme = "../README.md"
+publish = false
+
+[features]
+json = ["neo4rs/json"]
+uuid = ["neo4rs/uuid"]
+unstable-v1 = ["neo4rs/unstable-v1"]
+unstable-serde-packstream-format = ["neo4rs/unstable-serde-packstream-format"]
+unstable-result-summary = ["neo4rs/unstable-result-summary"]
+unstable-bolt-protocol-impl-v2 = ["neo4rs/unstable-bolt-protocol-impl-v2"]
+
+[dependencies]
+neo4rs = { version = "0.9.0-rc.8", path = "../lib" }
+
+[dev-dependencies]
+futures = { version = "0.3.0" }
+pretty_env_logger = "0.5.0"
+serde = { version = "1.0.185" }
+uuid = { version = "1.0.0", features = ["v4"] }
+
+[dev-dependencies.chrono]
+version = "0.4.35"
+default-features = false
+features = ["std", "serde"]
+
+[dev-dependencies.lenient_semver]
+version = "0.4.2"
+default-features = false
+features = ["version_lite"]
+
+[dev-dependencies.testcontainers]
+version = "0.25.2"
+features = ["blocking"]
+
+[dev-dependencies.testcontainers-modules]
+version = "0.13.0"
+features = ["neo4j"]
+
+[dependencies.tokio]
+version = "1.5.0"
+features = ["full"]

integrationtests/tests/bookmarks.rs

@@ -0,0 +1,53 @@
+#![cfg(feature = "unstable-bolt-protocol-impl-v2")]
+use neo4rs::*;
+
+mod container;
+
+#[tokio::test]
+async fn transactions() {
+    let neo4j = container::Neo4jContainer::new().await;
+    let graph = neo4j.graph();
+
+    // snippet-start
+    let mut txn = graph
+        .start_txn()
+        .await
+        .expect("Failed to start a new transaction");
+    let id = uuid::Uuid::new_v4().to_string();
+    txn.run(query("CREATE (p:Person {id: $id})").param("id", id.clone()))
+        .await
+        .unwrap();
+    txn.run(query("CREATE (p:Person {id: $id})").param("id", id.clone()))
+        .await
+        .unwrap();
+    // graph.execute(..) will not see the changes done above as the txn is not committed yet
+    let mut result = graph
+        .execute(query("MATCH (p:Person) WHERE p.id = $id RETURN p.id").param("id", id.clone()))
+        .await
+        .unwrap();
+    assert!(result.next().await.unwrap().is_none());
+    let bookmark = txn.commit().await.unwrap();
+    assert!(bookmark.is_some());
+    if let Some(ref b) = bookmark {
+        println!("Got a bookmark after commit: {:?}", b);
+    }
+
+    //changes are now seen as the transaction is committed.
+    let mut txn = graph
+        .start_txn_as(Operation::Read, bookmark.map(|b| vec![b]))
+        .await
+        .expect("Failed to start a new transaction");
+    let mut stream = txn
+        .execute(query("MATCH (p:Person) WHERE p.id = $id RETURN p.id").param("id", id.clone()))
+        .await
+        .unwrap();
+    loop {
+        let next = stream.next(txn.handle());
+        if let Ok(Some(record)) = next.await {
+            println!("Record: {:?}", record);
+        } else {
+            break;
+        }
+    }
+    // snippet-end
+}

lib/tests/configurations.rs renamed to integrationtests/tests/configurations.rs

@@ -11,5 +11,11 @@ async fn configurations() {
     let neo4j = container::Neo4jContainer::from_config(config).await;
     let graph = neo4j.graph();
 
-    include!("../include/configurations.rs");
+    // snippet-start
+    let mut result = graph.execute(query("RETURN 1")).await.unwrap();
+    let row = result.next().await.unwrap().unwrap();
+    let value: i64 = row.get("1").unwrap();
+    assert_eq!(1, value);
+    assert!(result.next().await.unwrap().is_none());
+    // snippet-end
 }

lib/tests/container.rs renamed to integrationtests/tests/container.rs

@@ -1,4 +1,13 @@
-{ 
+use neo4rs::*;
+
+mod container;
+
+#[tokio::test]
+async fn dates() {
+    let neo4j = container::Neo4jContainer::new().await;
+    let graph = neo4j.graph();
+
+    // snippet-start
     let date = chrono::NaiveDate::from_ymd_opt(1985, 2, 5).unwrap();
     let mut result = graph
         .execute(query("RETURN $d as output").param("d", date))
@@ -8,4 +17,5 @@
     let d: chrono::NaiveDate = row.get("output").unwrap();
     assert_eq!(d.to_string(), "1985-02-05");
     assert!(result.next().await.unwrap().is_none());
+    // snippet-end
 }

lib/include/dates.rs renamed to integrationtests/tests/dates.rs

@@ -1,4 +1,13 @@
-{ 
+use neo4rs::*;
+
+mod container;
+
+#[tokio::test]
+async fn datetime_as_param() {
+    let neo4j = container::Neo4jContainer::new().await;
+    let graph = neo4j.graph();
+
+    // snippet-start
     //send datetime as parameter in the query
     let datetime = chrono::DateTime::parse_from_rfc2822("Tue, 01 Jul 2003 10:52:37 +0200").unwrap();
 
@@ -13,8 +22,8 @@
 
     //send NaiveDateTime as parameter in the query
     let localdatetime =
-    chrono::NaiveDateTime::parse_from_str("2015-07-01 08:55:59.123", "%Y-%m-%d %H:%M:%S%.f")
-        .unwrap();
+        chrono::NaiveDateTime::parse_from_str("2015-07-01 08:55:59.123", "%Y-%m-%d %H:%M:%S%.f")
+            .unwrap();
 
     let mut result = graph
         .execute(query("RETURN $d as output").param("d", localdatetime))
@@ -27,8 +36,8 @@
 
     //send NaiveDateTime with timezone id as parameter in the query
     let datetime =
-    chrono::NaiveDateTime::parse_from_str("2015-07-03 08:55:59.555", "%Y-%m-%d %H:%M:%S%.f")
-        .unwrap();
+        chrono::NaiveDateTime::parse_from_str("2015-07-03 08:55:59.555", "%Y-%m-%d %H:%M:%S%.f")
+            .unwrap();
     let timezone = "Europe/Paris";
 
     let mut result = graph
@@ -40,4 +49,5 @@
     assert_eq!(time.to_string(), "2015-07-03 08:55:59.555");
     assert_eq!(zone, "Europe/Paris");
     assert!(result.next().await.unwrap().is_none());
+    // snippet-end
 }