Simplify test data numbering

Author: garryod

bundler/src/permissionables/proposals.rs

@@ -74,8 +74,8 @@ mod tests {
     async fn fetch_some(ispyb_pool: MySqlPool) {
         let proposals = Proposals::fetch(&ispyb_pool).await.unwrap();
         let mut expected = BTreeMap::new();
-        expected.insert("foo".to_string(), BTreeSet::from([100, 101, 102]));
-        expected.insert("bar".to_string(), BTreeSet::from([100]));
+        expected.insert("foo".to_string(), BTreeSet::from([30, 31, 32]));
+        expected.insert("bar".to_string(), BTreeSet::from([30]));
         assert_eq!(
             expected,
             proposals

bundler/src/permissionables/sessions.rs

@@ -84,8 +84,8 @@ mod tests {
     async fn fetch_direct(ispyb_pool: MySqlPool) {
         let sessions = Sessions::fetch(&ispyb_pool).await.unwrap();
         let mut expected = BTreeMap::new();
-        expected.insert("foo".to_string(), vec![(100, 1), (100, 2)]);
-        expected.insert("bar".to_string(), vec![(101, 1)]);
+        expected.insert("foo".to_string(), vec![(30, 10), (30, 11)]);
+        expected.insert("bar".to_string(), vec![(31, 10)]);
         assert_eq!(
             expected,
             sessions
@@ -108,11 +108,11 @@ mod tests {
         let mut expected = BTreeMap::new();
         expected.insert(
             "foo".to_string(),
-            BTreeSet::from([(100, 1), (100, 2), (100, 3), (101, 1), (101, 2)]),
+            BTreeSet::from([(30, 10), (30, 11), (30, 12), (31, 10), (31, 11)]),
         );
         expected.insert(
             "bar".to_string(),
-            BTreeSet::from([(100, 1), (100, 2), (100, 3)]),
+            BTreeSet::from([(30, 10), (30, 11), (30, 12)]),
         );
         assert_eq!(
             expected,
@@ -141,11 +141,11 @@ mod tests {
         let mut expected = BTreeMap::new();
         expected.insert(
             "foo".to_string(),
-            BTreeSet::from([(100, 1), (100, 2), (100, 3), (101, 1), (101, 2)]),
+            BTreeSet::from([(30, 10), (30, 11), (30, 12), (31, 10), (31, 11)]),
         );
         expected.insert(
             "bar".to_string(),
-            BTreeSet::from([(100, 1), (100, 2), (100, 3), (101, 1)]),
+            BTreeSet::from([(30, 10), (30, 11), (30, 12), (31, 10)]),
         );
         assert_eq!(
             expected,

bundler/tests/fixtures/beamline_sessions.sql

@@ -4,4 +4,4 @@ INSERT INTO
         `proposalId`,
         `visit_number`
     )
-VALUES (1000, 100, 1), (1001, 100, 2), (1002, 100, 3), (1003, 101, 1), (1004, 101, 2);
+VALUES (40, 30, 10), (41, 30, 11), (42, 30, 12), (43, 31, 10), (44, 31, 11);

bundler/tests/fixtures/persons.sql

@@ -1,3 +1,3 @@
 INSERT INTO
     `Person` (`personId`, `login`)
-VALUES (10, "foo"), (11, "bar");
+VALUES (20, "foo"), (21, "bar");

bundler/tests/fixtures/proposal_membership.sql

@@ -1,3 +1,3 @@
 INSERT INTO
     `ProposalHasPerson` (`proposalId`, `personId`)
-VALUES (100, 10), (101, 10), (102, 10), (100, 11);
+VALUES (30, 20), (31, 20), (32, 20), (30, 21);

bundler/tests/fixtures/session_membership.sql

@@ -1,3 +1,3 @@
 INSERT INTO
     `Session_has_Person` (`sessionId`, `personId`)
-VALUES (1000, 10), (1001, 10), (1003, 11);
+VALUES (40, 20), (41, 20), (43, 21);