Merge branch 'pr/227'

This closes #227

Thanks to Andrii (@Abrasha)!
This commit is contained in:
Bruno P. Kinoshita 2017-01-08 20:00:34 +13:00
commit aab4018d8f
4 changed files with 202 additions and 0 deletions

View File

@ -0,0 +1,83 @@
/*
* 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.lang3.concurrent;
import org.apache.commons.lang3.exception.AbstractExceptionTest;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
/**
* JUnit tests for {@link CircuitBreakingException}.
*/
public class CircuitBreakingExceptionTest extends AbstractExceptionTest {
@Test(expected = CircuitBreakingException.class)
public void testThrowingInformativeException() throws Exception {
throw new CircuitBreakingException(EXCEPTION_MESSAGE, generateCause());
}
@Test(expected = CircuitBreakingException.class)
public void testThrowingExceptionWithMessage() throws Exception {
throw new CircuitBreakingException(EXCEPTION_MESSAGE);
}
@Test(expected = CircuitBreakingException.class)
public void testThrowingExceptionWithCause() throws Exception {
throw new CircuitBreakingException(generateCause());
}
@Test(expected = CircuitBreakingException.class)
public void testThrowingEmptyException() throws Exception {
throw new CircuitBreakingException();
}
@Test
public void testWithCauseAndMessage() throws Exception {
final Exception exception = new CircuitBreakingException(EXCEPTION_MESSAGE, generateCause());
assertNotNull(exception);
assertEquals(WRONG_EXCEPTION_MESSAGE, EXCEPTION_MESSAGE, exception.getMessage());
final Throwable cause = exception.getCause();
assertNotNull(cause);
assertEquals(WRONG_CAUSE_MESSAGE, CAUSE_MESSAGE, cause.getMessage());
}
@Test
public void testWithoutCause() throws Exception {
final Exception exception = new CircuitBreakingException(EXCEPTION_MESSAGE);
assertNotNull(exception);
assertEquals(WRONG_EXCEPTION_MESSAGE, EXCEPTION_MESSAGE, exception.getMessage());
final Throwable cause = exception.getCause();
assertNull(cause);
}
@Test
public void testWithoutMessage() throws Exception {
final Exception exception = new CircuitBreakingException(generateCause());
assertNotNull(exception);
assertNotNull(exception.getMessage());
final Throwable cause = exception.getCause();
assertNotNull(cause);
assertEquals(WRONG_CAUSE_MESSAGE, CAUSE_MESSAGE, cause.getMessage());
}
}

View File

@ -19,6 +19,7 @@ package org.apache.commons.lang3.concurrent;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame; import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
@ -347,6 +348,14 @@ public class ConcurrentUtilsTest {
assertNull("Got a result", ConcurrentUtils.initializeUnchecked(null)); assertNull("Got a result", ConcurrentUtils.initializeUnchecked(null));
} }
/**
* Tests creating ConcurrentRuntimeException with no arguments.
*/
@Test
public void testUninitializedConcurrentRuntimeException() {
assertNotNull("Error creating empty ConcurrentRuntimeException", new ConcurrentRuntimeException());
}
/** /**
* Tests a successful initializeUnchecked() operation. * Tests a successful initializeUnchecked() operation.
* *

View File

@ -0,0 +1,34 @@
/*
* 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.lang3.exception;
/**
* Base class for testing {@link Exception} descendants
*/
public abstract class AbstractExceptionTest {
protected static final String CAUSE_MESSAGE = "Cause message";
protected static final String EXCEPTION_MESSAGE = "Exception message";
protected static final String WRONG_EXCEPTION_MESSAGE = "Wrong exception message";
protected static final String WRONG_CAUSE_MESSAGE = "Wrong cause message";
protected Exception generateCause() {
return new Exception(CAUSE_MESSAGE);
}
}

View File

@ -0,0 +1,76 @@
/*
* 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.lang3.exception;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
/**
* JUnit tests for {@link CloneFailedExceptionTest}.
*/
public class CloneFailedExceptionTest extends AbstractExceptionTest {
@Test(expected = CloneFailedException.class)
public void testThrowingInformativeException() throws Exception {
throw new CloneFailedException(EXCEPTION_MESSAGE, generateCause());
}
@Test(expected = CloneFailedException.class)
public void testThrowingExceptionWithMessage() throws Exception {
throw new CloneFailedException(EXCEPTION_MESSAGE);
}
@Test(expected = CloneFailedException.class)
public void testThrowingExceptionWithCause() throws Exception {
throw new CloneFailedException(generateCause());
}
@Test
public void testWithCauseAndMessage() throws Exception {
final Exception exception = new CloneFailedException(EXCEPTION_MESSAGE, generateCause());
assertNotNull(exception);
assertEquals(WRONG_EXCEPTION_MESSAGE, EXCEPTION_MESSAGE, exception.getMessage());
final Throwable cause = exception.getCause();
assertNotNull(cause);
assertEquals(WRONG_CAUSE_MESSAGE, CAUSE_MESSAGE, cause.getMessage());
}
@Test
public void testWithoutCause() throws Exception {
final Exception exception = new CloneFailedException(EXCEPTION_MESSAGE);
assertNotNull(exception);
assertEquals(WRONG_EXCEPTION_MESSAGE, EXCEPTION_MESSAGE, exception.getMessage());
final Throwable cause = exception.getCause();
assertNull(cause);
}
@Test
public void testWithoutMessage() throws Exception {
final Exception exception = new CloneFailedException(generateCause());
assertNotNull(exception);
assertNotNull(exception.getMessage());
final Throwable cause = exception.getCause();
assertNotNull(cause);
assertEquals(WRONG_CAUSE_MESSAGE, CAUSE_MESSAGE, cause.getMessage());
}
}