You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2012/05/16 20:50:32 UTC
[41/44] git commit: Mark a number of TestNG/EasyMock related classes
as deprecated with no replacement
Mark a number of TestNG/EasyMock related classes as deprecated with no replacement
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/52c219ec
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/52c219ec
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/52c219ec
Branch: refs/heads/master
Commit: 52c219ec94c6e8a7a2078aa48687a16fd9a7ba78
Parents: c776b88
Author: Howard M. Lewis Ship <hl...@gmail.com>
Authored: Sun Apr 15 05:48:10 2012 -0700
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Wed May 16 11:49:40 2012 -0700
----------------------------------------------------------------------
.../org/apache/tapestry5/ioc/test/IOCTestCase.java | 25 ++++++---------
.../org/apache/tapestry5/ioc/test/MockTester.java | 3 +-
.../org/apache/tapestry5/ioc/test/TestBase.java | 9 ++---
.../org/apache/tapestry5/ioc/test/TestUtils.java | 7 ++--
4 files changed, 19 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/52c219ec/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/IOCTestCase.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/IOCTestCase.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/IOCTestCase.java
index 182f691..332377d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/IOCTestCase.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/IOCTestCase.java
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007, 2008, 2010, 2011 The Apache Software Foundation
+// Copyright 2006, 2007, 2008, 2010, 2011, 2012 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,8 +14,11 @@
package org.apache.tapestry5.ioc.test;
-import static java.lang.Thread.sleep;
-import static org.easymock.EasyMock.isA;
+import org.apache.tapestry5.ioc.*;
+import org.apache.tapestry5.ioc.annotations.IntermediateType;
+import org.apache.tapestry5.ioc.def.*;
+import org.apache.tapestry5.ioc.services.*;
+import org.slf4j.Logger;
import java.io.File;
import java.lang.annotation.Annotation;
@@ -23,21 +26,13 @@ import java.lang.reflect.Method;
import java.net.URL;
import java.util.Locale;
-import org.apache.tapestry5.ioc.*;
-import org.apache.tapestry5.ioc.annotations.IntermediateType;
-import org.apache.tapestry5.ioc.def.*;
-import org.apache.tapestry5.ioc.services.ClassPropertyAdapter;
-import org.apache.tapestry5.ioc.services.MasterObjectProvider;
-import org.apache.tapestry5.ioc.services.PerthreadManager;
-import org.apache.tapestry5.ioc.services.PropertyAccess;
-import org.apache.tapestry5.ioc.services.PropertyAdapter;
-import org.apache.tapestry5.ioc.services.SymbolSource;
-import org.apache.tapestry5.ioc.services.ThreadLocale;
-import org.apache.tapestry5.ioc.services.TypeCoercer;
-import org.slf4j.Logger;
+import static java.lang.Thread.sleep;
+import static org.easymock.EasyMock.isA;
/**
* Add factory and trainer methods for the public interfaces of Tapestry IOC.
+ *
+ * @deprecated In 5.4, with no replacement
*/
public class IOCTestCase extends TestBase
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/52c219ec/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/MockTester.java
----------------------------------------------------------------------
diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/MockTester.java b/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/MockTester.java
index 9b354ff..eba74ec 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/MockTester.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/MockTester.java
@@ -1,4 +1,4 @@
-// Copyright 2007, 2011 The Apache Software Foundation
+// Copyright 2007, 2011, 2012 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import org.easymock.IMocksControl;
* <p>
* This class was originally in the tapestry-ioc module as was moved to tapestry-test; the package name was not changed
* to ensure backwards compatibility.
+ * @deprecated In 5.4, with no replacement
*/
public final class MockTester
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/52c219ec/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestBase.java
----------------------------------------------------------------------
diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestBase.java b/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestBase.java
index b84130e..5bb263e 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestBase.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestBase.java
@@ -1,4 +1,4 @@
-// Copyright 2006, 2007, 2008, 2010, 2011 The Apache Software Foundation
+// Copyright 2006, 2007, 2008, 2010, 2011, 2012 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,11 +14,7 @@
package org.apache.tapestry5.ioc.test;
-import org.easymock.Capture;
-import org.easymock.EasyMock;
-import org.easymock.IAnswer;
-import org.easymock.IExpectationSetters;
-import org.easymock.IMocksControl;
+import org.easymock.*;
import org.testng.annotations.AfterMethod;
/**
@@ -42,6 +38,7 @@ import org.testng.annotations.AfterMethod;
*
* @see org.easymock.EasyMock#createControl()
* @see org.apache.tapestry5.ioc.test.MockTester
+ * @deprecated In 5.4, with no replacement
*/
public class TestBase extends TestUtils
{
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/52c219ec/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestUtils.java
----------------------------------------------------------------------
diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestUtils.java b/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestUtils.java
index 66da8d6..31bf6fb 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestUtils.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/ioc/test/TestUtils.java
@@ -1,4 +1,4 @@
-// Copyright 2010, 2011 The Apache Software Foundation
+// Copyright 2010, 2011, 2012 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -14,13 +14,13 @@
package org.apache.tapestry5.ioc.test;
+import org.testng.Assert;
+
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.testng.Assert;
-
/**
* Extra assertions on top of the standard set, packaged as a base class for easy referencing in tests. Also,
* utilities for instantiation objects and setting and reading private fields of those objects.
@@ -29,6 +29,7 @@ import org.testng.Assert;
* to ensure backwards compatibility.
*
* @since 5.2.0
+ * @deprecated In 5.4, with no replacement
*/
public class TestUtils extends Assert
{