Skip to content

Commit

Permalink
[SHIRO-778] test case for onInit() called twice
Browse files Browse the repository at this point in the history
  • Loading branch information
bmarwell authored and fpapon committed Jul 5, 2020
1 parent 5efcca5 commit 2baa37d
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package org.apache.shiro.config.ogdl

import org.apache.shiro.config.ogdl.beans.InitCountBean
import org.apache.shiro.lang.codec.Base64
import org.apache.shiro.lang.codec.CodecSupport
import org.apache.shiro.lang.codec.Hex
Expand All @@ -26,6 +27,8 @@ import org.apache.shiro.config.Ini
import org.apache.shiro.config.ogdl.event.BeanEvent
import org.junit.Test

import java.util.concurrent.ConcurrentHashMap

import static org.junit.Assert.*
import static org.hamcrest.Matchers.*

Expand Down Expand Up @@ -640,6 +643,37 @@ class ReflectionBuilderTest {
assertNotNull(beanMap.get("two"))
}

@Test
void testNotMultipleInitialization() {
// given
Map<String, String> defs = new ConcurrentHashMap<>()
defs.put("initcountbean", InitCountBean.getCanonicalName())
ReflectionBuilder builder = new ReflectionBuilder()

// when
builder.buildObjects(defs)

// then
assertEquals(1, InitCountBean.getInitCount())
InitCountBean.resetCount()
}

@Test
void testNotMultipleInitializationWithNullFirst() {
// given
Map<String, String> defs = new ConcurrentHashMap<>()
defs.put("initcountbean", InitCountBean.getCanonicalName())
ReflectionBuilder builder = new ReflectionBuilder()

// when
builder.buildObjects(null)
builder.buildObjects(defs)

// then
assertEquals(1, InitCountBean.getInitCount())
InitCountBean.resetCount()
}

void assertInstantiatedEvents(String name, Map<String, ?> objects, int expected) {
def bean = objects.get(name) as RecordingBeanListener
def events = bean.getInstantiatedEvents()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/*
* 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 org.apache.shiro.config.ogdl.beans;

import org.apache.shiro.lang.ShiroException;
import org.apache.shiro.lang.util.Initializable;

import java.util.StringJoiner;
import java.util.concurrent.atomic.LongAdder;

public class InitCountBean implements Initializable {
private static final LongAdder INIT_COUNT = new LongAdder();

public InitCountBean() {
super();
}

public static long getInitCount() {
return INIT_COUNT.longValue();
}

public static void resetCount() {
INIT_COUNT.reset();
}

@Override
public String toString() {
return new StringJoiner(", ", InitCountBean.class.getSimpleName() + "[", "]")
.add("INIT_COUNT=" + getInitCount())
.toString();
}

@Override
public void init() throws ShiroException {
INIT_COUNT.increment();
}
}

0 comments on commit 2baa37d

Please sign in to comment.