Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minor] removed use of deprecated JUnit classes

This commit is contained in:
Robert von Burg 2013-12-24 02:42:29 +01:00
parent 036c725a52
commit 744920a62b
2 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/test/java/ch/eitchnet/privilege/test/PrivilegeTest.java
View File

@ -15,13 +15,15 @@
*/
package ch.eitchnet.privilege.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.File;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import junit.framework.Assert;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
@ -53,6 +55,7 @@ import ch.eitchnet.utils.helper.FileHelper;
*
* @author Robert von Burg <eitch@eitchnet.ch>
*/
@SuppressWarnings("nls")
public class PrivilegeTest {
private static final String ADMIN = "admin";
@ -80,7 +83,7 @@ public class PrivilegeTest {
public static void init() throws Exception {
try {
destroy();
// copy configuration to tmp
String pwd = System.getProperty("user.dir");
@ -146,7 +149,7 @@ public class PrivilegeTest {
private void login(String username, byte[] password) {
Certificate certificate = privilegeHandler.authenticate(username, password);
Assert.assertTrue("Certificate is null!", certificate != null);
assertTrue("Certificate is null!", certificate != null);
PrivilegeContext privilegeContext = privilegeHandler.getPrivilegeContext(certificate);
PrivilegeContext.set(privilegeContext);
}
@ -350,10 +353,10 @@ public class PrivilegeTest {
// see if bob can perform restrictable
Restrictable restrictable = new TestRestrictable();
PrivilegeContext.get().validateAction(restrictable);
Assert.fail("Should fail as bob does not have role app");
fail("Should fail as bob does not have role app");
} catch (AccessDeniedException e) {
String msg = "User bob does not have Privilege ch.eitchnet.privilege.test.model.TestRestrictable needed for Restrictable ch.eitchnet.privilege.test.model.TestRestrictable";
Assert.assertEquals(msg, e.getLocalizedMessage());
assertEquals(msg, e.getLocalizedMessage());
} finally {
logout();
}
@ -397,10 +400,10 @@ public class PrivilegeTest {
// testFailAuthAsTedNoPass
// Will fail because user ted has no password
login(TED, ArraysHelper.copyOf(PASS_TED));
org.junit.Assert.fail("User Ted may not authenticate because the user has no password!");
fail("User Ted may not authenticate because the user has no password!");
} catch (PrivilegeException e) {
String msg = "User ted has no password and may not login!";
Assert.assertEquals(msg, e.getMessage());
assertEquals(msg, e.getMessage());
} finally {
logout();
}
@ -451,10 +454,10 @@ public class PrivilegeTest {
new HashMap<String, String>());
certificate = PrivilegeContext.get().getCertificate();
privilegeHandler.addOrReplaceUser(certificate, userRep, null);
Assert.fail("User bob may not add a user as bob does not have admin rights!");
fail("User bob may not add a user as bob does not have admin rights!");
} catch (PrivilegeException e) {
String msg = "User does not have PrivilegeAdmin role! Certificate: " + certificate;
Assert.assertEquals(msg, e.getMessage());
assertEquals(msg, e.getMessage());
} finally {
logout();
}
@ -501,10 +504,10 @@ public class PrivilegeTest {
// testFailAuthUserBob
// Will fail as user bob has no role
privilegeHandler.authenticate(BOB, ArraysHelper.copyOf(PASS_BOB));
org.junit.Assert.fail("User Bob may not authenticate because the user has no role");
fail("User Bob may not authenticate because the user has no role");
} catch (PrivilegeException e) {
String msg = "User bob does not have any roles defined!";
Assert.assertEquals(msg, e.getMessage());
assertEquals(msg, e.getMessage());
} finally {
logout();
}
@ -527,10 +530,10 @@ public class PrivilegeTest {
// testFailAuthAsBob
// Will fail because user bob is not yet enabled
privilegeHandler.authenticate(BOB, ArraysHelper.copyOf(PASS_BOB));
org.junit.Assert.fail("User Bob may not authenticate because the user is not yet enabled!");
fail("User Bob may not authenticate because the user is not yet enabled!");
} catch (PrivilegeException e) {
String msg = "User bob does not have state ENABLED and can not login!";
Assert.assertEquals(msg, e.getMessage());
assertEquals(msg, e.getMessage());
} finally {
logout();
}

42
src/test/java/ch/eitchnet/privilege/test/XmlTest.java
View File

@ -15,6 +15,9 @@
*/
package ch.eitchnet.privilege.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
@ -25,8 +28,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
import junit.framework.Assert;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@ -51,13 +52,10 @@ import ch.eitchnet.utils.helper.XmlHelper;
/**
* @author Robert von Burg <eitch@eitchnet.ch>
*
*/
@SuppressWarnings("nls")
public class XmlTest {
/**
*
*/
private static final String TARGET_TEST = "./target/test";
private static final Logger logger = LoggerFactory.getLogger(XmlTest.class);
@ -109,17 +107,17 @@ public class XmlTest {
logger.info(containerModel.toString());
// assert all objects read
Assert.assertNotNull(containerModel.getParameterMap());
Assert.assertNotNull(containerModel.getPolicies());
Assert.assertNotNull(containerModel.getEncryptionHandlerClassName());
Assert.assertNotNull(containerModel.getEncryptionHandlerParameterMap());
Assert.assertNotNull(containerModel.getPersistenceHandlerClassName());
Assert.assertNotNull(containerModel.getPersistenceHandlerParameterMap());
assertNotNull(containerModel.getParameterMap());
assertNotNull(containerModel.getPolicies());
assertNotNull(containerModel.getEncryptionHandlerClassName());
assertNotNull(containerModel.getEncryptionHandlerParameterMap());
assertNotNull(containerModel.getPersistenceHandlerClassName());
assertNotNull(containerModel.getPersistenceHandlerParameterMap());
Assert.assertEquals(1, containerModel.getParameterMap().size());
Assert.assertEquals(1, containerModel.getPolicies().size());
Assert.assertEquals(1, containerModel.getEncryptionHandlerParameterMap().size());
Assert.assertEquals(2, containerModel.getPersistenceHandlerParameterMap().size());
assertEquals(1, containerModel.getParameterMap().size());
assertEquals(1, containerModel.getPolicies().size());
assertEquals(1, containerModel.getEncryptionHandlerParameterMap().size());
assertEquals(2, containerModel.getPersistenceHandlerParameterMap().size());
// TODO extend assertions to actual model
}
@ -150,7 +148,7 @@ public class XmlTest {
configSaxWriter.write();
String fileHash = StringHelper.getHexString(FileHelper.hashFileSha256(configFile));
Assert.assertEquals("2ABD3442EEC8BCEC5BEE365AAB6DB2FD4E1789325425CB1E017E900582525685", fileHash);
assertEquals("2ABD3442EEC8BCEC5BEE365AAB6DB2FD4E1789325425CB1E017E900582525685", fileHash);
}
@Test
@ -161,12 +159,12 @@ public class XmlTest {
XmlHelper.parseDocument(xmlFile, xmlHandler);
List<User> users = xmlHandler.getUsers();
Assert.assertNotNull(users);
assertNotNull(users);
List<Role> roles = xmlHandler.getRoles();
Assert.assertNotNull(roles);
assertNotNull(roles);
Assert.assertEquals(2, users.size());
Assert.assertEquals(4, roles.size());
assertEquals(2, users.size());
assertEquals(4, roles.size());
// TODO extend assertions to actual model
}
@ -212,6 +210,6 @@ public class XmlTest {
configSaxWriter.write();
String fileHash = StringHelper.getHexString(FileHelper.hashFileSha256(modelFile));
Assert.assertEquals("A2127D20A61E00BCDBB61569CD2B200C4F0F111C972BAC3B1E54DF3B2FCDC8BE", fileHash);
assertEquals("A2127D20A61E00BCDBB61569CD2B200C4F0F111C972BAC3B1E54DF3B2FCDC8BE", fileHash);
}
}