Author: painter
Date: Mon Mar 18 15:22:23 2019
New Revision: 1855773
URL: http://svn.apache.org/viewvc?rev=1855773&view=rev
Log:
Update dependency on fulcrum-parser 2.0.0 release, test code cleanup/formatting
Modified:
turbine/fulcrum/trunk/intake/pom.xml
turbine/fulcrum/trunk/intake/src/changes/changes.xml
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DateStringField.java
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeServiceTest.java
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeTest.java
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeValidatonTest.java
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/test/MyField.java
Modified: turbine/fulcrum/trunk/intake/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/pom.xml?rev=1855773&r1=1855772&r2=1855773&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/pom.xml (original)
+++ turbine/fulcrum/trunk/intake/pom.xml Mon Mar 18 15:22:23 2019
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-parser</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -90,16 +90,6 @@
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.8.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- <version>2.6.0</version>
- </dependency>
<!-- testing dependencies -->
<dependency>
@@ -108,7 +98,6 @@
<version>1.0.8</version>
<scope>test</scope>
</dependency>
- <!-- be aware to adapt group-id to org.apache.fulcrum again after version
1.0.7 -->
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
Modified: turbine/fulcrum/trunk/intake/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/changes/changes.xml?rev=1855773&r1=1855772&r2=1855773&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/intake/src/changes/changes.xml Mon Mar 18 15:22:23
2019
@@ -42,7 +42,7 @@
INCOMPATIBLE: Update dependency servlet-api to 3.1.0
</action>
<action dev="tv" type="update">
- Update dependencies commons-lang3 3.7, fulcrum-parser 2.0.0
+ Update dependencies fulcrum-parser 2.0.0 (inherits commons-lang3 and
commons-pool2)
</action>
</release>
<release version="1.2.3" date="2018-02-11">
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DateStringField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DateStringField.java?rev=1855773&r1=1855772&r2=1855773&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DateStringField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/DateStringField.java
Mon Mar 18 15:22:23 2019
@@ -174,7 +174,7 @@ public class DateStringField
}
/**
- * Parses a test date string using the Validator if is exists and
+ * Parses a test date string using the Validator if it exists and
* is an instance of DateStringValidator. Otherwise, DateFormat.parse()
* is used.
*
Modified:
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeServiceTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeServiceTest.java?rev=1855773&r1=1855772&r2=1855773&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeServiceTest.java
(original)
+++
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeServiceTest.java
Mon Mar 18 15:22:23 2019
@@ -1,6 +1,5 @@
package org.apache.fulcrum.intake;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -20,30 +19,29 @@ package org.apache.fulcrum.intake;
* under the License.
*/
-
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.File;
import org.apache.fulcrum.intake.model.Group;
import org.apache.fulcrum.testcontainer.BaseUnit5Test;
-
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
/**
- * @author Eric Pugh
+ * Test for Intake service
*
+ * @author <a href="mailto:[email protected]";>[email protected]</a>
+ * @version $Id$
*/
public class IntakeServiceTest extends BaseUnit5Test
{
- private static final File BASEDIR = new File(".");// System.getProperty(
"basedir" )
-
+ private static final File BASEDIR = new File(".");
private IntakeService intakeService = null;
/**
@@ -51,8 +49,8 @@ public class IntakeServiceTest extends B
*
* @param testInfo defining the test
*/
- public IntakeServiceTest(TestInfo testInfo) {
-
+ public IntakeServiceTest(TestInfo testInfo)
+ {
}
/**
@@ -78,8 +76,8 @@ public class IntakeServiceTest extends B
* @throws Exception generic exception
*/
@Test
- public void testBasicConfigLoads() throws Exception {
-
+ public void testBasicConfigLoads() throws Exception
+ {
Group group = intakeService.getGroup("LoginGroup");
File file = new File( BASEDIR, "target/appData.ser");
Modified:
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeTest.java?rev=1855773&r1=1855772&r2=1855773&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeTest.java
(original)
+++
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeTest.java
Mon Mar 18 15:22:23 2019
@@ -1,5 +1,7 @@
package org.apache.fulcrum.intake;
+
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,6 +21,11 @@ package org.apache.fulcrum.intake;
* under the License.
*/
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.util.Arrays;
import java.util.Locale;
@@ -38,17 +45,10 @@ import org.apache.fulcrum.parser.Default
import org.apache.fulcrum.parser.ParserService;
import org.apache.fulcrum.parser.ValueParser;
import org.apache.fulcrum.testcontainer.BaseUnit5Test;
-
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
/**
* Test the facade class for the service
*
Modified:
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeValidatonTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeValidatonTest.java?rev=1855773&r1=1855772&r2=1855773&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeValidatonTest.java
(original)
+++
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeValidatonTest.java
Mon Mar 18 15:22:23 2019
@@ -1,5 +1,6 @@
package org.apache.fulcrum.intake;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,6 +20,10 @@ package org.apache.fulcrum.intake;
* under the License.
*/
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.util.Locale;
import org.apache.fulcrum.intake.model.Field;
@@ -36,29 +41,17 @@ import org.apache.fulcrum.intake.validat
import org.apache.fulcrum.parser.DefaultParameterParser;
import org.apache.fulcrum.parser.ParserService;
import org.apache.fulcrum.parser.ValueParser;
-
import org.apache.fulcrum.testcontainer.BaseUnit5Test;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-/**
- * Test the validators
- *
- * @author <a href="[email protected]">Thomas Vandahl</a>
- */
+
/**
* Test the validators
*
* @author <a href="[email protected]">Thomas Vandahl</a>
+ * @version $Id: IntakeValidatonTest.java 1851410 2019-03-199 11:17:05Z
painter $
*/
@DisplayName("Intake Validator Test")
public class IntakeValidatonTest extends BaseUnit5Test
Modified:
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/test/MyField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/test/MyField.java?rev=1855773&r1=1855772&r2=1855773&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/test/MyField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/test/MyField.java
Mon Mar 18 15:22:23 2019
@@ -1,3 +1,5 @@
+package org.apache.fulcrum.intake.test;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,7 +18,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.fulcrum.intake.test;
import org.apache.fulcrum.intake.IntakeException;
import org.apache.fulcrum.intake.model.Group;
@@ -29,6 +30,11 @@ public class MyField extends StringField
/** Serial version */
private static final long serialVersionUID = 1L;
+ /**
+ * @param field XmlFile to test
+ * @param group group to test
+ * @throws IntakeException if fail to find field in group
+ */
public MyField(XmlField field, Group group) throws IntakeException
{
super(field, group);
