This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/deltaspike.git
The following commit(s) were added to refs/heads/master by this push: new f49e386 DELTASPIKE-1426 fix proxyfactory test f49e386 is described below commit f49e38635b10bfb8dac16f739eef48a1795a4a12 Author: Mark Struberg <strub...@apache.org> AuthorDate: Sat Dec 4 13:25:48 2021 +0100 DELTASPIKE-1426 fix proxyfactory test --- .../proxy/api/DeltaSpikeProxyFactoryTest.java | 44 +++++++++++++++------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/deltaspike/modules/proxy/api/src/test/java/org/apache/deltaspike/proxy/api/DeltaSpikeProxyFactoryTest.java b/deltaspike/modules/proxy/api/src/test/java/org/apache/deltaspike/proxy/api/DeltaSpikeProxyFactoryTest.java index 9ac7ac3..69c4207 100644 --- a/deltaspike/modules/proxy/api/src/test/java/org/apache/deltaspike/proxy/api/DeltaSpikeProxyFactoryTest.java +++ b/deltaspike/modules/proxy/api/src/test/java/org/apache/deltaspike/proxy/api/DeltaSpikeProxyFactoryTest.java @@ -1,3 +1,21 @@ +/* + * 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.deltaspike.proxy.api; import static org.junit.Assert.assertTrue; @@ -29,16 +47,16 @@ public class DeltaSpikeProxyFactoryTest { return collectAllMethods(clazz); } - } + } private DeltaSpikeProxyFactoryForCollectTest proxyFactory; - - @Before - public void setUp() throws Exception - { - proxyFactory = new DeltaSpikeProxyFactoryForCollectTest(); - } - + + @Before + public void setUp() throws Exception + { + proxyFactory = new DeltaSpikeProxyFactoryForCollectTest(); + } + public class Class_NonAbstract { public void test() @@ -50,7 +68,7 @@ public class DeltaSpikeProxyFactoryTest { public abstract void test(); } - + public abstract static class Class_C1 { protected abstract void protectedAbstract_C1_C2(); // will be overridden in Class_C2 @@ -157,12 +175,12 @@ public class DeltaSpikeProxyFactoryTest // printCollectedMethods(collectedMethods); assertTrue(containsMethod(collectedMethods, Class_C2.class, "protectedAbstract_C1_C2")); assertTrue(containsMethod(collectedMethods, Class_C1.class, "protectedAbstract_C1_C3")); - assertTrue(containsMethod(collectedMethods, Class_C2.class, "protectedAbstract_C1_C2_C3")); + assertTrue(containsMethod(collectedMethods, Class_C1.class, "protectedAbstract_C1_C2_C3")); assertTrue(containsMethod(collectedMethods, Class_C1.class, "protectedAbstract_C1")); assertTrue(containsMethod(collectedMethods, Class_C2.class, "publicAbstract_C1_C2")); assertTrue(containsMethod(collectedMethods, Class_C2.class, "publicAbstract_C1_C2")); - assertTrue(containsMethod(collectedMethods, Class_C2.class, "publicAbstract_C1_C2_C3")); + assertTrue(containsMethod(collectedMethods, Class_C1.class, "publicAbstract_C1_C2_C3")); assertTrue(containsMethod(collectedMethods, Class_C1.class, "publicAbstract_C1")); assertTrue(containsMethod(collectedMethods, Class_C2.class, "protectedAbstract_C2_C3")); @@ -181,12 +199,12 @@ public class DeltaSpikeProxyFactoryTest // printCollectedMethods(collectedMethods); assertTrue(containsMethod(collectedMethods, Class_C2.class, "protectedAbstract_C1_C2")); assertTrue(containsMethod(collectedMethods, Class_C3.class, "protectedAbstract_C1_C3")); - assertTrue(containsMethod(collectedMethods, Class_C3.class, "protectedAbstract_C1_C2_C3")); + assertTrue(containsMethod(collectedMethods, Class_C1.class, "protectedAbstract_C1_C2_C3")); assertTrue(containsMethod(collectedMethods, Class_C1.class, "protectedAbstract_C1")); assertTrue(containsMethod(collectedMethods, Class_C2.class, "publicAbstract_C1_C2")); assertTrue(containsMethod(collectedMethods, Class_C3.class, "publicAbstract_C1_C3")); - assertTrue(containsMethod(collectedMethods, Class_C3.class, "publicAbstract_C1_C2_C3")); + assertTrue(containsMethod(collectedMethods, Class_C1.class, "publicAbstract_C1_C2_C3")); assertTrue(containsMethod(collectedMethods, Class_C1.class, "publicAbstract_C1")); assertTrue(containsMethod(collectedMethods, Class_C3.class, "protectedAbstract_C2_C3"));