Several Unit test fixes. Add a Mock Indexer for Solr. Add a language for primary test Eperson. Do better context cleanup. Improve fail messages with actual errors.

dspace-api/src/test/java/org/dspace/AbstractUnitTest.java

@@ -33,6 +33,8 @@ import org.dspace.content.MetadataField;
 import org.dspace.content.NonUniqueMetadataException;
 import org.dspace.core.ConfigurationManager;
 import org.dspace.core.Context;
+import org.dspace.core.I18nUtil;
+import org.dspace.discovery.MockIndexEventConsumer;
 import org.dspace.eperson.EPerson;
 import org.dspace.search.DSIndexer;
 import org.dspace.servicemanager.DSpaceKernelImpl;
@@ -52,7 +54,7 @@ import org.xml.sax.SAXException;
  *
  * @author pvillega
  */
-@UsingMocksAndStubs({MockDatabaseManager.class, MockBrowseCreateDAOOracle.class})
+@UsingMocksAndStubs({MockDatabaseManager.class, MockBrowseCreateDAOOracle.class, MockIndexEventConsumer.class})
 public class AbstractUnitTest
 {
     /** log4j category */
@@ -147,6 +149,7 @@ public class AbstractUnitTest
                     eperson.setLastName("last");
                     eperson.setEmail("test@email.com");
                     eperson.setCanLogIn(true);
+                    eperson.setLanguage(I18nUtil.getDefaultLocale().getLanguage());
                 }
 
                 //Create search and browse indexes
@@ -349,6 +352,7 @@ public class AbstractUnitTest
         if(context != null && context.isValid())
         {
             context.abort();
+            context = null;
         }
     }
 

dspace-api/src/test/java/org/dspace/content/BitstreamFormatTest.java

@@ -61,7 +61,7 @@ public class BitstreamFormatTest extends AbstractUnitTest
         catch (SQLException ex)
         {
             log.error("SQL Error in init", ex);
-            fail("SQL Error in init");
+            fail("SQL Error in init: " + ex.getMessage());
         }
     }
 

dspace-api/src/test/java/org/dspace/content/BitstreamTest.java

@@ -58,12 +58,12 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
         }
         catch (IOException ex) {
             log.error("IO Error in init", ex);
-            fail("SQL Error in init");
+            fail("SQL Error in init: " + ex.getMessage());
         }
         catch (SQLException ex)
         {
             log.error("SQL Error in init", ex);
-            fail("SQL Error in init");
+            fail("SQL Error in init: " + ex.getMessage());
         }
     }
 
@@ -128,6 +128,8 @@ public class BitstreamTest extends AbstractDSpaceObjectTest
     {
         File f = new File(testProps.get("test.bitstream").toString());
         Bitstream created = Bitstream.create(context, new FileInputStream(f));
+        context.commit();
+        
         //the item created by default has no name nor type set
         assertThat("testCreate 0", created.getFormat().getMIMEType(), equalTo("application/octet-stream"));
         assertThat("testCreate 1", created.getName(), nullValue());

dspace-api/src/test/java/org/dspace/content/BundleTest.java

@@ -66,7 +66,7 @@ public class BundleTest extends AbstractDSpaceObjectTest
         catch (SQLException ex)
         {
             log.error("SQL Error in init", ex);
-            fail("SQL Error in init");
+            fail("SQL Error in init: " + ex.getMessage());
         }
     }
 

dspace-api/src/test/java/org/dspace/content/CollectionTest.java

@@ -63,12 +63,12 @@ public class CollectionTest extends AbstractDSpaceObjectTest
         catch (AuthorizeException ex)
         {
             log.error("Authorization Error in init", ex);
-            fail("Authorization Error in init");
+            fail("Authorization Error in init: " + ex.getMessage());
         }
         catch (SQLException ex)
         {
             log.error("SQL Error in init", ex);
-            fail("SQL Error in init");
+            fail("SQL Error in init: " + ex.getMessage());
         }
     }
 
@@ -471,6 +471,7 @@ public class CollectionTest extends AbstractDSpaceObjectTest
         context.turnOffAuthorisationSystem();
         int step = 1;
         Group g = Group.create(context);
+        context.commit();
         context.restoreAuthSystemState();
         c.setWorkflowGroup(step, g);
         assertThat("testSetWorkflowGroup 0",c.getWorkflowGroup(step), notNullValue());
@@ -1868,6 +1869,7 @@ public class CollectionTest extends AbstractDSpaceObjectTest
             context.turnOffAuthorisationSystem();
             Community parent = Community.create(null, context);
             parent.addCollection(c);
