syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [2/5] syncope git commit: [SYNCOPE-629] Format + safely delete role
Date Fri, 23 Jan 2015 16:43:12 GMT
[SYNCOPE-629] Format + safely delete role


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4efca7c3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4efca7c3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4efca7c3

Branch: refs/heads/master
Commit: 4efca7c3ec3973ab4b774a1f43e4403daf3354b7
Parents: f2d45fd
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
Authored: Wed Jan 21 06:54:34 2015 +0100
Committer: Francesco Chicchiriccò <ilgrosso@apache.org>
Committed: Wed Jan 21 06:54:34 2015 +0100

----------------------------------------------------------------------
 .../core/rest/ConfigurationTestITCase.java      | 79 +++++++++++---------
 1 file changed, 42 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/4efca7c3/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
b/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
index cbe13d5..1f981ac 100644
--- a/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
+++ b/core/src/test/java/org/apache/syncope/core/rest/ConfigurationTestITCase.java
@@ -151,22 +151,22 @@ public class ConfigurationTestITCase extends AbstractTest {
             assertTrue(e.getElements().iterator().next().contains(EntityViolationType.InvalidName.name()));
         }
     }
-    
+
     @Test
-    public void issueSYNCOPE629() throws IOException{
+    public void issueSYNCOPE629() throws IOException {
         SchemaTO membershipKey = new SchemaTO();
-        membershipKey.setName("membershipKey"+getUUIDString());
+        membershipKey.setName("membershipKey" + getUUIDString());
         membershipKey.setType(AttributeSchemaType.String);
         createSchema(AttributableType.MEMBERSHIP, SchemaType.NORMAL, membershipKey);
-        
+
         SchemaTO roleKey = new SchemaTO();
-        roleKey.setName("roleKey"+getUUIDString());
+        roleKey.setName("roleKey" + getUUIDString());
         roleKey.setType(AttributeSchemaType.String);
-        createSchema(AttributableType.ROLE, SchemaType.NORMAL, roleKey);        
-                
+        createSchema(AttributableType.ROLE, SchemaType.NORMAL, roleKey);
+
         RoleTO roleTO = new RoleTO();
         roleTO.setName("aRole" + getUUIDString());
-        roleTO.setParent(8L);        
+        roleTO.setParent(8L);
         // verify inheritance password and account policies
         roleTO.setInheritAccountPolicy(false);
         // not inherited so setter execution shouldn't be ignored
@@ -176,39 +176,44 @@ public class ConfigurationTestITCase extends AbstractTest {
         roleTO.setPasswordPolicy(2L);
         roleTO.getRAttrTemplates().add("icon");
         roleTO.getAttrs().add(attributeTO("icon", "anIcon"));
-        roleTO.getResources().add(RESOURCE_NAME_LDAP);       
+        roleTO.getResources().add(RESOURCE_NAME_LDAP);
         roleTO.getMAttrTemplates().add(membershipKey.getName());
         roleTO.getRAttrTemplates().add(roleKey.getName());
         RoleTO testRole = createRole(roleTO);
-                       
-        Response response = configurationService.export();
-        assertNotNull(response);
-        assertEquals(Response.Status.OK.getStatusCode(), response.getStatusInfo().getStatusCode());
-        assertTrue(response.getMediaType().toString().startsWith(MediaType.TEXT_XML));
-        String contentDisposition = response.getHeaderString(HttpHeaders.CONTENT_DISPOSITION);
-        assertNotNull(contentDisposition);
 
-        Object entity = response.getEntity();
-        assertTrue(entity instanceof InputStream);
-        String configExport = IOUtils.toString((InputStream) entity, SyncopeConstants.DEFAULT_ENCODING);
-        assertFalse(configExport.isEmpty());
-        assertTrue(configExport.length() > 1000);
-        
-        String[] result = StringUtils.substringsBetween(configExport, "<RATTRTEMPLATE",
"/>");
-        boolean rattrExists = false;
-        for(String entry : result){
-            if(entry.contains(roleKey.getName())) rattrExists = true;
-        }
-        assertTrue(rattrExists);
-        
-        result = StringUtils.substringsBetween(configExport, "<MATTRTEMPLATE", "/>");
-        boolean mattrExists = false;
-        for(String entry : result){
-            if(entry.contains(membershipKey.getName())) mattrExists = true;
+        try {
+            Response response = configurationService.export();
+            assertNotNull(response);
+            assertEquals(Response.Status.OK.getStatusCode(), response.getStatusInfo().getStatusCode());
+            assertTrue(response.getMediaType().toString().startsWith(MediaType.TEXT_XML));
+            String contentDisposition = response.getHeaderString(HttpHeaders.CONTENT_DISPOSITION);
+            assertNotNull(contentDisposition);
+
+            Object entity = response.getEntity();
+            assertTrue(entity instanceof InputStream);
+            String configExport = IOUtils.toString((InputStream) entity, SyncopeConstants.DEFAULT_ENCODING);
+            assertFalse(configExport.isEmpty());
+            assertTrue(configExport.length() > 1000);
+
+            String[] result = StringUtils.substringsBetween(configExport, "<RATTRTEMPLATE",
"/>");
+            boolean rattrExists = false;
+            for (String entry : result) {
+                if (entry.contains(roleKey.getName())) {
+                    rattrExists = true;
+                }
+            }
+            assertTrue(rattrExists);
+
+            result = StringUtils.substringsBetween(configExport, "<MATTRTEMPLATE", "/>");
+            boolean mattrExists = false;
+            for (String entry : result) {
+                if (entry.contains(membershipKey.getName())) {
+                    mattrExists = true;
+                }
+            }
+            assertTrue(mattrExists);
+        } finally {
+            deleteRole(testRole.getId());
         }
-        assertTrue(mattrExists);
-        
-        deleteRole(testRole.getId());
-
     }
 }


Mime
View raw message