Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openbis
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sispub
openbis
Commits
f188965e
Commit
f188965e
authored
6 years ago
by
felmer
Browse files
Options
Downloads
Patches
Plain Diff
SSDM-6061: Fixing UserManagementMaintenanceTaskTest
parent
c15dd030
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/UserManagementMaintenanceTaskTest.java
+8
-8
8 additions, 8 deletions
...eneric/server/task/UserManagementMaintenanceTaskTest.java
with
8 additions
and
8 deletions
openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/task/UserManagementMaintenanceTaskTest.java
+
8
−
8
View file @
f188965e
...
@@ -68,7 +68,7 @@ public class UserManagementMaintenanceTaskTest extends AbstractFileSystemTestCas
...
@@ -68,7 +68,7 @@ public class UserManagementMaintenanceTaskTest extends AbstractFileSystemTestCas
public
void
setUp
()
throws
IOException
public
void
setUp
()
throws
IOException
{
{
super
.
setUp
();
super
.
setUp
();
logRecorder
=
LogRecordingUtils
.
createRecorder
(
"%-5p %c - %m%n"
,
Level
.
DEBUG
);
logRecorder
=
LogRecordingUtils
.
createRecorder
(
"%-5p %c - %m%n"
,
Level
.
INFO
);
configFile
=
new
File
(
workingDirectory
,
"config.json"
);
configFile
=
new
File
(
workingDirectory
,
"config.json"
);
auditLogFile
=
new
File
(
workingDirectory
,
"audit_log.txt"
);
auditLogFile
=
new
File
(
workingDirectory
,
"audit_log.txt"
);
properties
=
new
Properties
();
properties
=
new
Properties
();
...
@@ -188,7 +188,7 @@ public class UserManagementMaintenanceTaskTest extends AbstractFileSystemTestCas
...
@@ -188,7 +188,7 @@ public class UserManagementMaintenanceTaskTest extends AbstractFileSystemTestCas
+
"INFO OPERATION.UserManagementMaintenanceTask - Plugin '' initialized. Configuration file: "
+
"INFO OPERATION.UserManagementMaintenanceTask - Plugin '' initialized. Configuration file: "
+
configFile
.
getAbsolutePath
()
+
"\n"
+
configFile
.
getAbsolutePath
()
+
"\n"
+
"INFO OPERATION.UserManagementMaintenanceTask - manage 1 groups\n"
+
"INFO OPERATION.UserManagementMaintenanceTask - manage 1 groups\n"
+
"
DEBUG
OPERATION.UserManagementMaintenanceTask - Common spaces: {}\n"
+
"
INFO
OPERATION.UserManagementMaintenanceTask - Common spaces: {}\n"
+
"ERROR OPERATION.UserManagementMaintenanceTask - No ldapGroupKeys specified for group 'ABC'. Task aborted."
,
+
"ERROR OPERATION.UserManagementMaintenanceTask - No ldapGroupKeys specified for group 'ABC'. Task aborted."
,
logRecorder
.
getLogContent
());
logRecorder
.
getLogContent
());
}
}
...
@@ -210,7 +210,7 @@ public class UserManagementMaintenanceTaskTest extends AbstractFileSystemTestCas
...
@@ -210,7 +210,7 @@ public class UserManagementMaintenanceTaskTest extends AbstractFileSystemTestCas
+
"INFO OPERATION.UserManagementMaintenanceTask - Plugin '' initialized. Configuration file: "
+
"INFO OPERATION.UserManagementMaintenanceTask - Plugin '' initialized. Configuration file: "
+
configFile
.
getAbsolutePath
()
+
"\n"
+
configFile
.
getAbsolutePath
()
+
"\n"
+
"INFO OPERATION.UserManagementMaintenanceTask - manage 1 groups\n"
+
"INFO OPERATION.UserManagementMaintenanceTask - manage 1 groups\n"
+
"
DEBUG
OPERATION.UserManagementMaintenanceTask - Common spaces: {}\n"
+
"
INFO
OPERATION.UserManagementMaintenanceTask - Common spaces: {}\n"
+
"ERROR OPERATION.UserManagementMaintenanceTask - Empty ldapGroupKey for group 'ABC'. Task aborted."
,
+
"ERROR OPERATION.UserManagementMaintenanceTask - Empty ldapGroupKey for group 'ABC'. Task aborted."
,
logRecorder
.
getLogContent
());
logRecorder
.
getLogContent
());
}
}
...
@@ -232,7 +232,7 @@ public class UserManagementMaintenanceTaskTest extends AbstractFileSystemTestCas
...
@@ -232,7 +232,7 @@ public class UserManagementMaintenanceTaskTest extends AbstractFileSystemTestCas
+
"INFO OPERATION.UserManagementMaintenanceTask - Plugin '' initialized. Configuration file: "
+
"INFO OPERATION.UserManagementMaintenanceTask - Plugin '' initialized. Configuration file: "
+
configFile
.
getAbsolutePath
()
+
"\n"
+
configFile
.
getAbsolutePath
()
+
"\n"
+
"INFO OPERATION.UserManagementMaintenanceTask - manage 1 groups\n"
+
"INFO OPERATION.UserManagementMaintenanceTask - manage 1 groups\n"
+
"
DEBUG
OPERATION.UserManagementMaintenanceTask - Common spaces: {}\n"
+
"
INFO
OPERATION.UserManagementMaintenanceTask - Common spaces: {}\n"
+
"ERROR OPERATION.UserManagementMaintenanceTask - No users found for ldapGroupKey 'a1' for group 'ABC'. Task aborted."
,
+
"ERROR OPERATION.UserManagementMaintenanceTask - No users found for ldapGroupKey 'a1' for group 'ABC'. Task aborted."
,
logRecorder
.
getLogContent
());
logRecorder
.
getLogContent
());
}
}
...
@@ -260,8 +260,8 @@ public class UserManagementMaintenanceTaskTest extends AbstractFileSystemTestCas
...
@@ -260,8 +260,8 @@ public class UserManagementMaintenanceTaskTest extends AbstractFileSystemTestCas
+
"INFO OPERATION.UserManagementMaintenanceTask - Plugin '' initialized. Configuration file: "
+
"INFO OPERATION.UserManagementMaintenanceTask - Plugin '' initialized. Configuration file: "
+
configFile
.
getAbsolutePath
()
+
"\n"
+
configFile
.
getAbsolutePath
()
+
"\n"
+
"INFO OPERATION.UserManagementMaintenanceTask - manage 1 groups\n"
+
"INFO OPERATION.UserManagementMaintenanceTask - manage 1 groups\n"
+
"
DEBUG
OPERATION.UserManagementMaintenanceTask - Common spaces: {USER=[ALPHA]}\n"
+
"
INFO
OPERATION.UserManagementMaintenanceTask - Common spaces: {USER=[ALPHA]}\n"
+
"
DEBUG
OPERATION.UserManagementMaintenanceTask - Add group SIS[name:sis, ldapGroupKeys:[s], admins:[u2]] with users [u1=u1]\n"
+
"
INFO
OPERATION.UserManagementMaintenanceTask - Add group SIS[name:sis, ldapGroupKeys:[s], admins:[u2]] with users [u1=u1]\n"
+
"INFO OPERATION.UserManagementMaintenanceTask - 1 users for group SIS\n"
+
"INFO OPERATION.UserManagementMaintenanceTask - 1 users for group SIS\n"
+
"ERROR NOTIFY.UserManagementMaintenanceTask - User management failed for the following reason(s):\n\n"
+
"ERROR NOTIFY.UserManagementMaintenanceTask - User management failed for the following reason(s):\n\n"
+
"This is a test error message\n\n"
+
"This is a test error message\n\n"
...
@@ -345,7 +345,7 @@ public class UserManagementMaintenanceTaskTest extends AbstractFileSystemTestCas
...
@@ -345,7 +345,7 @@ public class UserManagementMaintenanceTaskTest extends AbstractFileSystemTestCas
{
{
super
(
null
,
null
,
commonSpacesByRole
,
logger
,
null
);
super
(
null
,
null
,
commonSpacesByRole
,
logger
,
null
);
this
.
logger
=
logger
;
this
.
logger
=
logger
;
logger
.
log
(
LogLevel
.
DEBUG
,
"Common spaces: "
+
commonSpacesByRole
);
logger
.
log
(
LogLevel
.
INFO
,
"Common spaces: "
+
commonSpacesByRole
);
}
}
@Override
@Override
...
@@ -358,7 +358,7 @@ public class UserManagementMaintenanceTaskTest extends AbstractFileSystemTestCas
...
@@ -358,7 +358,7 @@ public class UserManagementMaintenanceTaskTest extends AbstractFileSystemTestCas
{
{
builder
.
append
(
entry
.
getKey
()
+
"="
+
entry
.
getValue
().
getUserId
());
builder
.
append
(
entry
.
getKey
()
+
"="
+
entry
.
getValue
().
getUserId
());
}
}
logger
.
log
(
LogLevel
.
DEBUG
,
"Add group "
+
renderedGroup
+
" with users ["
+
builder
+
"]"
);
logger
.
log
(
LogLevel
.
INFO
,
"Add group "
+
renderedGroup
+
" with users ["
+
builder
+
"]"
);
super
.
addGroup
(
group
,
principalsByUserId
);
super
.
addGroup
(
group
,
principalsByUserId
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment