From fdd407efbabea7c9523c7107e31f9422fbd9e737 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <timm.fitschen@ds.mpg.de>
Date: Tue, 4 Dec 2018 11:50:20 +0100
Subject: [PATCH] TST: add test for user info
---
src/main/java/caosdb/server/ServerProperties.java | 2 +-
.../caosdb/server/resource/AbstractCaosDBServerResource.java | 1 +
.../server/resource/TestAbstractCaosDBServerResource.java | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/caosdb/server/ServerProperties.java b/src/main/java/caosdb/server/ServerProperties.java
index 65eff4ff..a4f93ec1 100644
--- a/src/main/java/caosdb/server/ServerProperties.java
+++ b/src/main/java/caosdb/server/ServerProperties.java
@@ -145,7 +145,7 @@ public class ServerProperties extends Properties {
serverProperties.setProperty(KEY_MYSQL_USER_NAME, "CaosDB");
serverProperties.setProperty(KEY_MYSQL_USER_PASSWORD, "CaosDB");
- serverProperties.setProperty(KEY_MYSQL_SCHEMA_VERSION, "v2.0.31");
+ serverProperties.setProperty(KEY_MYSQL_SCHEMA_VERSION, "v2.1.0");
serverProperties.setProperty(KEY_BASE_PATH, basepath);
serverProperties.setProperty(KEY_CONTEXT_ROOT, "");
diff --git a/src/main/java/caosdb/server/resource/AbstractCaosDBServerResource.java b/src/main/java/caosdb/server/resource/AbstractCaosDBServerResource.java
index 5e859997..5a32cf79 100644
--- a/src/main/java/caosdb/server/resource/AbstractCaosDBServerResource.java
+++ b/src/main/java/caosdb/server/resource/AbstractCaosDBServerResource.java
@@ -187,6 +187,7 @@ public abstract class AbstractCaosDBServerResource extends ServerResource {
}
addRoles(userInfo, user);
+ retRoot.addContent(userInfo);
}
}
diff --git a/src/test/java/caosdb/server/resource/TestAbstractCaosDBServerResource.java b/src/test/java/caosdb/server/resource/TestAbstractCaosDBServerResource.java
index 92408438..57031f08 100644
--- a/src/test/java/caosdb/server/resource/TestAbstractCaosDBServerResource.java
+++ b/src/test/java/caosdb/server/resource/TestAbstractCaosDBServerResource.java
@@ -67,5 +67,7 @@ public class TestAbstractCaosDBServerResource {
assertEquals("TEST-CRID", response.getAttribute("crid").getValue());
assertEquals("0", response.getAttribute("timestamp").getValue());
assertEquals("https://example.com/root/", response.getAttributeValue("baseuri"));
+ Element userInfo = response.getChild("UserInfo");
+ assertNotNull(userInfo);
}
}
--
GitLab