[atunit commit] r12 - in trunk: example/atunit/example src/atunit src/atunit/core src/atunit/easymock src/atunit/...

[codesite...@google.com]

Author: logan.johnson
Date: Fri Nov 2 14:23:45 2007
New Revision: 12

Added:
trunk/src/atunit/Mock.java
- copied, changed from r9, /trunk/src/atunit/core/Mock.java
Removed:
trunk/src/atunit/core/Mock.java
trunk/src/atunit/core/OptionsException.java
Modified:
trunk/example/atunit/example/ExampleEasyMockTest.java
trunk/example/atunit/example/ExampleGuiceAndJMockTest.java
trunk/example/atunit/example/ExampleJMockTest.java
trunk/src/atunit/AtUnit.java
trunk/src/atunit/core/NoMockFramework.java
trunk/src/atunit/easymock/EasyMockFramework.java
trunk/src/atunit/jmock/JMockFramework.java
trunk/test/atunit/easymock/EasyMockFrameworkTests.java
trunk/test/atunit/jmock/JMockFrameworkTests.java

Log:
moved @Mock into top package (missed it before)

Modified: trunk/example/atunit/example/ExampleEasyMockTest.java
==============================================================================
--- trunk/example/atunit/example/ExampleEasyMockTest.java (original)
+++ trunk/example/atunit/example/ExampleEasyMockTest.java Fri Nov 2
14:23:45 2007
@@ -24,9 +24,9 @@
import org.junit.runner.RunWith;

import atunit.AtUnit;
+import atunit.Mock;
import atunit.MockFramework;
import atunit.Unit;
-import atunit.core.Mock;

/**
* This example demonstrates AtUnit's EasyMock integration.

Modified: trunk/example/atunit/example/ExampleGuiceAndJMockTest.java
==============================================================================
--- trunk/example/atunit/example/ExampleGuiceAndJMockTest.java (original)
+++ trunk/example/atunit/example/ExampleGuiceAndJMockTest.java Fri Nov
2 14:23:45 2007
@@ -25,9 +25,9 @@

-import atunit.core.Mock;
import atunit.AtUnit;
import atunit.Container;
+import atunit.Mock;
import atunit.MockFramework;
import atunit.Stub;
import atunit.Unit;

Modified: trunk/example/atunit/example/ExampleJMockTest.java
==============================================================================
--- trunk/example/atunit/example/ExampleJMockTest.java (original)
+++ trunk/example/atunit/example/ExampleJMockTest.java Fri Nov 2
14:23:45 2007
@@ -25,9 +25,9 @@
import org.junit.runner.RunWith;

import atunit.AtUnit;
+import atunit.Mock;
import atunit.MockFramework;
import atunit.Unit;
-import atunit.core.Mock;

/**
* This example shows AtUnit's JMock integration, with no container.

Modified: trunk/src/atunit/AtUnit.java
==============================================================================
--- trunk/src/atunit/AtUnit.java (original)
+++ trunk/src/atunit/AtUnit.java Fri Nov 2 14:23:45 2007
@@ -26,7 +26,6 @@

import atunit.core.Container;
import atunit.core.IncompatibleAnnotationException;
-import atunit.core.Mock;
import atunit.core.MockFramework;
import atunit.core.NoContainer;
import atunit.core.NoMockFramework;

Copied: trunk/src/atunit/Mock.java (from r9, /trunk/src/atunit/core/Mock.java)
==============================================================================
--- /trunk/src/atunit/core/Mock.java (original)
+++ trunk/src/atunit/Mock.java Fri Nov 2 14:23:45 2007
@@ -14,7 +14,7 @@
* limitations under the License.
*/

-package atunit.core;
+package atunit;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

Modified: trunk/src/atunit/core/NoMockFramework.java
==============================================================================
--- trunk/src/atunit/core/NoMockFramework.java (original)
+++ trunk/src/atunit/core/NoMockFramework.java Fri Nov 2 14:23:45 2007
@@ -20,6 +20,8 @@
import java.util.HashMap;
import java.util.Map;

+import atunit.Mock;
+
public class NoMockFramework implements MockFramework {

public Map<Field, Object> getValues(Field[] fields) throws Exception {

Modified: trunk/src/atunit/easymock/EasyMockFramework.java
==============================================================================
--- trunk/src/atunit/easymock/EasyMockFramework.java (original)
+++ trunk/src/atunit/easymock/EasyMockFramework.java Fri Nov 2
14:23:45 2007
@@ -22,8 +22,8 @@

import org.easymock.EasyMock;

+import atunit.Mock;
import atunit.Stub;
-import atunit.core.Mock;
import atunit.core.MockFramework;

public class EasyMockFramework implements MockFramework {

Modified: trunk/src/atunit/jmock/JMockFramework.java
==============================================================================
--- trunk/src/atunit/jmock/JMockFramework.java (original)
+++ trunk/src/atunit/jmock/JMockFramework.java Fri Nov 2 14:23:45 2007
@@ -27,9 +27,9 @@
import org.jmock.Mockery;
import org.jmock.integration.junit4.JUnit4Mockery;

+import atunit.Mock;
import atunit.Stub;
import atunit.core.IncompatibleAnnotationException;
-import atunit.core.Mock;
import atunit.core.MockFramework;

public class JMockFramework implements MockFramework {

Modified: trunk/test/atunit/easymock/EasyMockFrameworkTests.java
==============================================================================
--- trunk/test/atunit/easymock/EasyMockFrameworkTests.java (original)
+++ trunk/test/atunit/easymock/EasyMockFrameworkTests.java Fri Nov 2
14:23:45 2007
@@ -26,9 +26,9 @@
import org.junit.runner.RunWith;

import atunit.AtUnit;
+import atunit.Mock;
import atunit.MockFramework;
import atunit.Unit;
-import atunit.core.Mock;

public class EasyMockFrameworkTests {

Modified: trunk/test/atunit/jmock/JMockFrameworkTests.java
==============================================================================
--- trunk/test/atunit/jmock/JMockFrameworkTests.java (original)
+++ trunk/test/atunit/jmock/JMockFrameworkTests.java Fri Nov 2
14:23:45 2007
@@ -29,10 +29,10 @@
import org.junit.runner.RunWith;

import atunit.AtUnit;
+import atunit.Mock;
import atunit.MockFramework;
import atunit.Unit;
import atunit.core.IncompatibleAnnotationException;
-import atunit.core.Mock;

public class JMockFrameworkTests {