This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-chain.git
The following commit(s) were added to refs/heads/master by this push:
new 79a87c8 Remove Subversion key substitution noise
79a87c8 is described below
commit 79a87c836bcaf52f8edc93cb55201ac942bc4225
Author: Gary Gregory <ggreg...@rocketsoftware.com>
AuthorDate: Tue Aug 30 10:58:17 2022 -0400
Remove Subversion key substitution noise
---
.../chain2/impl/CatalogFactoryBaseTestCase.java | 396 ++++++++++-----------
1 file changed, 197 insertions(+), 199 deletions(-)
diff --git
a/base/src/test/java/org/apache/commons/chain2/impl/CatalogFactoryBaseTestCase.java
b/base/src/test/java/org/apache/commons/chain2/impl/CatalogFactoryBaseTestCase.java
index eda1296..b3b270f 100644
---
a/base/src/test/java/org/apache/commons/chain2/impl/CatalogFactoryBaseTestCase.java
+++
b/base/src/test/java/org/apache/commons/chain2/impl/CatalogFactoryBaseTestCase.java
@@ -1,199 +1,197 @@
-/*
- * 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.commons.chain2.impl;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.Iterator;
-
-import org.apache.commons.chain2.Catalog;
-import org.apache.commons.chain2.CatalogFactory;
-import org.apache.commons.chain2.Command;
-import org.apache.commons.chain2.Context;
-import org.apache.commons.chain2.testutils.NonDelegatingCommand;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * <p>Test case for the <code>CatalogFactoryBase</code> class.</p>
- *
- * @version $Revision$ $Date$
- */
-
-public class CatalogFactoryBaseTestCase {
-
-
- // ---------------------------------------------------- Instance Variables
-
-
- /**
- * <p>The {@link CatalogFactoryBase} instance under test.</p>
- */
- protected CatalogFactory<String, Object, Context<String, Object>> factory
= null;
-
-
- // -------------------------------------------------- Overall Test Methods
-
-
- /**
- * <p>Set up instance variables required by this test case.</p>
- */
- @Before
- public void setUp() {
- CatalogFactoryBase.clear();
- factory = CatalogFactoryBase.getInstance();
- }
-
- /**
- * <p>Tear down instance variables required by this test case.</p>
- */
- @After
- public void tearDown() {
- factory = null;
- CatalogFactoryBase.clear();
- }
-
-
- // ------------------------------------------------ Individual Test Methods
-
-
- /**
- * <p>Test a pristine instance of {@link CatalogFactoryBase}.</p>
- */
- @Test
- public void testPristine() {
-
- assertNotNull(factory);
- assertNull(factory.getCatalog());
- assertNull(factory.getCatalog("foo"));
- assertEquals(0, getCatalogCount());
-
- }
-
-
- /**
- * <p>Test the default {@link Catalog} instance.</p>
- */
- @Test
- public void testDefaultCatalog() {
-
- Catalog<String, Object, Context<String, Object>> catalog = new
CatalogBase<String, Object, Context<String, Object>>();
- factory.setCatalog(catalog);
- assertTrue(catalog == factory.getCatalog());
- assertEquals(0, getCatalogCount());
-
- }
-
-
- /**
- * <p>Test adding a specifically named {@link Catalog} instance.</p>
- */
- @Test
- public void testSpecificCatalog() {
-
- Catalog<String, Object, Context<String, Object>> catalog = new
CatalogBase<String, Object, Context<String, Object>>();
- factory.setCatalog(catalog);
- catalog = new CatalogBase<String, Object, Context<String, Object>>();
- factory.addCatalog("foo", catalog);
- assertTrue(catalog == factory.getCatalog("foo"));
- assertEquals(1, getCatalogCount());
- factory.addCatalog("foo", new CatalogBase<String, Object,
Context<String, Object>>());
- assertEquals(1, getCatalogCount());
- assertTrue(!(catalog == factory.getCatalog("foo")));
- CatalogFactoryBase.clear();
- factory = CatalogFactoryBase.getInstance();
- assertEquals(0, getCatalogCount());
-
- }
-
-
- /**
- * <p>Test <code>getCatalog()</code> method.</p>
- */
- @Test
- public void testCatalogIdentifier() {
-
- Catalog<String, Object, Context<String, Object>> defaultCatalog = new
CatalogBase<String, Object, Context<String, Object>>();
- Command<String, Object, Context<String, Object>> defaultFoo = new
NonDelegatingCommand();
- defaultCatalog.addCommand("foo", defaultFoo);
- Command<String, Object, Context<String, Object>> fallback = new
NonDelegatingCommand();
- defaultCatalog.addCommand("noSuchCatalog:fallback", fallback);
-
- factory.setCatalog(defaultCatalog);
-
- Catalog<String, Object, Context<String, Object>> specificCatalog = new
CatalogBase<String, Object, Context<String, Object>>();
- Command<String, Object, Context<String, Object>> specificFoo = new
NonDelegatingCommand();
- specificCatalog.addCommand("foo", specificFoo);
- factory.addCatalog("specific", specificCatalog);
-
- Command<String, Object, Context<String, Object>> command =
factory.getCommand("foo");
- assertSame(defaultFoo, command);
-
- command = factory.getCommand("specific:foo");
- assertSame(specificFoo, command);
-
- command = factory.getCommand("void");
- assertNull(command);
-
- command = factory.getCommand("foo:void");
- assertNull(command);
-
- command = factory.getCommand("specific:void");
- assertNull(command);
-
- command = factory.getCommand("noSuchCatalog:fallback");
- assertNull(command);
-
- try {
- command = factory.getCommand("multiple:delimiters:reserved");
- fail("A command ID with more than one delimiter should throw an
IllegalArgumentException");
- }
- catch (IllegalArgumentException ex) {
- // expected behavior
- }
-
- }
-
-
- // ------------------------------------------------------- Support Methods
-
-
- /**
- * <p>Return the number of {@link Catalog}s defined in our
- * {@link CatalogFactoryBase}.</p>
- */
- private int getCatalogCount() {
-
- Iterator<String> names = factory.getNames();
- assertNotNull(names);
- int n = 0;
- while (names.hasNext()) {
- names.next();
- n++;
- }
- return n;
-
- }
-
-
-}
+/*
+ * 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.commons.chain2.impl;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.Iterator;
+
+import org.apache.commons.chain2.Catalog;
+import org.apache.commons.chain2.CatalogFactory;
+import org.apache.commons.chain2.Command;
+import org.apache.commons.chain2.Context;
+import org.apache.commons.chain2.testutils.NonDelegatingCommand;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * <p>Test case for the <code>CatalogFactoryBase</code> class.</p>
+ */
+
+public class CatalogFactoryBaseTestCase {
+
+
+ // ---------------------------------------------------- Instance Variables
+
+
+ /**
+ * <p>The {@link CatalogFactoryBase} instance under test.</p>
+ */
+ protected CatalogFactory<String, Object, Context<String, Object>> factory
= null;
+
+
+ // -------------------------------------------------- Overall Test Methods
+
+
+ /**
+ * <p>Set up instance variables required by this test case.</p>
+ */
+ @Before
+ public void setUp() {
+ CatalogFactoryBase.clear();
+ factory = CatalogFactoryBase.getInstance();
+ }
+
+ /**
+ * <p>Tear down instance variables required by this test case.</p>
+ */
+ @After
+ public void tearDown() {
+ factory = null;
+ CatalogFactoryBase.clear();
+ }
+
+
+ // ------------------------------------------------ Individual Test Methods
+
+
+ /**
+ * <p>Test a pristine instance of {@link CatalogFactoryBase}.</p>
+ */
+ @Test
+ public void testPristine() {
+
+ assertNotNull(factory);
+ assertNull(factory.getCatalog());
+ assertNull(factory.getCatalog("foo"));
+ assertEquals(0, getCatalogCount());
+
+ }
+
+
+ /**
+ * <p>Test the default {@link Catalog} instance.</p>
+ */
+ @Test
+ public void testDefaultCatalog() {
+
+ Catalog<String, Object, Context<String, Object>> catalog = new
CatalogBase<String, Object, Context<String, Object>>();
+ factory.setCatalog(catalog);
+ assertTrue(catalog == factory.getCatalog());
+ assertEquals(0, getCatalogCount());
+
+ }
+
+
+ /**
+ * <p>Test adding a specifically named {@link Catalog} instance.</p>
+ */
+ @Test
+ public void testSpecificCatalog() {
+
+ Catalog<String, Object, Context<String, Object>> catalog = new
CatalogBase<String, Object, Context<String, Object>>();
+ factory.setCatalog(catalog);
+ catalog = new CatalogBase<String, Object, Context<String, Object>>();
+ factory.addCatalog("foo", catalog);
+ assertTrue(catalog == factory.getCatalog("foo"));
+ assertEquals(1, getCatalogCount());
+ factory.addCatalog("foo", new CatalogBase<String, Object,
Context<String, Object>>());
+ assertEquals(1, getCatalogCount());
+ assertTrue(!(catalog == factory.getCatalog("foo")));
+ CatalogFactoryBase.clear();
+ factory = CatalogFactoryBase.getInstance();
+ assertEquals(0, getCatalogCount());
+
+ }
+
+
+ /**
+ * <p>Test <code>getCatalog()</code> method.</p>
+ */
+ @Test
+ public void testCatalogIdentifier() {
+
+ Catalog<String, Object, Context<String, Object>> defaultCatalog = new
CatalogBase<String, Object, Context<String, Object>>();
+ Command<String, Object, Context<String, Object>> defaultFoo = new
NonDelegatingCommand();
+ defaultCatalog.addCommand("foo", defaultFoo);
+ Command<String, Object, Context<String, Object>> fallback = new
NonDelegatingCommand();
+ defaultCatalog.addCommand("noSuchCatalog:fallback", fallback);
+
+ factory.setCatalog(defaultCatalog);
+
+ Catalog<String, Object, Context<String, Object>> specificCatalog = new
CatalogBase<String, Object, Context<String, Object>>();
+ Command<String, Object, Context<String, Object>> specificFoo = new
NonDelegatingCommand();
+ specificCatalog.addCommand("foo", specificFoo);
+ factory.addCatalog("specific", specificCatalog);
+
+ Command<String, Object, Context<String, Object>> command =
factory.getCommand("foo");
+ assertSame(defaultFoo, command);
+
+ command = factory.getCommand("specific:foo");
+ assertSame(specificFoo, command);
+
+ command = factory.getCommand("void");
+ assertNull(command);
+
+ command = factory.getCommand("foo:void");
+ assertNull(command);
+
+ command = factory.getCommand("specific:void");
+ assertNull(command);
+
+ command = factory.getCommand("noSuchCatalog:fallback");
+ assertNull(command);
+
+ try {
+ command = factory.getCommand("multiple:delimiters:reserved");
+ fail("A command ID with more than one delimiter should throw an
IllegalArgumentException");
+ }
+ catch (IllegalArgumentException ex) {
+ // expected behavior
+ }
+
+ }
+
+
+ // ------------------------------------------------------- Support Methods
+
+
+ /**
+ * <p>Return the number of {@link Catalog}s defined in our
+ * {@link CatalogFactoryBase}.</p>
+ */
+ private int getCatalogCount() {
+
+ Iterator<String> names = factory.getNames();
+ assertNotNull(names);
+ int n = 0;
+ while (names.hasNext()) {
+ names.next();
+ n++;
+ }
+ return n;
+
+ }
+
+
+}
