You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2007/11/12 23:23:28 UTC
svn commit: r594319 [37/40] - in /tapestry/tapestry5/trunk: ./
tapestry-annotations/
tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/
tapestry-annotations/src/site/ tapestry-component-report/
tapestry-component-report/src/main/java/or...
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/UpcaseService.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/UpcaseService.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/UpcaseService.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/UpcaseService.java Mon Nov 12 14:22:31 2007
@@ -1,26 +1,26 @@
-// Copyright 2006 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.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal;
/**
* Used by {@link org.apache.tapestry.ioc.internal.SingletonServiceLifecycleTest}.
- *
- *
*/
public interface UpcaseService
{
- /** Returns the uppercase version of an input string. */
+ /**
+ * Returns the uppercase version of an input string.
+ */
String upcase(String input);
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/UpcaseServiceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/UpcaseServiceImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/UpcaseServiceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/UpcaseServiceImpl.java Mon Nov 12 14:22:31 2007
@@ -1,21 +1,21 @@
-// Copyright 2006 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.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal;
/**
- *
+ *
*/
public class UpcaseServiceImpl implements UpcaseService
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ValidatingConfigurationWrapperTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ValidatingConfigurationWrapperTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ValidatingConfigurationWrapperTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ValidatingConfigurationWrapperTest.java Mon Nov 12 14:22:31 2007
@@ -35,7 +35,7 @@
replay();
Configuration wrapper = new ValidatingConfigurationWrapper("foo.Bar", logger,
- Runnable.class, def, configuration);
+ Runnable.class, def, configuration);
wrapper.add(value);
@@ -49,14 +49,14 @@
Logger logger = mockLogger();
Configuration configuration = mockConfiguration();
ContributionDef def = new ContributionDefImpl("Bar", findMethod("contributeUnorderedNull"),
- getClassFactory());
+ getClassFactory());
logger.warn(IOCMessages.contributionWasNull("Bar", def));
replay();
Configuration wrapper = new ValidatingConfigurationWrapper("Bar", logger, Runnable.class,
- def, configuration);
+ def, configuration);
wrapper.add(null);
@@ -70,7 +70,7 @@
Logger logger = mockLogger();
Configuration configuration = mockConfiguration();
ContributionDef def = new ContributionDefImpl("Bar", findMethod("contributeUnorderedNull"),
- getClassFactory());
+ getClassFactory());
logger.warn(IOCMessages
.contributionWrongValueType("Bar", def, String.class, Runnable.class));
@@ -78,7 +78,7 @@
replay();
Configuration wrapper = new ValidatingConfigurationWrapper("Bar", logger, Runnable.class,
- def, configuration);
+ def, configuration);
wrapper.add("runnable");
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ValidatingMappedConfigurationWrapperTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ValidatingMappedConfigurationWrapperTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ValidatingMappedConfigurationWrapperTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ValidatingMappedConfigurationWrapperTest.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,15 @@
package org.apache.tapestry.ioc.internal;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-
-import java.util.List;
-import java.util.Map;
-
import org.apache.tapestry.ioc.MappedConfiguration;
import org.apache.tapestry.ioc.def.ContributionDef;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import org.slf4j.Logger;
import org.testng.annotations.Test;
+import java.util.List;
+import java.util.Map;
+
public class ValidatingMappedConfigurationWrapperTest extends IOCInternalTestCase
{
private static final String SERVICE_ID = "Baz";
@@ -119,7 +118,8 @@
replay();
MappedConfiguration wrapper = new ValidatingMappedConfigurationWrapper(SERVICE_ID, def,
- logger, Class.class, Runnable.class, keyToContribution, delegate);
+ logger, Class.class, Runnable.class,
+ keyToContribution, delegate);
wrapper.add("java.util.List", value);
@@ -144,7 +144,8 @@
replay();
MappedConfiguration wrapper = new ValidatingMappedConfigurationWrapper(SERVICE_ID, def,
- logger, Class.class, Runnable.class, keyToContribution, delegate);
+ logger, Class.class, Runnable.class,
+ keyToContribution, delegate);
wrapper.add(List.class, "do something");
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ValidatingOrderedConfigurationWrapperTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ValidatingOrderedConfigurationWrapperTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ValidatingOrderedConfigurationWrapperTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/ValidatingOrderedConfigurationWrapperTest.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,13 @@
package org.apache.tapestry.ioc.internal;
-import java.lang.reflect.Method;
-
import org.apache.tapestry.ioc.OrderedConfiguration;
import org.apache.tapestry.ioc.def.ContributionDef;
import org.slf4j.Logger;
import org.testng.annotations.Test;
+import java.lang.reflect.Method;
+
public class ValidatingOrderedConfigurationWrapperTest extends IOCInternalTestCase
{
@Test
@@ -103,7 +103,7 @@
replay();
OrderedConfiguration wrapper = new ValidatingOrderedConfigurationWrapper("Service", def,
- log, Runnable.class, configuration);
+ log, Runnable.class, configuration);
wrapper.add("id", "string");
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/VoidBuilderMethodModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/VoidBuilderMethodModule.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/VoidBuilderMethodModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/VoidBuilderMethodModule.java Mon Nov 12 14:22:31 2007
@@ -1,27 +1,27 @@
-// Copyright 2006 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.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal;
/**
* Used by {@link org.apache.tapestry.ioc.internal.DefaultModuleDefImplTest}.
- *
- *
*/
public class VoidBuilderMethodModule
{
- /** Builder methods should not return void. */
+ /**
+ * Builder methods should not return void.
+ */
public void buildNull()
{
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/VoidDecoratorMethodModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/VoidDecoratorMethodModule.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/VoidDecoratorMethodModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/VoidDecoratorMethodModule.java Mon Nov 12 14:22:31 2007
@@ -1,29 +1,27 @@
-// Copyright 2006 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.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal;
/**
* Used by {@link org.apache.tapestry.ioc.internal.DefaultModuleDefImplTest}.
- *
- *
*/
public class VoidDecoratorMethodModule
{
/**
* Decorator methods are not supposed to return void. They can return null.
- *
+ *
* @param delegate
*/
public void decorateVoid(Object delegate)
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/BridgeBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/BridgeBuilderTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/BridgeBuilderTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/BridgeBuilderTest.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,12 @@
package org.apache.tapestry.ioc.internal.services;
-import java.io.Serializable;
-
import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
import org.apache.tapestry.ioc.services.ClassFactory;
import org.slf4j.Logger;
import org.testng.annotations.Test;
+
+import java.io.Serializable;
public class BridgeBuilderTest extends IOCInternalTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ChainBuilderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ChainBuilderImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ChainBuilderImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ChainBuilderImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,13 @@
package org.apache.tapestry.ioc.internal.services;
-import java.util.Arrays;
-import java.util.List;
-
import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
import org.apache.tapestry.ioc.services.ChainBuilder;
import org.testng.Assert;
import org.testng.annotations.Test;
+
+import java.util.Arrays;
+import java.util.List;
public class ChainBuilderImplTest extends IOCInternalTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ChainCommand.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ChainCommand.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ChainCommand.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ChainCommand.java Mon Nov 12 14:22:31 2007
@@ -1,23 +1,21 @@
-// Copyright 2006 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.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal.services;
/**
* Used with {@link org.apache.tapestry.ioc.internal.services.ChainBuilderImplTest}.
- *
- *
*/
public interface ChainCommand
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ClassFabImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ClassFabImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ClassFabImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ClassFabImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,7 @@
package org.apache.tapestry.ioc.internal.services;
-import java.io.Serializable;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Modifier;
-import java.util.List;
-import java.util.Map;
-import java.util.zip.DataFormatException;
-
import javassist.CtClass;
-
import org.apache.tapestry.ioc.BaseLocatable;
import org.apache.tapestry.ioc.internal.services.LoggingDecoratorImplTest.ToStringService;
import org.apache.tapestry.ioc.services.ClassFab;
@@ -32,6 +24,13 @@
import org.slf4j.LoggerFactory;
import org.testng.annotations.Test;
+import java.io.Serializable;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Modifier;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.DataFormatException;
+
public class ClassFabImplTest extends IOCTestCase
{
private final CtClassSource _source;
@@ -78,13 +77,13 @@
cf.addField("_stringValue", String.class);
MethodSignature setStringValue = new MethodSignature(void.class, "setStringValue",
- new Class[]
- { String.class }, null);
+ new Class[]
+ {String.class}, null);
cf.addMethod(Modifier.PUBLIC, setStringValue, "_stringValue = $1;");
MethodSignature getStringValue = new MethodSignature(String.class, "getStringValue", null,
- null);
+ null);
cf.addMethod(Modifier.PUBLIC, getStringValue, "return _stringValue;");
@@ -122,7 +121,7 @@
cf.addField("_delegate", SampleService.class);
cf.addConstructor(new Class[]
- { SampleService.class }, null, "_delegate = $1;");
+ {SampleService.class}, null, "_delegate = $1;");
cf.proxyMethodsToDelegate(SampleService.class, "_delegate", "<Delegator>");
@@ -157,7 +156,7 @@
cf.addField("_delegate", ToStringService.class);
cf.addConstructor(new Class[]
- { ToStringService.class }, null, "_delegate = $1;");
+ {ToStringService.class}, null, "_delegate = $1;");
cf.proxyMethodsToDelegate(ToStringService.class, "_delegate", "<ToStringDelegator>");
@@ -184,10 +183,10 @@
cf.addField("_stringValue", String.class);
cf.addConstructor(new Class[]
- { String.class }, null, "{ _stringValue = $1; }");
+ {String.class}, null, "{ _stringValue = $1; }");
MethodSignature getStringValue = new MethodSignature(String.class, "getStringValue", null,
- null);
+ null);
cf.addMethod(Modifier.PUBLIC, getStringValue, "return _stringValue;");
@@ -205,7 +204,7 @@
Constructor c = targetClass.getConstructors()[0];
Object targetBean = c.newInstance(new Object[]
- { "Buffy" });
+ {"Buffy"});
String actual = (String) _access.get(targetBean, "stringValue");
@@ -219,7 +218,7 @@
cf.addField("_intValue", int.class);
cf.addConstructor(new Class[]
- { int.class }, null, "{ _intValue = $1; }");
+ {int.class}, null, "{ _intValue = $1; }");
cf.addMethod(
Modifier.PUBLIC,
@@ -230,7 +229,7 @@
Constructor c = targetClass.getConstructors()[0];
AbstractIntWrapper targetBean = (AbstractIntWrapper) c.newInstance(new Object[]
- { new Integer(137) });
+ {new Integer(137)});
assertEquals(targetBean.getIntValue(), 137);
}
@@ -264,7 +263,7 @@
cf.addInterface(SimpleService.class);
cf.addMethod(Modifier.PUBLIC, new MethodSignature(int.class, "add", new Class[]
- { int.class, int.class }, null), "return $1 + $2;");
+ {int.class, int.class}, null), "return $1 + $2;");
Class targetClass = cf.createClass();
@@ -402,12 +401,12 @@
cf.addField("_map", Map.class);
cf.addConstructor(new Class[]
- { Map.class, Runnable.class }, new Class[]
- { IllegalArgumentException.class, DataFormatException.class }, "{ _map = $1; }");
+ {Map.class, Runnable.class}, new Class[]
+ {IllegalArgumentException.class, DataFormatException.class}, "{ _map = $1; }");
MethodSignature sig = new MethodSignature(Map.class, "doTheNasty", new Class[]
- { int.class, String.class }, new Class[]
- { InstantiationException.class, IllegalAccessException.class });
+ {int.class, String.class}, new Class[]
+ {InstantiationException.class, IllegalAccessException.class});
cf.addMethod(
Modifier.PUBLIC + Modifier.FINAL + Modifier.SYNCHRONIZED,
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ClassFactoryImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ClassFactoryImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ClassFactoryImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ClassFactoryImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,10 +14,6 @@
package org.apache.tapestry.ioc.internal.services;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.internal.util.LocationImpl;
import org.apache.tapestry.ioc.services.ClassFab;
@@ -27,6 +23,10 @@
import org.apache.tapestry.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+
public class ClassFactoryImplTest extends IOCTestCase
{
public static class BaseClass
@@ -136,7 +136,7 @@
.getConstructorLocation(cc)
.toString()
.matches(
- "org.apache.tapestry.ioc.internal.services.LineNumberBean\\(String, int\\) \\(at LineNumberBean.java:(19|20)\\)"));
+ "org.apache.tapestry.ioc.internal.services.LineNumberBean\\(String, int\\) \\(at LineNumberBean.java:(19|20)\\)"));
}
/**
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ExceptionAnalyzerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ExceptionAnalyzerImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ExceptionAnalyzerImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ExceptionAnalyzerImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
package org.apache.tapestry.ioc.internal.services;
-import java.util.Arrays;
-
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
import org.apache.tapestry.ioc.internal.util.TapestryException;
@@ -25,6 +23,8 @@
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+
+import java.util.Arrays;
public class ExceptionAnalyzerImplTest extends IOCInternalTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ExceptionTrackerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ExceptionTrackerImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ExceptionTrackerImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ExceptionTrackerImplTest.java Mon Nov 12 14:22:31 2007
@@ -1,25 +1,25 @@
-// Copyright 2006 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.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal.services;
-import org.apache.tapestry.ioc.services.ExceptionTracker;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.apache.tapestry.ioc.services.ExceptionTracker;
+import org.testng.Assert;
+import org.testng.annotations.Test;
/**
- *
+ *
*/
public class ExceptionTrackerImplTest extends Assert
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/FilterMethodAnalyzerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/FilterMethodAnalyzerTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/FilterMethodAnalyzerTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/FilterMethodAnalyzerTest.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,11 @@
package org.apache.tapestry.ioc.internal.services;
-import java.lang.reflect.Method;
-
import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
import org.apache.tapestry.ioc.services.MethodSignature;
import org.testng.annotations.Test;
+
+import java.lang.reflect.Method;
public class FilterMethodAnalyzerTest extends IOCInternalTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/KindOf.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/KindOf.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/KindOf.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/KindOf.java Mon Nov 12 14:22:31 2007
@@ -14,7 +14,9 @@
package org.apache.tapestry.ioc.internal.services;
-/** Converts an object to a string describing the kind of the object. */
+/**
+ * Converts an object to a string describing the kind of the object.
+ */
public interface KindOf
{
String kindOf(Object value);
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/MasterObjectProviderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/MasterObjectProviderImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/MasterObjectProviderImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/MasterObjectProviderImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,15 @@
package org.apache.tapestry.ioc.internal.services;
-import java.util.Arrays;
-import java.util.List;
-
import org.apache.tapestry.ioc.AnnotationProvider;
import org.apache.tapestry.ioc.ObjectLocator;
import org.apache.tapestry.ioc.ObjectProvider;
import org.apache.tapestry.ioc.test.IOCTestCase;
import org.apache.tapestry.services.MasterObjectProvider;
import org.testng.annotations.Test;
+
+import java.util.Arrays;
+import java.util.List;
public class MasterObjectProviderImplTest extends IOCTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/PipelineBuilderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/PipelineBuilderImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/PipelineBuilderImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/PipelineBuilderImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,18 +14,17 @@
package org.apache.tapestry.ioc.internal.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-
-import java.util.Arrays;
-import java.util.List;
-
import org.apache.tapestry.ioc.Registry;
import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import org.apache.tapestry.ioc.services.PipelineBuilder;
import org.slf4j.Logger;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+
+import java.util.Arrays;
+import java.util.List;
/**
* Integration tests for the PipelineBuilder service.
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/PropertyAccessImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,6 @@
package org.apache.tapestry.ioc.internal.services;
-import java.awt.Image;
-import java.beans.BeanDescriptor;
-import java.beans.BeanInfo;
-import java.beans.EventSetDescriptor;
-import java.beans.MethodDescriptor;
-import java.beans.PropertyDescriptor;
-import java.util.Arrays;
-import java.util.Random;
-
import org.apache.tapestry.ioc.Registry;
import org.apache.tapestry.ioc.annotations.Scope;
import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
@@ -30,6 +21,11 @@
import org.apache.tapestry.ioc.services.PropertyAccess;
import org.apache.tapestry.ioc.services.PropertyAdapter;
import org.testng.annotations.Test;
+
+import java.awt.*;
+import java.beans.*;
+import java.util.Arrays;
+import java.util.Random;
public class PropertyAccessImplTest extends IOCInternalTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/RegistryShutdownHubImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/RegistryShutdownHubImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/RegistryShutdownHubImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/RegistryShutdownHubImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,10 @@
package org.apache.tapestry.ioc.internal.services;
-import static org.easymock.EasyMock.contains;
-import static org.easymock.EasyMock.same;
-
import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
import org.apache.tapestry.ioc.services.RegistryShutdownListener;
+import static org.easymock.EasyMock.contains;
+import static org.easymock.EasyMock.same;
import org.slf4j.Logger;
import org.testng.annotations.Test;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/RegistryStartupTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/RegistryStartupTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/RegistryStartupTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/RegistryStartupTest.java Mon Nov 12 14:22:31 2007
@@ -14,17 +14,19 @@
package org.apache.tapestry.ioc.internal.services;
-import java.util.List;
-
import org.apache.tapestry.ioc.Registry;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.test.IOCTestCase;
import org.slf4j.Logger;
import org.testng.annotations.Test;
+import java.util.List;
+
public class RegistryStartupTest extends IOCTestCase
{
- /** Runnable runs. */
+ /**
+ * Runnable runs.
+ */
@Test
public void success()
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SampleFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SampleFilter.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SampleFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SampleFilter.java Mon Nov 12 14:22:31 2007
@@ -16,8 +16,6 @@
/**
* Used by {@link org.apache.tapestry.ioc.internal.services.FilterMethodAnalyzer}.
- *
- *
*/
public interface SampleFilter
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SampleService.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SampleService.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SampleService.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SampleService.java Mon Nov 12 14:22:31 2007
@@ -16,8 +16,6 @@
/**
* Used by {@link org.apache.tapestry.ioc.internal.services.FilterMethodAnalyzer}.
- *
- *
*/
public interface SampleService
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceLoggerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceLoggerTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceLoggerTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ServiceLoggerTest.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,13 @@
package org.apache.tapestry.ioc.internal.services;
-import java.util.Arrays;
-
import org.apache.tapestry.ioc.services.ExceptionTracker;
import org.apache.tapestry.ioc.test.IOCTestCase;
import org.slf4j.Logger;
import org.testng.annotations.Test;
+import java.util.Arrays;
+
public class ServiceLoggerTest extends IOCTestCase
{
private void try_entry(String methodName, String expected, Object... arguments)
@@ -65,7 +65,7 @@
try_entry("yogi", "yogi(null, null)", null, null);
try_entry("wilma", "wilma(1, 2, 3)", 1, 2, 3);
try_entry("betty", "betty(\"rubble\", {1, 2, 3, \"four\"})", "rubble", new Object[]
- { 1, 2, 3, "four" });
+ {1, 2, 3, "four"});
try_entry("betty", "betty(\"rubble\", [1, 2, 3, \"four\", [5, 6]])", "rubble", Arrays
.asList(1, 2, 3, "four", Arrays.asList(5, 6)));
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/StrategyBuilderImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,17 +14,16 @@
package org.apache.tapestry.ioc.internal.services;
+import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry.ioc.services.StrategyBuilder;
+import org.apache.tapestry.ioc.util.StrategyRegistry;
+import org.testng.annotations.Test;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import org.apache.tapestry.ioc.services.StrategyBuilder;
-import org.apache.tapestry.ioc.util.StrategyRegistry;
-import org.testng.annotations.Test;
-
public class StrategyBuilderImplTest extends IOCInternalTestCase
{
private static class KindOfImpl implements KindOf
@@ -41,7 +40,9 @@
return _value;
}
- };
+ }
+
+ ;
@Test
public void standard()
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SymbolObjectProviderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SymbolObjectProviderTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SymbolObjectProviderTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SymbolObjectProviderTest.java Mon Nov 12 14:22:31 2007
@@ -74,7 +74,7 @@
}
protected final void train_valueForSymbol(SymbolSource source, String symbolName,
- String symbolValue)
+ String symbolValue)
{
expect(source.valueForSymbol(symbolName)).andReturn(symbolValue);
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SymbolSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SymbolSourceImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SymbolSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/SymbolSourceImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,15 @@
package org.apache.tapestry.ioc.internal.services;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
import org.apache.tapestry.ioc.services.SymbolProvider;
import org.apache.tapestry.ioc.services.SymbolSource;
import org.testng.annotations.Test;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
public class SymbolSourceImplTest extends IOCInternalTestCase
{
@Test
@@ -287,14 +287,14 @@
SymbolSource source = getService(SymbolSource.class);
// SystemPropertiesSymbolProvider is available by default
-
+
String userName = System.getProperty("user.name");
assertEquals(source.valueForSymbol("user.name"), userName);
}
protected final void train_valueForSymbol(SymbolProvider provider, String symbolName,
- String value)
+ String value)
{
expect(provider.valueForSymbol(symbolName)).andReturn(value);
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,12 @@
package org.apache.tapestry.ioc.internal.services;
-import java.util.Locale;
-
import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
import org.apache.tapestry.ioc.services.ThreadLocale;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+
+import java.util.Locale;
public class ThreadLocaleImplTest extends IOCInternalTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/services/TypeCoercerImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,6 @@
package org.apache.tapestry.ioc.internal.services;
-import java.io.File;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
import org.apache.tapestry.ioc.services.TypeCoercer;
import org.testng.annotations.AfterClass;
@@ -31,6 +22,11 @@
import org.testng.annotations.Test;
import org.xml.sax.XMLReader;
+import java.io.File;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.*;
+
public class TypeCoercerImplTest extends IOCInternalTestCase
{
private TypeCoercer _coercer;
@@ -115,7 +111,7 @@
assertTrue(ex
.getMessage()
.contains(
- "Coercion of {} to type java.lang.Float (via Object --> String, String --> Double, Double --> Float) failed"));
+ "Coercion of {} to type java.lang.Float (via Object --> String, String --> Double, Double --> Float) failed"));
assertTrue(ex.getCause() instanceof NumberFormatException);
}
}
@@ -144,63 +140,63 @@
byte byte1 = 12, byte2 = 56;
short short1 = 34, short2 = 98;
return new Object[][]
- {
- // There's a lot of these!
+ {
+ // There's a lot of these!
- { this, String.class, toString() },
- { 55l, Integer.class, 55 },
- { "", Boolean.class, false },
- { " ", Boolean.class, false },
- { "x", Boolean.class, true },
- { " z ", Boolean.class, true },
- { "false", Boolean.class, false },
- { " False ", Boolean.class, false },
- { null, Boolean.class, false },
- { new Double(256), Integer.class, new Integer(256) },
- { new Double(22.7), Integer.class, new Integer(22) },
- { new Integer(0), Boolean.class, false },
- { new Long(32838), Boolean.class, true },
- { new Integer(127), Byte.class, new Byte("127") },
- { new Double(58), Short.class, new Short("58") },
- { new Integer(33), Long.class, new Long(33) },
- { new Integer(22), Float.class, new Float(22) },
- { new Integer(1234), Double.class, new Double(1234) },
- { floatValue, Double.class, floatValue.doubleValue() },
- { Collections.EMPTY_LIST, Boolean.class, false },
- { Collections.singleton(this), Boolean.class, true },
- { bigDecimalValue, BigDecimal.class, new BigDecimal(bigDecimalValue) },
- { new BigDecimal(bigDecimalValue), Double.class, 1.2345656748352436E49 },
- { bigIntegerValue, BigInteger.class, new BigInteger(bigIntegerValue) },
- { new BigInteger("12345678"), Long.class, 12345678l },
- { -12345678l, BigInteger.class, new BigInteger("-12345678") },
- { object, List.class, Collections.singletonList(object) },
- { null, Iterable.class, null },
- { null, List.class, null },
- { null, Collection.class, null },
- { null, String.class, null },
- { new Object[] { "a", 123 }, List.class, Arrays.asList("a", 123) },
- { new String[] { "a", "b" }, List.class, Arrays.asList("a", "b") },
- { new byte[] { byte1, byte2 }, List.class, Arrays.asList(byte1, byte2) },
- { new short[] { short1, short2 }, List.class, Arrays.asList(short1, short2) },
- { new int[] { 1, 2 }, List.class, Arrays.asList(1, 2) },
- { new long[] { 123L, 321L }, List.class, Arrays.asList(123L, 321L) },
- { new float[] { 3.4f, 7.777f }, List.class, Arrays.asList(3.4f, 7.777f) },
- { new double[] { 3.4, 7.777 }, List.class, Arrays.asList(3.4, 7.777) },
- { new char[] { 'a', 'b' }, List.class, Arrays.asList('a', 'b') },
- { new boolean[] { true, false }, List.class, Arrays.asList(true, false) },
-
- { "foo/bar/baz.txt", File.class, new File("foo/bar/baz.txt") },
-
- { null, Long.class, 0l },
- { null, Short.class, (short) 0 },
- { null, Byte.class, (byte) 0 },
- { null, BigDecimal.class, BigDecimal.ZERO },
- { null, Float.class, 0f },
- { null, BigInteger.class, BigInteger.ZERO },
+ {this, String.class, toString()},
+ {55l, Integer.class, 55},
+ {"", Boolean.class, false},
+ {" ", Boolean.class, false},
+ {"x", Boolean.class, true},
+ {" z ", Boolean.class, true},
+ {"false", Boolean.class, false},
+ {" False ", Boolean.class, false},
+ {null, Boolean.class, false},
+ {new Double(256), Integer.class, new Integer(256)},
+ {new Double(22.7), Integer.class, new Integer(22)},
+ {new Integer(0), Boolean.class, false},
+ {new Long(32838), Boolean.class, true},
+ {new Integer(127), Byte.class, new Byte("127")},
+ {new Double(58), Short.class, new Short("58")},
+ {new Integer(33), Long.class, new Long(33)},
+ {new Integer(22), Float.class, new Float(22)},
+ {new Integer(1234), Double.class, new Double(1234)},
+ {floatValue, Double.class, floatValue.doubleValue()},
+ {Collections.EMPTY_LIST, Boolean.class, false},
+ {Collections.singleton(this), Boolean.class, true},
+ {bigDecimalValue, BigDecimal.class, new BigDecimal(bigDecimalValue)},
+ {new BigDecimal(bigDecimalValue), Double.class, 1.2345656748352436E49},
+ {bigIntegerValue, BigInteger.class, new BigInteger(bigIntegerValue)},
+ {new BigInteger("12345678"), Long.class, 12345678l},
+ {-12345678l, BigInteger.class, new BigInteger("-12345678")},
+ {object, List.class, Collections.singletonList(object)},
+ {null, Iterable.class, null},
+ {null, List.class, null},
+ {null, Collection.class, null},
+ {null, String.class, null},
+ {new Object[]{"a", 123}, List.class, Arrays.asList("a", 123)},
+ {new String[]{"a", "b"}, List.class, Arrays.asList("a", "b")},
+ {new byte[]{byte1, byte2}, List.class, Arrays.asList(byte1, byte2)},
+ {new short[]{short1, short2}, List.class, Arrays.asList(short1, short2)},
+ {new int[]{1, 2}, List.class, Arrays.asList(1, 2)},
+ {new long[]{123L, 321L}, List.class, Arrays.asList(123L, 321L)},
+ {new float[]{3.4f, 7.777f}, List.class, Arrays.asList(3.4f, 7.777f)},
+ {new double[]{3.4, 7.777}, List.class, Arrays.asList(3.4, 7.777)},
+ {new char[]{'a', 'b'}, List.class, Arrays.asList('a', 'b')},
+ {new boolean[]{true, false}, List.class, Arrays.asList(true, false)},
+
+ {"foo/bar/baz.txt", File.class, new File("foo/bar/baz.txt")},
+
+ {null, Long.class, 0l},
+ {null, Short.class, (short) 0},
+ {null, Byte.class, (byte) 0},
+ {null, BigDecimal.class, BigDecimal.ZERO},
+ {null, Float.class, 0f},
+ {null, BigInteger.class, BigInteger.ZERO},
- // null to arbitrary object is still null
+ // null to arbitrary object is still null
- { null, XMLReader.class, null } };
+ {null, XMLReader.class, null}};
}
@Test(dataProvider = "explain_inputs")
@@ -213,17 +209,17 @@
public Object[][] explain_inputs()
{
return new Object[][]
- {
- { StringBuffer.class, Integer.class,
- "Object --> String, String --> Long, Long --> Integer" },
- { void.class, Map.class, "null --> null" },
- { void.class, Boolean.class, "null --> Boolean" },
- { String[].class, List.class, "Object[] --> java.util.List" },
- { Float.class, Double.class, "Float --> Double" },
- { Double.class, BigDecimal.class,
- "Object --> String, String --> java.math.BigDecimal" },
+ {
+ {StringBuffer.class, Integer.class,
+ "Object --> String, String --> Long, Long --> Integer"},
+ {void.class, Map.class, "null --> null"},
+ {void.class, Boolean.class, "null --> Boolean"},
+ {String[].class, List.class, "Object[] --> java.util.List"},
+ {Float.class, Double.class, "Float --> Double"},
+ {Double.class, BigDecimal.class,
+ "Object --> String, String --> java.math.BigDecimal"},
- };
+ };
}
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/Bar.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/Bar.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/Bar.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/Bar.java Mon Nov 12 14:22:31 2007
@@ -1,24 +1,22 @@
-// Copyright 2006 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.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal.util;
-
+
/**
* Used by {@link InheritanceSearchTest}.
- *
- *
*/
public interface Bar
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/BarImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/BarImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/BarImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/BarImpl.java Mon Nov 12 14:22:31 2007
@@ -1,24 +1,22 @@
-// Copyright 2006 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.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal.util;
-
+
/**
* Used by {@link InheritanceSearchTest}.
- *
- *
*/
public class BarImpl implements Bar
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/ClasspathResourceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/ClasspathResourceTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/ClasspathResourceTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/ClasspathResourceTest.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,16 @@
package org.apache.tapestry.ioc.internal.util;
+import org.apache.tapestry.ioc.Resource;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
import java.io.BufferedInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.net.URL;
import java.util.Locale;
-
-import org.apache.tapestry.ioc.Resource;
-import org.testng.Assert;
-import org.testng.annotations.Test;
public class ClasspathResourceTest extends Assert
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/CollectionFactoryTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/CollectionFactoryTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/CollectionFactoryTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/CollectionFactoryTest.java Mon Nov 12 14:22:31 2007
@@ -14,21 +14,12 @@
package org.apache.tapestry.ioc.internal.util;
-import static java.util.Arrays.asList;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
import org.testng.Assert;
import org.testng.annotations.Test;
+
+import java.util.*;
+import static java.util.Arrays.asList;
public class CollectionFactoryTest extends Assert
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrierTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrierTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrierTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrierTest.java Mon Nov 12 14:22:31 2007
@@ -15,12 +15,11 @@
package org.apache.tapestry.ioc.internal.util;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-
-import java.util.List;
-
import org.apache.tapestry.ioc.test.TestBase;
import org.testng.annotations.Test;
+import java.util.List;
+
/**
* Test is structured a bit oddly, since it evolved from when the Concurrence annotation and aspect
* evolved into the {@link ConcurrentBarrier} utility class.
@@ -167,7 +166,7 @@
}
};
- _target.withRead( new Runnable()
+ _target.withRead(new Runnable()
{
public void run()
{
@@ -185,7 +184,6 @@
}
-
private void runOperationAndCheckCounter(Runnable operation) throws InterruptedException
{
runOperation(operation);
@@ -194,7 +192,7 @@
}
private void runOperation(Runnable operation)
- throws InterruptedException
+ throws InterruptedException
{
List<Thread> threads = newList();
List<Thread> running = newList();
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentTarget.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentTarget.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentTarget.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentTarget.java Mon Nov 12 14:22:31 2007
@@ -117,7 +117,7 @@
{
_counter++;
}
- },20, TimeUnit.MILLISECONDS);
+ }, 20, TimeUnit.MILLISECONDS);
}
public void tryIncrementCounterHard()
@@ -128,7 +128,7 @@
{
_counter = getCounter() + 1;
}
- },20,TimeUnit.MILLISECONDS);
+ }, 20, TimeUnit.MILLISECONDS);
}
public void tryIncrementIfNonNegative()
@@ -144,7 +144,8 @@
}
- public void withRead(Runnable runnable ) {
- _barrier.withRead(runnable);
+ public void withRead(Runnable runnable)
+ {
+ _barrier.withRead(runnable);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentTargetWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentTargetWrapper.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentTargetWrapper.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentTargetWrapper.java Mon Nov 12 14:22:31 2007
@@ -1,17 +1,17 @@
-// Copyright 2006 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.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal.util;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/DefenseTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/DefenseTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/DefenseTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/DefenseTest.java Mon Nov 12 14:22:31 2007
@@ -1,25 +1,22 @@
-// Copyright 2006 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.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal.util;
-import static org.apache.tapestry.ioc.internal.util.Defense.cast;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-
-import org.apache.tapestry.ioc.test.TestBase;
-import org.testng.annotations.Test;
+import static org.apache.tapestry.ioc.internal.util.Defense.*;
+import org.apache.tapestry.ioc.test.TestBase;
+import org.testng.annotations.Test;
public class DefenseTest extends TestBase
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/Foo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/Foo.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/Foo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/Foo.java Mon Nov 12 14:22:31 2007
@@ -1,24 +1,22 @@
-// Copyright 2006 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.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal.util;
-
+
/**
* Used by {@link InheritanceSearchTest}.
- *
- *
*/
public interface Foo extends Bar
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/FooBar.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/FooBar.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/FooBar.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/FooBar.java Mon Nov 12 14:22:31 2007
@@ -1,24 +1,22 @@
-// Copyright 2006 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.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal.util;
-
+
/**
* Used by {@link InheritanceSearchTest}.
- *
- *
*/
public interface FooBar extends Foo, Bar
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/FooBarImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/FooBarImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/FooBarImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/FooBarImpl.java Mon Nov 12 14:22:31 2007
@@ -1,24 +1,22 @@
-// Copyright 2006 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.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal.util;
-
+
/**
* Used by {@link InheritanceSearchTest}.
- *
- *
*/
public class FooBarImpl extends FooImpl implements Bar, FooBar
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/FooImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/FooImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/FooImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/FooImpl.java Mon Nov 12 14:22:31 2007
@@ -1,24 +1,22 @@
-// Copyright 2006 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.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2006 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.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal.util;
-
+
/**
* Used by {@link InheritanceSearchTest}.
- *
- *
*/
public class FooImpl extends BarImpl implements Foo
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/IdAllocatorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/IdAllocatorTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/IdAllocatorTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/IdAllocatorTest.java Mon Nov 12 14:22:31 2007
@@ -1,25 +1,24 @@
-// Copyright 2004, 2005, 2006 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.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+// Copyright 2004, 2005, 2006 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.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal.util;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-
-import java.util.List;
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.List;
public class IdAllocatorTest extends Assert
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/InheritanceSearchTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/InheritanceSearchTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/InheritanceSearchTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/InheritanceSearchTest.java Mon Nov 12 14:22:31 2007
@@ -14,14 +14,14 @@
package org.apache.tapestry.ioc.internal.util;
-import java.io.Serializable;
-import java.util.List;
-
import org.apache.tapestry.ioc.test.TestBase;
import org.testng.annotations.Test;
+import java.io.Serializable;
+import java.util.List;
+
/**
- *
+ *
*/
public class InheritanceSearchTest extends TestBase
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/InternalUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/InternalUtilsTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/InternalUtilsTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/InternalUtilsTest.java Mon Nov 12 14:22:31 2007
@@ -14,24 +14,17 @@
package org.apache.tapestry.ioc.internal.util;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import static org.apache.tapestry.ioc.internal.util.InternalUtils.toList;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
import org.apache.tapestry.ioc.Locatable;
import org.apache.tapestry.ioc.Location;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import static org.apache.tapestry.ioc.internal.util.InternalUtils.toList;
import org.apache.tapestry.ioc.test.IOCTestCase;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import java.lang.reflect.Method;
+import java.util.*;
+
public class InternalUtilsTest extends IOCTestCase
{
@Test
@@ -85,7 +78,7 @@
public void array_size_when_non_null()
{
Object[] array =
- { 1, 2, 3 };
+ {1, 2, 3};
assertEquals(InternalUtils.size(array), 3);
}
@@ -100,11 +93,11 @@
public Object[][] memberPrefixData()
{
return new Object[][]
- {
- { "simple", "simple" },
- { "_name", "name" },
- { "$name", "name" },
- { "$_$__$__$_$___$_$_$_$$name$", "name$" } };
+ {
+ {"simple", "simple"},
+ {"_name", "name"},
+ {"$name", "name"},
+ {"$_$__$__$_$___$_$_$_$$name$", "name$"}};
}
@Test
@@ -164,12 +157,12 @@
public Object[][] capitalize_inputs()
{
return new Object[][]
- {
- { "hello", "Hello" },
- { "Goodbye", "Goodbye" },
- { "", "" },
- { "a", "A" },
- { "A", "A" } };
+ {
+ {"hello", "Hello"},
+ {"Goodbye", "Goodbye"},
+ {"", ""},
+ {"a", "A"},
+ {"A", "A"}};
}
@Test
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java Mon Nov 12 14:22:31 2007
@@ -14,10 +14,10 @@
package org.apache.tapestry.ioc.internal.util;
-import java.util.Locale;
-
import org.apache.tapestry.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
+
+import java.util.Locale;
public class LocalizedNameGeneratorTest extends IOCTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/LocationImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/LocationImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/LocationImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry/ioc/internal/util/LocationImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,12 @@
package org.apache.tapestry.ioc.internal.util;
-import java.util.Random;
-
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
+
+import java.util.Random;
public class LocationImplTest extends IOCTestCase
{