Renamed test package; removed some old example tests.

jmockit · Jul 17, 2015 · e2e979f · e2e979f
1 parent 1db8166
commit e2e979f
Show file tree

Hide file tree

Showing 20 changed files with 33 additions and 191 deletions.
diff --git a/main/test/integrationTests/homepage/AnotherDependency.java b/main/test/integrationTests/homepage/AnotherDependency.java
diff --git a/main/test/integrationTests/homepage/DependencyXyz.java b/main/test/integrationTests/homepage/DependencyXyz.java
diff --git a/main/test/integrationTests/homepage/JMockitExpectationsExampleTest.java b/main/test/integrationTests/homepage/JMockitExpectationsExampleTest.java
diff --git a/main/test/integrationTests/homepage/JMockitMockupsExampleTest.java b/main/test/integrationTests/homepage/JMockitMockupsExampleTest.java
diff --git a/main/test/integrationTests/homepage/JMockitVerificationsExampleTest.java b/main/test/integrationTests/homepage/JMockitVerificationsExampleTest.java
diff --git a/main/test/integrationTests/homepage/ServiceAbc.java b/main/test/integrationTests/homepage/ServiceAbc.java
diff --git a/main/test/mockit/ExpectationsForConstructorsTest.java b/main/test/mockit/ExpectationsForConstructorsTest.java
@@ -95,7 +95,7 @@ public void mockClassHierarchyWhereFirstConstructorInBaseClassIsPrivate(@Mocked
    }
 
    @SuppressWarnings({"UnnecessaryFullyQualifiedName", "UnusedParameters"})
-   static class D extends integrationTests.serviceA.ServiceA { D(String s) {} }
+   static class D extends otherTests.serviceA.ServiceA { D(String s) {} }
 
    @Test
    public void mockClassHierarchyWhereFirstConstructorInBaseClassOnAnotherPackageIsPackagePrivate(@Mocked D mock)

diff --git a/...onTests/CustomClassLoadingWithTestNG.java → ...erTests/CustomClassLoadingWithTestNG.java b/...onTests/CustomClassLoadingWithTestNG.java → ...erTests/CustomClassLoadingWithTestNG.java
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2006-2014 Rogério Liesenfeld
+ * Copyright (c) 2006-2015 Rogério Liesenfeld
  * This file is subject to the terms of the MIT license (see LICENSE.txt).
  */
-package integrationTests;
+package otherTests;
 
 import java.lang.reflect.*;
 import java.net.*;

diff --git a/main/test/integrationTests/SubclassTest.java → main/test/otherTests/SubclassTest.java b/main/test/integrationTests/SubclassTest.java → main/test/otherTests/SubclassTest.java
@@ -2,7 +2,7 @@
  * Copyright (c) 2006-2015 Rogério Liesenfeld
  * This file is subject to the terms of the MIT license (see LICENSE.txt).
  */
-package integrationTests;
+package otherTests;
 
 import static org.junit.Assert.*;
 import org.junit.*;

