svn commit: r1462616 - in /rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl: DefaultCategoryServiceTest.java mock/ mock/MockCategoryRepository.java

[cg...@apache.org]

Author: cgeer
Date: Fri Mar 29 19:24:27 2013
New Revision: 1462616

URL: http://svn.apache.org/r1462616
Log:
RAVE-934 - Renabled asserts on create category test.

Added:
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/mock/
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/mock/MockCategoryRepository.java
Modified:
    rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java

Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java?rev=1462616&r1=1462615&r2=1462616&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/DefaultCategoryServiceTest.java Fri Mar 29 19:24:27 2013
@@ -25,6 +25,7 @@ import org.apache.rave.portal.model.impl
 import org.apache.rave.portal.model.impl.UserImpl;
 import org.apache.rave.portal.repository.CategoryRepository;
 import org.apache.rave.portal.service.CategoryService;
+import org.apache.rave.portal.service.impl.mock.MockCategoryRepository;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -104,19 +105,26 @@ public class DefaultCategoryServiceTest 
     @Test
     public void create() {
         final String NEW_CATEGORY_TEXT = "new category";
+        final String NEW_ID = "1";
         Category expectedCategory = new CategoryImpl();
         expectedCategory.setText(NEW_CATEGORY_TEXT);
 
-        expect(repository.save(expectedCategory)).andReturn(expectedCategory);
+        expect(repository.save(expectedCategory)).andDelegateTo(new MockCategoryRepository() {
+            @Override
+            public Category save(Category item) {
+                item.setId(NEW_ID);
+                return item;
+            }
+        });
         replay(repository);
 
         Category wc = service.create(NEW_CATEGORY_TEXT, validCreatedUser);
         assertThat(wc.getText(), is(NEW_CATEGORY_TEXT));
-        // Commented out for now until a good test solution is found
-        //assertThat(wc.getCreatedDate(), is(notNullValue(Date.class)));
-        //assertThat(wc.getCreatedDate(), is(wc.getLastModifiedDate()));
-        //assertThat(wc.getCreatedUserId(), is(VALID_CREATED_USER_ID));
-        //assertThat(wc.getLastModifiedUserId(), is(VALID_CREATED_USER_ID));
+        assertThat(wc.getCreatedDate(), is(notNullValue(Date.class)));
+        assertThat(wc.getCreatedDate(), is(wc.getLastModifiedDate()));
+        assertThat(wc.getCreatedUserId(), is(VALID_CREATED_USER_ID));
+        assertThat(wc.getLastModifiedUserId(), is(VALID_CREATED_USER_ID));
+        assertThat(wc.getId(), is(NEW_ID));
 
         verify(repository);
     }

Added: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/mock/MockCategoryRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/mock/MockCategoryRepository.java?rev=1462616&view=auto
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/mock/MockCategoryRepository.java (added)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/service/impl/mock/MockCategoryRepository.java Fri Mar 29 19:24:27 2013
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rave.portal.service.impl.mock;
+
+import org.apache.rave.model.Category;
+import org.apache.rave.portal.repository.CategoryRepository;
+
+import java.util.List;
+
+public class MockCategoryRepository implements CategoryRepository {
+    @Override
+    public List<Category> getAll() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    @Override
+    public int removeFromCreatedOrModifiedFields(String userId) {
+        return 0;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    @Override
+    public Class<? extends Category> getType() {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    @Override
+    public Category get(String id) {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    @Override
+    public Category save(Category item) {
+        return null;  //To change body of implemented methods use File | Settings | File Templates.
+    }
+
+    @Override
+    public void delete(Category item) {
+        //To change body of implemented methods use File | Settings | File Templates.
+    }
+}