Since these classes are now in a new Java module, they need to be in …

…a different package
easymock · Mar 5, 2021 · 203cec8 · 203cec8
1 parent c6e671e
commit 203cec8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/...s/instantiator/sun/MagicInstantiator.java → ...nstantiator/exotic/MagicInstantiator.java b/...s/instantiator/sun/MagicInstantiator.java → ...nstantiator/exotic/MagicInstantiator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.objenesis.instantiator.sun;
+package org.objenesis.instantiator.exotic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;

diff --git a/...tiator/basic/NewInstanceInstantiator.java → ...iator/exotic/NewInstanceInstantiator.java b/...tiator/basic/NewInstanceInstantiator.java → ...iator/exotic/NewInstanceInstantiator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.objenesis.instantiator.basic;
+package org.objenesis.instantiator.exotic;
 
 import org.objenesis.instantiator.ObjectInstantiator;
 import org.objenesis.instantiator.annotations.Instantiator;

diff --git a/.../instantiator/basic/NullInstantiator.java → ...instantiator/exotic/NullInstantiator.java b/.../instantiator/basic/NullInstantiator.java → ...instantiator/exotic/NullInstantiator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.objenesis.instantiator.basic;
+package org.objenesis.instantiator.exotic;
 
 import org.objenesis.instantiator.ObjectInstantiator;
 import org.objenesis.instantiator.annotations.Instantiator;

diff --git a/...tantiator/basic/ProxyingInstantiator.java → ...antiator/exotic/ProxyingInstantiator.java b/...tantiator/basic/ProxyingInstantiator.java → ...antiator/exotic/ProxyingInstantiator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.objenesis.instantiator.basic;
+package org.objenesis.instantiator.exotic;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;

diff --git a/...stantiator/sun/MagicInstantiatorTest.java → ...ntiator/exotic/MagicInstantiatorTest.java b/...stantiator/sun/MagicInstantiatorTest.java → ...ntiator/exotic/MagicInstantiatorTest.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.objenesis.instantiator.sun;
+package org.objenesis.instantiator.exotic;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.objenesis.EmptyClass;
+import org.objenesis.test.EmptyClass;
 import org.objenesis.instantiator.ObjectInstantiator;
 import org.objenesis.strategy.PlatformDescription;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assume.*;
 
 /**

diff --git a/...iator/basic/ProxyingInstantiatorTest.java → ...ator/exotic/ProxyingInstantiatorTest.java b/...iator/basic/ProxyingInstantiatorTest.java → ...ator/exotic/ProxyingInstantiatorTest.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.objenesis.instantiator.basic;
+package org.objenesis.instantiator.exotic;
 
 import org.junit.Ignore;
 import org.junit.Test;
-import org.objenesis.EmptyClass;
+import org.objenesis.test.EmptyClass;
 import org.objenesis.instantiator.ObjectInstantiator;
 
 import static org.junit.Assert.*;