diff --git a/...st/integrationTests/multicast/Client.java → main/test/otherTests/multicast/Client.java b/...st/integrationTests/multicast/Client.java → main/test/otherTests/multicast/Client.java
@@ -1,8 +1,4 @@
-/*
- * Copyright (c) 2006-2011 Rogério Liesenfeld
- * This file is subject to the terms of the MIT license (see LICENSE.txt).
- */
-package integrationTests.multicast;
+package otherTests.multicast;
 
 public final class Client
 {

diff --git a/...t/integrationTests/multicast/Message.java → main/test/otherTests/multicast/Message.java b/...t/integrationTests/multicast/Message.java → main/test/otherTests/multicast/Message.java
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2006-2014 Rogério Liesenfeld
+ * Copyright (c) 2006-2015 Rogério Liesenfeld
  * This file is subject to the terms of the MIT license (see LICENSE.txt).
  */
-package integrationTests.multicast;
+package otherTests.multicast;
 
 import java.io.*;
 import java.net.*;

diff --git a/...tegrationTests/multicast/MessageTest.java → ...est/otherTests/multicast/MessageTest.java b/...tegrationTests/multicast/MessageTest.java → ...est/otherTests/multicast/MessageTest.java
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2006-2014 Rogério Liesenfeld
+ * Copyright (c) 2006-2015 Rogério Liesenfeld
  * This file is subject to the terms of the MIT license (see LICENSE.txt).
  */
-package integrationTests.multicast;
+package otherTests.multicast;
 
 import java.io.*;
 import java.net.*;

diff --git a/...rationTests/multicast/StatusListener.java → .../otherTests/multicast/StatusListener.java b/...rationTests/multicast/StatusListener.java → .../otherTests/multicast/StatusListener.java
@@ -1,8 +1,4 @@
-/*
- * Copyright (c) 2006-2011 Rogério Liesenfeld
- * This file is subject to the terms of the MIT license (see LICENSE.txt).
- */
-package integrationTests.multicast;
+package otherTests.multicast;
 
 public interface StatusListener
 {

diff --git a/...t/integrationTests/serviceA/ServiceA.java → main/test/otherTests/serviceA/ServiceA.java b/...t/integrationTests/serviceA/ServiceA.java → main/test/otherTests/serviceA/ServiceA.java
@@ -1,12 +1,8 @@
-/*
- * Copyright (c) 2006-2013 Rogério Liesenfeld
- * This file is subject to the terms of the MIT license (see LICENSE.txt).
- */
-package integrationTests.serviceA;
+package otherTests.serviceA;
 
 import java.util.*;
 
-import integrationTests.serviceB.*;
+import otherTests.serviceB.*;
 
 public class ServiceA
 {

diff --git a/...tegrationTests/serviceA/ServiceATest.java → ...est/otherTests/serviceA/ServiceATest.java b/...tegrationTests/serviceA/ServiceATest.java → ...est/otherTests/serviceA/ServiceATest.java
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2006-2014 Rogério Liesenfeld
+ * Copyright (c) 2006-2015 Rogério Liesenfeld
  * This file is subject to the terms of the MIT license (see LICENSE.txt).
  */
-package integrationTests.serviceA;
+package otherTests.serviceA;
 
 import java.util.*;
 import static java.util.Arrays.*;
@@ -12,7 +12,7 @@
 
 import mockit.*;
 
-import integrationTests.serviceB.*;
+import otherTests.serviceB.*;
 
 public final class ServiceATest
 {

diff --git a/...t/integrationTests/serviceB/ServiceB.java → main/test/otherTests/serviceB/ServiceB.java b/...t/integrationTests/serviceB/ServiceB.java → main/test/otherTests/serviceB/ServiceB.java
@@ -1,8 +1,4 @@
-/*
- * Copyright (c) 2006-2011 Rogério Liesenfeld
- * This file is subject to the terms of the MIT license (see LICENSE.txt).
- */
-package integrationTests.serviceB;
+package otherTests.serviceB;
 
 public final class ServiceB
 {

diff --git a/...t/integrationTests/textFile/TextFile.java → main/test/otherTests/textFile/TextFile.java b/...t/integrationTests/textFile/TextFile.java → main/test/otherTests/textFile/TextFile.java
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2006-2011 Rogério Liesenfeld
+ * Copyright (c) 2006-2015 Rogério Liesenfeld
  * This file is subject to the terms of the MIT license (see LICENSE.txt).
  */
-package integrationTests.textFile;
+package otherTests.textFile;
 
 import java.io.*;
 import java.util.*;
@@ -109,11 +109,13 @@ static final class DefaultTextReader implements TextReader
          reader = new FileReader(fileName);
       }
 
+      @Override
       public long skip(long n) throws IOException
       {
          return reader.skip(n);
       }
 
+      @Override
       public String readLine() throws IOException
       {
          StringBuilder buf = new StringBuilder();
@@ -131,6 +133,7 @@ public String readLine() throws IOException
          return buf.toString();
       }
 
+      @Override
       public void close() throws IOException
       {
          reader.close();

diff --git a/...xtFile/TextFileUsingExpectationsTest.java → ...xtFile/TextFileUsingExpectationsTest.java b/...xtFile/TextFileUsingExpectationsTest.java → ...xtFile/TextFileUsingExpectationsTest.java
@@ -1,18 +1,18 @@
 /*
- * Copyright (c) 2006-2014 Rogério Liesenfeld
+ * Copyright (c) 2006-2015 Rogério Liesenfeld
  * This file is subject to the terms of the MIT license (see LICENSE.txt).
  */
-package integrationTests.textFile;
+package otherTests.textFile;
 
 import java.io.*;
 import java.util.*;
 
 import org.junit.*;
+import static org.junit.Assert.*;
 
 import mockit.*;
 
-import integrationTests.textFile.TextFile.*;
-import static org.junit.Assert.*;
+import otherTests.textFile.TextFile.*;
 
 public final class TextFileUsingExpectationsTest
 {

diff --git a/...ts/textFile/TextFileUsingMockUpsTest.java → ...ts/textFile/TextFileUsingMockUpsTest.java b/...ts/textFile/TextFileUsingMockUpsTest.java → ...ts/textFile/TextFileUsingMockUpsTest.java
@@ -1,18 +1,18 @@
 /*
- * Copyright (c) 2006-2013 Rogério Liesenfeld
+ * Copyright (c) 2006-2015 Rogério Liesenfeld
  * This file is subject to the terms of the MIT license (see LICENSE.txt).
  */
-package integrationTests.textFile;
+package otherTests.textFile;
 
 import java.io.*;
 import java.util.*;
 
 import org.junit.*;
+import static org.junit.Assert.*;
 
 import mockit.*;
 
-import integrationTests.textFile.TextFile.*;
-import static org.junit.Assert.*;
+import otherTests.textFile.TextFile.*;
 
 public final class TextFileUsingMockUpsTest
 {

diff --git a/...tFile/TextFileUsingVerificationsTest.java → ...tFile/TextFileUsingVerificationsTest.java b/...tFile/TextFileUsingVerificationsTest.java → ...tFile/TextFileUsingVerificationsTest.java
@@ -1,18 +1,18 @@
 /*
- * Copyright (c) 2006-2014 Rogério Liesenfeld
+ * Copyright (c) 2006-2015 Rogério Liesenfeld
  * This file is subject to the terms of the MIT license (see LICENSE.txt).
  */
-package integrationTests.textFile;
+package otherTests.textFile;
 
 import java.io.*;
 import java.util.*;
 
 import org.junit.*;
+import static org.junit.Assert.*;
 
 import mockit.*;
 
-import integrationTests.textFile.TextFile.*;
-import static org.junit.Assert.*;
+import otherTests.textFile.TextFile.*;
 
 public final class TextFileUsingVerificationsTest
 {