Fix headers and change setUp to postSetUp chain
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/ad390c99 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/ad390c99 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/ad390c99 Branch: refs/heads/feature/GEODE-1050 Commit: ad390c9981141a5f22aa2ba5e3a86f992dfacc48 Parents: 7941b83 Author: Kirk Lund <[email protected]> Authored: Thu Mar 17 16:01:04 2016 -0700 Committer: Kirk Lund <[email protected]> Committed: Thu Mar 17 16:01:04 2016 -0700 ---------------------------------------------------------------------- .../cache/ConnectionPoolAutoDUnitTest.java | 28 +++++++++++------- .../gemfire/cache/ConnectionPoolDUnitTest.java | 31 ++++++++++++++------ 2 files changed, 40 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ad390c99/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAutoDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAutoDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAutoDUnitTest.java index ad110d7..3b43ab8 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAutoDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAutoDUnitTest.java @@ -1,9 +1,18 @@ -/*========================================================================= - * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved. - * This product is protected by U.S. and international copyright - * and intellectual property laws. Pivotal products are covered by - * one or more patents listed at http://www.pivotal.io/patents. - *========================================================================= +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 com.gemstone.gemfire.cache; @@ -20,10 +29,9 @@ public class ConnectionPoolAutoDUnitTest extends ConnectionPoolDUnitTest { public ConnectionPoolAutoDUnitTest(String name) { super(name); } - - public void setUp() throws Exception { - super.setUp(); - // TODO Auto-generated method stub + + @Override + protected final void postSetUpConnectionPoolDUnitTest() throws Exception { ClientServerTestCase.AUTO_LOAD_BALANCE = true; Invoke.invokeInEveryVM(new SerializableRunnable("setupAutoMode") { public void run() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ad390c99/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolDUnitTest.java index 41d48aa..2acab3a 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolDUnitTest.java @@ -1,9 +1,18 @@ -/*========================================================================= - * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved. - * This product is protected by U.S. and international copyright - * and intellectual property laws. Pivotal products are covered by - * one or more patents listed at http://www.pivotal.io/patents. - *========================================================================= +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 com.gemstone.gemfire.cache; @@ -97,8 +106,8 @@ public class ConnectionPoolDUnitTest extends CacheTestCase { super(name); } - public void setUp() throws Exception { - super.setUp(); + @Override + public final void postSetUp() throws Exception { // avoid IllegalStateException from HandShake by connecting all vms to // system before creating pool getSystem(); @@ -107,10 +116,14 @@ public class ConnectionPoolDUnitTest extends CacheTestCase { getSystem(); } }); + postSetUpConnectionPoolDUnitTest(); + } + + protected void postSetUpConnectionPoolDUnitTest() throws Exception { } @Override - protected final void postTearDownCacheTestCase() throws Exception { + public final void postTearDownCacheTestCase() throws Exception { Invoke.invokeInEveryVM(new SerializableRunnable() { public void run() { Map pools = PoolManager.getAll();
