From 6ef500804b92e07b615ce2c5dbf2b009af4108fa Mon Sep 17 00:00:00 2001
From: Jon Brisbin <jbrisbin@vmware.com>
Date: Sat, 2 Mar 2013 11:50:09 -0600
Subject: [PATCH] Tweak abstract base tests.

---
 .../org/springframework/data/rest/AbstractJMockTests.java  | 7 ++-----
 .../org/springframework/data/rest/AbstractJMockTests.java  | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/spring-data-rest-core/src/test/java/org/springframework/data/rest/AbstractJMockTests.java b/spring-data-rest-core/src/test/java/org/springframework/data/rest/AbstractJMockTests.java
index 1e87fc0da..10f2463c0 100644
--- a/spring-data-rest-core/src/test/java/org/springframework/data/rest/AbstractJMockTests.java
+++ b/spring-data-rest-core/src/test/java/org/springframework/data/rest/AbstractJMockTests.java
@@ -1,19 +1,16 @@
 package org.springframework.data.rest;
 
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
+import org.jmock.integration.junit4.JUnitRuleMockery;
 import org.jmock.lib.legacy.ClassImposteriser;
-import org.junit.runner.RunWith;
 
 /**
  * Abstract base classes for JUnit tests that use JMock.
  *
  * @author Jon Brisbin
  */
-@RunWith(JMock.class)
 public abstract class AbstractJMockTests {
 
-  protected JUnit4Mockery context = new JUnit4Mockery() {{
+  protected JUnitRuleMockery context = new JUnitRuleMockery() {{
     setImposteriser(ClassImposteriser.INSTANCE);
   }};
 
diff --git a/spring-data-rest-repository/src/test/java/org/springframework/data/rest/AbstractJMockTests.java b/spring-data-rest-repository/src/test/java/org/springframework/data/rest/AbstractJMockTests.java
index 1e87fc0da..10f2463c0 100644
--- a/spring-data-rest-repository/src/test/java/org/springframework/data/rest/AbstractJMockTests.java
+++ b/spring-data-rest-repository/src/test/java/org/springframework/data/rest/AbstractJMockTests.java
@@ -1,19 +1,16 @@
 package org.springframework.data.rest;
 
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
+import org.jmock.integration.junit4.JUnitRuleMockery;
 import org.jmock.lib.legacy.ClassImposteriser;
-import org.junit.runner.RunWith;
 
 /**
  * Abstract base classes for JUnit tests that use JMock.
  *
  * @author Jon Brisbin
  */
-@RunWith(JMock.class)
 public abstract class AbstractJMockTests {
 
-  protected JUnit4Mockery context = new JUnit4Mockery() {{
+  protected JUnitRuleMockery context = new JUnitRuleMockery() {{
     setImposteriser(ClassImposteriser.INSTANCE);
   }};