From a29e16097a5e1f77ed557fa7b95057d83c525705 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 20 Mar 2024 23:30:35 +0100
Subject: [PATCH] TST: fix tests
---
scripting/bin/administration/diagnostics.py | 10 +++++-----
.../resource/transaction/DeleteEntityResource.java | 13 ++++++-------
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/scripting/bin/administration/diagnostics.py b/scripting/bin/administration/diagnostics.py
index ccecbd58..43194ac1 100755
--- a/scripting/bin/administration/diagnostics.py
+++ b/scripting/bin/administration/diagnostics.py
@@ -34,7 +34,7 @@ should not be executable for non-admin users.
import sys
TEST_MODULES = [
- "caosdb",
+ "linkahead",
"numpy",
"pandas",
"validate_email"
@@ -73,8 +73,8 @@ def get_query():
return get_option("query")
-def get_caosdb_info(auth_token):
- import caosdb as db
+def get_linkahead_info(auth_token):
+ import linkahead as db
result = dict()
result["version"] = db.version.version
@@ -136,8 +136,8 @@ def main():
auth_token = get_auth_token()
diagnostics["auth_token"] = auth_token
- if diagnostics["import"]["caosdb"][0] is True:
- diagnostics["caosdb"] = get_caosdb_info(auth_token)
+ if diagnostics["import"]["linkahead"][0] is True:
+ diagnostics["linkahead"] = get_linkahead_info(auth_token)
finally:
json.dump(diagnostics, sys.stdout)
diff --git a/src/main/java/org/caosdb/server/resource/transaction/DeleteEntityResource.java b/src/main/java/org/caosdb/server/resource/transaction/DeleteEntityResource.java
index 6150730c..1df2407c 100644
--- a/src/main/java/org/caosdb/server/resource/transaction/DeleteEntityResource.java
+++ b/src/main/java/org/caosdb/server/resource/transaction/DeleteEntityResource.java
@@ -3,7 +3,6 @@ package org.caosdb.server.resource.transaction;
import java.util.List;
import org.caosdb.server.entity.DeleteEntity;
import org.caosdb.server.entity.EntityID;
-import org.caosdb.server.entity.UpdateEntity;
import org.caosdb.server.entity.container.WritableContainer;
import org.caosdb.server.transaction.WriteTransaction;
import org.caosdb.server.transaction.WriteTransactionInterface;
@@ -33,15 +32,15 @@ public class DeleteEntityResource extends EntityResource {
new WritableContainer(getUser(), getTimestamp(), getSRID(), getFlags());
final Document doc = new Document();
- List<Element> updateEntities;
- updateEntities = parseEntity(getRequest().getEntity()).getRootElement().getChildren();
+ List<Element> deleteEntities;
+ deleteEntities = parseEntity(getRequest().getEntity()).getRootElement().getChildren();
- for (final Element e : updateEntities) {
- entityContainer.add(new DeleteEntity(new EntityID(new UpdateEntity(e).getId().toString())));
+ for (final Element e : deleteEntities) {
+ entityContainer.add(new DeleteEntity(new EntityID(e.getAttributeValue("id"))));
}
- final WriteTransactionInterface update = new WriteTransaction(entityContainer);
- update.execute();
+ final WriteTransactionInterface transaction = new WriteTransaction(entityContainer);
+ transaction.execute();
final Element rootElem = generateRootElement();
entityContainer.addToElement(rootElem);
--
GitLab