Author: painter
Date: Fri Jan 11 12:28:28 2019
New Revision: 1851029
URL: http://svn.apache.org/viewvc?rev=1851029&view=rev
Log:
Update junit 5, fix changes doc location for report generation
Added:
turbine/fulcrum/trunk/pool/src/changes/
turbine/fulcrum/trunk/pool/src/changes/changes.xml
Removed:
turbine/fulcrum/trunk/pool/xdocs/changes.xml
Modified:
turbine/fulcrum/trunk/pool/src/test/org/apache/fulcrum/pool/PoolServiceTest.java
Added: turbine/fulcrum/trunk/pool/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pool/src/changes/changes.xml?rev=1851029&view=auto
==============================================================================
--- turbine/fulcrum/trunk/pool/src/changes/changes.xml (added)
+++ turbine/fulcrum/trunk/pool/src/changes/changes.xml Fri Jan 11 12:28:28 2019
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<document>
+ <properties>
+ <title>Fulcrum Pool Component</title>
+ <author email="ep...@opensourceconnections.com">Eric Pugh</author>
+ </properties>
+
+ <body>
+ <release version="1.0.5" date="in SVN">
+ <action dev="painter" type="update">
+ Update test to use junit 5
+ </action>
+ <action dev="painter" type="update">
+ Derive from Turbine parent POM 5
+ </action>
+ <action dev="painter" type="update">
+ Update dependencies to yaafi and testcontainer 1.0.8
+ </action>
+ </release>
+ <release version="1.0.4" date="2009-06-21">
+ <action dev="tv" type="add">
+ Added a Maven-2 build
+ </action>
+ </release>
+ <release version="1.0.3" date="2004-11-24">
+ <action dev="epugh" type="update" due-to="Kostyantyn Shchekotykhin">
+ Merge api and impl jars into one project.
+ </action>
+ <action dev="epugh" type="update">
+ Clean up dependencies. Use TestContainer.
+ </action>
+ <action dev="epugh" type="update">
+ Bump versions, clean up dependencies
+ </action>
+ </release>
+ <release version="1.0.2" date="in cvs">
+ <action dev="epugh" type="update">
+ Update to use Merlin 3.3.0
+ </action>
+ </release>
+ </body>
+</document>
+
Modified:
turbine/fulcrum/trunk/pool/src/test/org/apache/fulcrum/pool/PoolServiceTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pool/src/test/org/apache/fulcrum/pool/PoolServiceTest.java?rev=1851029&r1=1851028&r2=1851029&view=diff
==============================================================================
---
turbine/fulcrum/trunk/pool/src/test/org/apache/fulcrum/pool/PoolServiceTest.java
(original)
+++
turbine/fulcrum/trunk/pool/src/test/org/apache/fulcrum/pool/PoolServiceTest.java
Fri Jan 11 12:28:28 2019
@@ -1,5 +1,8 @@
package org.apache.fulcrum.pool;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,41 +22,37 @@ package org.apache.fulcrum.pool;
* under the License.
*/
-import org.apache.fulcrum.testcontainer.BaseUnitTest;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
/**
+ * Basic testing of the PoolService Component
+ *
+ * @author <a href="mailto:pain...@apache.org";>Jeffery Painter</a>
* @author Eric Pugh
* @author <a href="mailto:mcconn...@apache.org";>Stephen McConnell</a>
*
*/
-public class PoolServiceTest extends BaseUnitTest
+public class PoolServiceTest extends BaseUnit5Test
{
/** Default pool service **/
private PoolService poolService = null;
/**
- * Defines the testcase name for JUnit.
- *
- * @param name the testcase's name.
- */
- public PoolServiceTest(String name)
- {
- super(name);
- }
-
- /**
* Perform pool service setup
*
* @throws Exception generic exception
*/
- @Before
+ @BeforeEach
public void setUp() throws Exception
{
- super.setUp();
-
- poolService = (PoolService)
this.resolve(PoolService.class.getName());
+ setConfigurationFileName("src/test/TestComponentConfig.xml");
+ setRoleFileName("src/test/TestRoleConfig.xml");
+ poolService = (PoolService) this.lookup(PoolService.class.getName());
}
/**
@@ -69,6 +68,9 @@ public class PoolServiceTest extends Bas
}
+ /**
+ * Test adding an instance to the pool
+ */
@Test
public void testPutInstance()
{
@@ -79,6 +81,9 @@ public class PoolServiceTest extends Bas
}
+ /**
+ * Test altering pool capacity
+ */
@Test
public void testGetSetCapacity()
{
@@ -88,6 +93,9 @@ public class PoolServiceTest extends Bas
}
+ /**
+ * Test to determine current size of the pool
+ */
@Test
public void testGetSize()
{
@@ -114,7 +122,7 @@ public class PoolServiceTest extends Bas
assertEquals(0, poolService.getSize("java.lang.String"));
}
- /*
+ /**
* Class to test for void clearPool()
*/
@Test
