Return-Path: X-Original-To: apmail-syncope-commits-archive@www.apache.org Delivered-To: apmail-syncope-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ECF9AE00F for ; Mon, 28 Jan 2013 12:02:05 +0000 (UTC) Received: (qmail 29224 invoked by uid 500); 28 Jan 2013 12:02:05 -0000 Delivered-To: apmail-syncope-commits-archive@syncope.apache.org Received: (qmail 29172 invoked by uid 500); 28 Jan 2013 12:02:04 -0000 Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@syncope.apache.org Delivered-To: mailing list commits@syncope.apache.org Received: (qmail 29147 invoked by uid 99); 28 Jan 2013 12:02:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Jan 2013 12:02:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Jan 2013 12:02:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2CE032388980; Mon, 28 Jan 2013 12:01:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1439358 - in /syncope/trunk/core/src/test: java/org/apache/syncope/core/rest/AbstractTest.java java/org/apache/syncope/core/rest/NotificationTestITCase.java resources/content.xml Date: Mon, 28 Jan 2013 12:01:42 -0000 To: commits@syncope.apache.org From: ashakirin@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130128120143.2CE032388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ashakirin Date: Mon Jan 28 12:01:42 2013 New Revision: 1439358 URL: http://svn.apache.org/viewvc?rev=1439358&view=rev Log: [SYNCOPE-289] Notification with 101 isn't needed anymore. Removed parameterized from AbstractTest Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java syncope/trunk/core/src/test/resources/content.xml Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java?rev=1439358&r1=1439357&r2=1439358&view=diff ============================================================================== --- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java (original) +++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AbstractTest.java Mon Jan 28 12:01:42 2013 @@ -21,8 +21,6 @@ package org.apache.syncope.core.rest; import static org.junit.Assert.assertNotNull; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; import java.util.List; import java.util.UUID; @@ -69,7 +67,6 @@ import org.apache.syncope.common.to.Attr import org.apache.syncope.common.validation.SyncopeClientErrorHandler; import org.junit.Before; import org.junit.runner.RunWith; -import org.junit.runners.Parameterized.Parameters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -297,10 +294,4 @@ public abstract class AbstractTest { attr.addValueToBeAdded(valueToBeAdded); return attr; } - - @Parameters - public static Collection data() { - Object[][] data = new Object[][] { { "application/json" } }; - return Arrays.asList(data); - } } Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java?rev=1439358&r1=1439357&r2=1439358&view=diff ============================================================================== --- syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java (original) +++ syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/NotificationTestITCase.java Mon Jan 28 12:01:42 2013 @@ -106,17 +106,10 @@ public class NotificationTestITCase exte @Test public void delete() { - NotificationTO notification = null; - try { - // Check for pre-loaded notification: must be deleted for other create tests success - notification = notificationService.read(101L); - } catch (SyncopeClientCompositeErrorException e) { - assertNotNull(e.getException(SyncopeClientExceptionType.NotFound)); - notification = buildNotificationTO(); - notification.setSelfAsRecipient(true); - Response response = notificationService.create(notification); - notification = response.readEntity(NotificationTO.class); - } + NotificationTO notification = buildNotificationTO(); + notification.setSelfAsRecipient(true); + Response response = notificationService.create(notification); + notification = getObject(response, NotificationTO.class, notificationService); NotificationTO deletedNotification = notificationService.delete(notification.getId()); assertNotNull(deletedNotification); Modified: syncope/trunk/core/src/test/resources/content.xml URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/content.xml?rev=1439358&r1=1439357&r2=1439358&view=diff ============================================================================== --- syncope/trunk/core/src/test/resources/content.xml (original) +++ syncope/trunk/core/src/test/resources/content.xml Mon Jan 28 12:01:42 2013 @@ -762,14 +762,14 @@ under the License. xmlAbout="%3Corg.apache.syncope.common.search.NodeCond%3E%0A++%3Ctype%3EAND%3C%2Ftype%3E%0A++%3CleftNodeCond%3E%0A++++%3Ctype%3ELEAF%3C%2Ftype%3E%0A++++%3CattributeCond%3E%0A++++++%3Ctype%3ELIKE%3C%2Ftype%3E%0A++++++%3Cschema%3Efullname%3C%2Fschema%3E%0A++++++%3Cexpression%3E%25o%25%3C%2Fexpression%3E%0A++++%3C%2FattributeCond%3E%0A++%3C%2FleftNodeCond%3E%0A++%3CrightNodeCond%3E%0A++++%3Ctype%3ELEAF%3C%2Ftype%3E%0A++++%3CattributeCond%3E%0A++++++%3Ctype%3ELIKE%3C%2Ftype%3E%0A++++++%3Cschema%3Efullname%3C%2Fschema%3E%0A++++++%3Cexpression%3E%25i%25%3C%2Fexpression%3E%0A++++%3C%2FattributeCond%3E%0A++%3C%2FrightNodeCond%3E%0A%3C%2Forg.apache.syncope.common.search.NodeCond%3E" xmlRecipients="%3Corg.apache.syncope.common.search.NodeCond%3E%0A++%3Ctype%3ELEAF%3C%2Ftype%3E%0A++%3CmembershipCond%3E%0A++++%3CroleId%3E7%3C%2FroleId%3E%0A++%3C%2FmembershipCond%3E%0A%3C%2Forg.apache.syncope.common.search.NodeCond%3E" recipientAttrType="UserSchema" recipientAttrName="email"/> - + recipientAttrType="UserSchema" recipientAttrName="email"/--> - - + +