Author: mthl
Date: Sat May 25 21:28:23 2019
New Revision: 1860021
URL: http://svn.apache.org/viewvc?rev=1860021&view=rev
Log:
Improved: Turn ‘AssertTests’ into a unit test class
(OFBIZ-11067)
Added:
ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/AssertTests.java
(with props)
Removed:
ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/AssertTests.java
Modified:
ofbiz/ofbiz-framework/trunk/framework/base/testdef/basetests.xml
Added:
ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/AssertTests.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/AssertTests.java?rev=1860021&view=auto
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/AssertTests.java
(added)
+++
ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/AssertTests.java
Sat May 25 21:28:23 2019
@@ -0,0 +1,164 @@
+/*
+ * 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.ofbiz.base.util;
+
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ofbiz.base.util.Assert;
+import org.junit.Test;
+
+/**
+ * Assert tests {@link org.apache.ofbiz.base.util.Assert}.
+ */
+public class AssertTests {
+
+ @Test
+ public void testAssert(){
+ Object testObject = new Object();
+
+
//-----------------------------------------------------------------------
+ try {
+ Assert.notNull("foo", testObject);
+ } catch (Exception e) {
+ fail("notNull threw an exception - " + e);
+ }
+ try {
+ Assert.notNull("foo", null);
+ fail("notNull - IllegalArgumentException not thrown");
+ } catch (IllegalArgumentException e) {}
+
+
//-----------------------------------------------------------------------
+ try {
+ Assert.notNull("foo", testObject, "bar", testObject);
+ } catch (Exception e) {
+ fail("notNull (argument list) threw an exception - " + e);
+ }
+ try {
+ Assert.notNull("foo", testObject, "bar", null);
+ fail("notNull (argument list) - IllegalArgumentException not
thrown");
+ } catch (IllegalArgumentException e) {}
+
+
//-----------------------------------------------------------------------
+ try {
+ Assert.notEmpty("foo", "foo");
+ } catch (Exception e) {
+ fail("notEmpty(String) threw an exception - " + e);
+ }
+ try {
+ Assert.notEmpty("foo", "");
+ fail("notEmpty(String) - IllegalArgumentException not thrown");
+ } catch (IllegalArgumentException e) {}
+
+
//-----------------------------------------------------------------------
+ String[] strArray = {"foo", "bar"};
+ try {
+ Assert.notEmpty("foo", strArray);
+ } catch (Exception e) {
+ fail("notEmpty(Array) threw an exception - " + e);
+ }
+ try {
+ Assert.notEmpty("foo", new String[0]);
+ fail("notEmpty(Array) - IllegalArgumentException not thrown");
+ } catch (IllegalArgumentException e) {}
+
+
//-----------------------------------------------------------------------
+ List<String> strList = new ArrayList<>();
+ try {
+ Assert.notEmpty("foo", strList);
+ fail("notEmpty(Collection) - IllegalArgumentException not thrown");
+ } catch (IllegalArgumentException e) {}
+ strList.add("foo");
+ try {
+ Assert.notEmpty("foo", strList);
+ } catch (Exception e) {
+ fail("notEmpty(Collection) threw an exception - " + e);
+ }
+
+
//-----------------------------------------------------------------------
+ Map<String,String> strMap = new HashMap<>();
+ try {
+ Assert.notEmpty("foo", strMap);
+ fail("notEmpty(Map) - IllegalArgumentException not thrown");
+ } catch (IllegalArgumentException e) {}
+ strMap.put("foo", "foo");
+ try {
+ Assert.notEmpty("foo", strMap);
+ } catch (Exception e) {
+ fail("notEmpty(Map) threw an exception - " + e);
+ }
+
+
//-----------------------------------------------------------------------
+ try {
+ Assert.isInstanceOf("foo", strMap, Map.class);
+ } catch (Exception e) {
+ fail("isInstanceOf threw an exception - " + e);
+ }
+ try {
+ Assert.isInstanceOf("foo", strMap, AssertTests.class);
+ fail("isInstanceOf - IllegalArgumentException not thrown");
+ } catch (IllegalArgumentException e) {}
+
+
//-----------------------------------------------------------------------
+ try {
+ Assert.isInstanceOf("foo", strMap, String.class, Map.class);
+ } catch (Exception e) {
+ fail("isInstanceOf (argument list) threw an exception - " + e);
+ }
+ try {
+ Assert.isInstanceOf("foo", strMap, String.class,
AssertTests.class);
+ fail("isInstanceOf (argument list) - IllegalArgumentException not
thrown");
+ } catch (IllegalArgumentException e) {}
+
+
//-----------------------------------------------------------------------
+ try {
+ Assert.isNotInstanceOf("foo", strMap, String.class);
+ } catch (Exception e) {
+ fail("isNotInstanceOf threw an exception - " + e);
+ }
+ try {
+ Assert.isNotInstanceOf("foo", strMap, Map.class);
+ fail("isNotInstanceOf - IllegalArgumentException not thrown");
+ } catch (IllegalArgumentException e) {}
+
+
//-----------------------------------------------------------------------
+ try {
+ Assert.isNotInstanceOf("foo", strMap, String.class,
AssertTests.class);
+ } catch (Exception e) {
+ fail("isNotInstanceOf (argument list) threw an exception - " + e);
+ }
+ try {
+ Assert.isNotInstanceOf("foo", strMap, String.class, Map.class);
+ fail("isNotInstanceOf (argument list) - IllegalArgumentException
not thrown");
+ } catch (IllegalArgumentException e) {}
+
+
//-----------------------------------------------------------------------
+ try {
+ Assert.isAssignableTo("foo", strArray, strArray.getClass());
+ } catch (Exception e) {
+ fail("isNotInstanceOf (argument list) threw an exception - " + e);
+ }
+ try {
+ Assert.isAssignableTo("foo", strArray, Map[].class);
+ fail("isNotInstanceOf (argument list) - IllegalArgumentException
not thrown");
+ } catch (IllegalArgumentException e) {}
+ }
+}
Propchange:
ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/AssertTests.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/AssertTests.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange:
ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/AssertTests.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/ofbiz-framework/trunk/framework/base/testdef/basetests.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/testdef/basetests.xml?rev=1860021&r1=1860020&r2=1860021&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/testdef/basetests.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/testdef/basetests.xml Sat May 25
21:28:23 2019
@@ -22,7 +22,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd";>
<test-group case-name="basetests">
- <junit-test-suite
class-name="org.apache.ofbiz.base.util.test.AssertTests"/>
<junit-test-suite
class-name="org.apache.ofbiz.base.util.test.UtilObjectTests"/>
<junit-test-suite
class-name="org.apache.ofbiz.base.util.string.test.FlexibleStringExpanderTests"/>
<junit-test-suite
class-name="org.apache.ofbiz.base.util.collections.test.FlexibleMapAccessorTests"/>