+            context.commit();
             context.restoreAuthSystemState();
             assertThat("testGetParentObject 1", c.getParentObject(), notNullValue());
             assertThat("testGetParentObject 2", (Community)c.getParentObject(), equalTo(parent));

dspace-api/src/test/java/org/dspace/content/CommunityTest.java

@@ -63,12 +63,12 @@ public class CommunityTest extends AbstractDSpaceObjectTest
         catch (AuthorizeException ex)
         {
             log.error("Authorization Error in init", ex);
-            fail("Authorization Error in init");
+            fail("Authorization Error in init:" + ex.getMessage());
         }
         catch (SQLException ex)
         {
             log.error("SQL Error in init", ex);
-            fail("SQL Error in init");
+            fail("SQL Error in init:" + ex.getMessage());
         }
     }
 

dspace-api/src/test/java/org/dspace/content/ItemTest.java

@@ -76,12 +76,12 @@ public class ItemTest  extends AbstractDSpaceObjectTest
         catch (AuthorizeException ex)
         {
             log.error("Authorization Error in init", ex);
-            fail("Authorization Error in init");
+            fail("Authorization Error in init:" + ex.getMessage());
         }
         catch (SQLException ex)
         {
             log.error("SQL Error in init", ex);
-            fail("SQL Error in init");
+            fail("SQL Error in init:" + ex.getMessage());
         }
     }
 

dspace-api/src/test/java/org/dspace/content/WorkspaceItemTest.java

@@ -53,26 +53,24 @@ public class WorkspaceItemTest extends AbstractUnitTest
             //we have to create a new community in the database
             context.turnOffAuthorisationSystem();
             Collection col = Collection.create(context);
-            col.update();
             this.wi = WorkspaceItem.create(context, col, true);
-            this.wi.update();
             //we need to commit the changes so we don't block the table for testing
             context.commit();
             context.restoreAuthSystemState();
         }
         catch (IOException ex) {
             log.error("IO Error in init", ex);
-            fail("IO Error in init");
+            fail("IO Error in init: " + ex.getMessage());
         }
         catch (AuthorizeException ex)
         {
             log.error("Authorization Error in init", ex);
-            fail("Authorization Error in init");
+            fail("Authorization Error in init: " + ex.getMessage());
         }
         catch (SQLException ex)
         {
             log.error("SQL Error in init", ex);
-            fail("SQL Error in init");
+            fail("SQL Error in init:" + ex.getMessage());
         }
     }
 
@@ -125,17 +123,17 @@ public class WorkspaceItemTest extends AbstractUnitTest
         WorkspaceItem created = null;
 
         coll = Collection.create(context);
-        coll.update();
         template = false;
         created = WorkspaceItem.create(context, coll, template);
+        context.commit();
         assertThat("testCreate 0",created,notNullValue());
         assertTrue("testCreate 1",created.getID() >= 0);
         assertThat("testCreate 2",created.getCollection(),equalTo(coll));
 
         coll = Collection.create(context);
-        coll.update();
         template = true;
         created = WorkspaceItem.create(context, coll, template);
+        context.commit();
         assertThat("testCreate 3",created,notNullValue());
         assertTrue("testCreate 4",created.getID() >= 0);
         assertThat("testCreate 5",created.getCollection(),equalTo(coll));
@@ -161,7 +159,7 @@ public class WorkspaceItemTest extends AbstractUnitTest
         WorkspaceItem created = null;
 
         coll = Collection.create(context);
-        coll.update();
+        context.commit();
         template = false;
         created = WorkspaceItem.create(context, coll, template);
         fail("Exception expected");

dspace-api/src/test/java/org/dspace/discovery/MockIndexEventConsumer.java

@@ -0,0 +1,41 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.discovery;
+
+import mockit.Mock;
+import mockit.MockClass;
+import org.dspace.core.Context;
+import org.dspace.event.Event;
+
+/**
+ * Dummy Discovery IndexEventConsumer. It essentially does nothing,
+ * as Discovery/Solr is not actively running during unit testing.
+ *
+ * @author tdonohue
+ */
+@MockClass(realClass=IndexEventConsumer.class)
+public class MockIndexEventConsumer {
+   
+    //public void initialize() throws Exception {
+        //do nothing
+    //}
+    
+    @Mock
+    public void consume(Context ctx, Event event) throws Exception {
+        //do nothing - Solr is not running during unit testing, so we cannot index test content in Solr
+    }
+    
+    @Mock
+    public void end(Context ctx) throws Exception {
+        //do nothing - Solr is not running during unit testing, so we cannot index test content in Solr
+    }
+    
+    //public void finish(Context ctx) throws Exception {
+        //do nothing
+    //}
+}