more old rust tests removed

2 files changed, 1 insertions, 302 deletions

diff --git a/rust/tests/helpers.rs b/rust/tests/helpers.rs
index 4a664403..420c1d3f 100644
--- a/rust/tests/helpers.rs
+++ b/rust/tests/helpers.rs
@@ -2,12 +2,10 @@ use fatcat::auth::MacaroonAuthMiddleware;
 use fatcat::editing_crud::EditgroupCrud;
 use fatcat::identifiers::FatcatId;
 use fatcat::server;
-use fatcat_api_spec::client::Client;
 use fatcat_api_spec::models::Editgroup;
-use fatcat_api_spec::Context;
 use iron::headers::{Authorization, Bearer, ContentType};
 use iron::mime::Mime;
-use iron::{status, Chain, Headers, Iron, Listening};
+use iron::{status, Chain, Headers};
 use iron_test::response;
 use std::str::FromStr;
 
diff --git a/rust/tests/test_old_python_tests.rs b/rust/tests/test_old_python_tests.rs
deleted file mode 100644
index e0d15484..00000000
--- a/rust/tests/test_old_python_tests.rs
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * This file contains some old python tests that have been ported to Rust. The exersize the "edit
- * lifecycle" as well as creation of a "rich" release entity (linked to all other entity types) in
- * a single editgroup.
- */
-
-use fatcat_api_spec::models::*;
-use fatcat_api_spec::*;
-
-mod helpers;
-
-// Disabled due to hang
-//#[test]
-#[allow(dead_code)]
-fn test_api_rich_create() {
-    let (client, context, mut server) = helpers::setup_client();
-    let client = client.with_context(context);
-
-    let admin_id = "aaaaaaaaaaaabkvkaaaaaaaaae".to_string();
-
-    let mut new_eg = Editgroup::new();
-    new_eg.editor_id = Some(admin_id);
-    new_eg.description = Some("a unit test edit".to_string());
-    let resp = client.create_editgroup(new_eg).wait().unwrap();
-    let editgroup_id = match resp {
-        CreateEditgroupResponse::SuccessfullyCreated(eg) => eg.editgroup_id.unwrap(),
-        _ => unreachable!(),
-    };
-
-    let mut new_container = ContainerEntity::new();
-    new_container.name = Some("schmournal".to_string());
-    new_container.publisher = Some("society of authors".to_string());
-    new_container.issnl = Some("2222-3333".to_string());
-    // extra=dict(a=2, i="zing"))),
-    let resp = client
-        .create_container(new_container, editgroup_id.clone())
-        .wait()
-        .unwrap();
-    let container_id = match resp {
-        CreateContainerResponse::CreatedEntity(ee) => ee.ident,
-        _ => unreachable!(),
-    };
-
-    let mut new_creator = CreatorEntity::new();
-    new_creator.display_name = Some("anon y. mouse".to_string());
-    new_creator.orcid = Some("0000-0002-1825-0097".to_string());
-    // extra=dict(a=2, i="zing"))),
-    let resp = client
-        .create_creator(new_creator, editgroup_id.clone())
-        .wait()
-        .unwrap();
-    let creator_id = match resp {
-        CreateCreatorResponse::CreatedEntity(ee) => ee.ident,
-        _ => unreachable!(),
-    };
-
-    let new_work = WorkEntity::new();
-    // extra=dict(a=2, i="zing"))),
-    let resp = client
-        .create_work(new_work, editgroup_id.clone())
-        .wait()
-        .unwrap();
-    let work_id = match resp {
-        CreateWorkResponse::CreatedEntity(ee) => ee.ident,
-        _ => unreachable!(),
-    };
-
-    // this stub work will be referenced
-    let mut new_release = ReleaseEntity::new();
-    new_release.title = Some("derivative work".to_string());
-    new_release.release_type = Some("article-journal".to_string());
-    new_release.work_id = Some(work_id.clone());
-    let mut contrib = ReleaseContrib::new();
-    contrib.creator_id = Some(creator_id.clone());
-    new_release.contribs = Some(vec![contrib]);
-    new_release.doi = Some("10.1234/58".to_string());
-    let mut rref = ReleaseRef::new();
-    rref.title = Some("some other work".to_string());
-    new_release.refs = Some(vec![rref]);
-    // extra=dict(a=2, i="zing"))),
-    let resp = client
-        .create_release(new_release, editgroup_id.clone())
-        .wait()
-        .unwrap();
-    let stub_release_id = match resp {
-        CreateReleaseResponse::CreatedEntity(ee) => ee.ident,
-        _ => unreachable!(),
-    };
-
-    let mut new_release = ReleaseEntity::new();
-    new_release.title = Some("dummy work".to_string());
-    new_release.release_type = Some("book".to_string());
-    new_release.work_id = Some(work_id.clone());
-    new_release.container_id = Some(container_id.clone());
-    let mut contrib = ReleaseContrib::new();
-    contrib.creator_id = Some(creator_id.clone());
-    new_release.contribs = Some(vec![contrib]);
-    new_release.doi = Some("10.1234/5678".to_string());
-    let mut rref = ReleaseRef::new();
-    rref.title = Some("some paper".to_string());
-    rref.target_release_id = Some(stub_release_id.clone());
-    new_release.refs = Some(vec![rref]);
-    // extra=dict(f=7, b="loopy"))),
-    let resp = client
-        .create_release(new_release, editgroup_id.clone())
-        .wait()
-        .unwrap();
-    let release_id = match resp {
-        CreateReleaseResponse::CreatedEntity(ee) => ee.ident,
-        _ => unreachable!(),
-    };
-
-    let mut new_file = FileEntity::new();
-    new_file.sha1 = Some("7d97e98f8af710c7e7fe703abc8f639e0ee507c4".to_string());
-    new_file.size = Some(1234);
-    new_file.release_ids = Some(vec![release_id.clone()]);
-    // extra=dict(f=4, b="zing"))),
-    let resp = client
-        .create_file(new_file, editgroup_id.clone())
-        .wait()
-        .unwrap();
-    let file_id = match resp {
-        CreateFileResponse::CreatedEntity(ee) => ee.ident,
-        _ => {
-            println!("{:?}", resp);
-            unreachable!()
-        }
-    };
-
-    let resp = client.get_changelog(Some(1)).wait().unwrap();
-    let last_change_id = match resp {
-        GetChangelogResponse::Success(list) => list[0].index,
-        _ => unreachable!(),
-    };
-
-    match client
-        .accept_editgroup(editgroup_id.clone())
-        .wait()
-        .unwrap()
-    {
-        AcceptEditgroupResponse::MergedSuccessfully(_) => (),
-        _ => unreachable!(),
-    };
-
-    let resp = client.get_changelog(Some(1)).wait().unwrap();
-    match resp {
-        GetChangelogResponse::Success(list) => assert_eq!(list[0].index, last_change_id + 1),
-        _ => unreachable!(),
-    };
-
-    // test that foreign key relations worked
-    let re = match client
-        .get_release(release_id.clone(), None, None)
-        .wait()
-        .unwrap()
-    {
-        GetReleaseResponse::FoundEntity(e) => e,
-        _ => unreachable!(),
-    };
-    assert_eq!(
-        re.contribs.clone().unwrap()[0].clone().creator_id.unwrap(),
-        creator_id
-    );
-    assert_eq!(re.work_id.unwrap(), work_id);
-    assert_eq!(
-        re.contribs.unwrap()[0].clone().creator_id.unwrap(),
-        creator_id
-    );
-    assert_eq!(
-        re.refs.unwrap()[0].clone().target_release_id.unwrap(),
-        stub_release_id
-    );
-
-    let fe = match client.get_file(file_id, None, None).wait().unwrap() {
-        GetFileResponse::FoundEntity(e) => e,
-        _ => unreachable!(),
-    };
-    assert_eq!(fe.release_ids.unwrap()[0], release_id.clone());
-
-    server.close().unwrap()
-}
-
-/* Disabled because test framework/fixture is broken in Gitlab CI (getting a port error), not
- * because of any problem with this particular test... though this test isn't doing much right now
- * anyways.
- */
-//#[test]
-#[allow(dead_code)]
-fn test_merge_works() {
-    let (client, context, mut server) = helpers::setup_client();
-    let client = client.with_context(context);
-
-    let admin_id = "aaaaaaaaaaaabkvkaaaaaaaaae".to_string();
-
-    let mut eg = Editgroup::new();
-    eg.editor_id = Some(admin_id);
-    let resp = client.create_editgroup(eg).wait().unwrap();
-    let editgroup_id = match resp {
-        CreateEditgroupResponse::SuccessfullyCreated(eg) => eg.editgroup_id.unwrap(),
-        _ => unreachable!(),
-    };
-
-    // Create 2x works, each with releases; work_b has two releases
-
-    let resp = client
-        .create_work(WorkEntity::new(), editgroup_id.clone())
-        .wait()
-        .unwrap();
-    let work_a_id = match resp {
-        CreateWorkResponse::CreatedEntity(ee) => ee.ident,
-        _ => unreachable!(),
-    };
-    let mut new_release = ReleaseEntity::new();
-    new_release.title = Some("some release".to_string());
-    new_release.release_type = Some("article-journal".to_string());
-    new_release.work_id = Some(work_a_id.clone());
-    new_release.doi = Some("10.1234/A1".to_string());
-    let resp = client
-        .create_release(new_release, editgroup_id.clone())
-        .wait()
-        .unwrap();
-    let _release_a1_id = match resp {
-        CreateReleaseResponse::CreatedEntity(ee) => ee.ident,
-        _ => unreachable!(),
-    };
-
-    let resp = client
-        .create_work(WorkEntity::new(), editgroup_id.clone())
-        .wait()
-        .unwrap();
-    let work_b_id = match resp {
-        CreateWorkResponse::CreatedEntity(ee) => ee.ident,
-        _ => unreachable!(),
-    };
-
-    let mut new_release = ReleaseEntity::new();
-    new_release.title = Some("some release".to_string());
-    new_release.release_type = Some("article-journal".to_string());
-    new_release.work_id = Some(work_b_id.clone());
-    new_release.doi = Some("10.1234/B1".to_string());
-    let resp = client
-        .create_release(new_release, editgroup_id.clone())
-        .wait()
-        .unwrap();
-    let _release_b1_id = match resp {
-        CreateReleaseResponse::CreatedEntity(ee) => ee.ident,
-        _ => unreachable!(),
-    };
-
-    let mut new_release = ReleaseEntity::new();
-    new_release.title = Some("some release".to_string());
-    new_release.release_type = Some("article-journal".to_string());
-    new_release.work_id = Some(work_b_id.clone());
-    new_release.doi = Some("10.1234/B2".to_string());
-    let resp = client
-        .create_release(new_release, editgroup_id.clone())
-        .wait()
-        .unwrap();
-    let _release_b2_id = match resp {
-        CreateReleaseResponse::CreatedEntity(ee) => ee.ident,
-        _ => unreachable!(),
-    };
-
-    match client
-        .accept_editgroup(editgroup_id.clone())
-        .wait()
-        .unwrap()
-    {
-        AcceptEditgroupResponse::MergedSuccessfully(_) => (),
-        _ => unreachable!(),
-    };
-
-    /* TODO:
-    // merge works
-    client.merge_works(work_a_id, work_b_id)
-    */
-    // check results
-    let work_a = match client
-        .get_work(work_a_id.clone(), None, None)
-        .wait()
-        .unwrap()
-    {
-        GetWorkResponse::FoundEntity(e) => e,
-        _ => unreachable!(),
-    };
-    let _work_b = match client
-        .get_work(work_b_id.clone(), None, None)
-        .wait()
-        .unwrap()
-    {
-        GetWorkResponse::FoundEntity(e) => e,
-        _ => unreachable!(),
-    };
-    // TODO: assert_eq!(work_a.revision.unwrap(), work_b.revision.unwrap());
-    assert_eq!(work_a.redirect, None);
-    // TODO: assert_eq!(work_b.redirect, Some(work_a_id));
-
-    server.close().unwrap()
-}