From a41662c1136b2bb4a4198df89e0e87d2be3ef099 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 16 Jul 2015 14:57:56 +0000
Subject: [PATCH] AutoRefactor'ed simplify expressions
---
opendj-server-legacy/src/test/java/org/opends/server/controls/MatchedValuesControlTest.java | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/controls/MatchedValuesControlTest.java b/opendj-server-legacy/src/test/java/org/opends/server/controls/MatchedValuesControlTest.java
index 2915b01..947f4af 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/controls/MatchedValuesControlTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/controls/MatchedValuesControlTest.java
@@ -156,7 +156,7 @@
// As we provide dummy type and value string, attType and attVal
// could
// be null.
- if ((attType != null) && (attVal != null))
+ if (attType != null && attVal != null)
{
mvf = MatchedValuesFilter.createEqualityFilter(attType, attVal);
assertNotNull(mvf);
@@ -247,7 +247,7 @@
{
rawAttTypeTestCurrent = null ;
}
- boolean exceptionExpected = (attTypeCurrent == null);
+ boolean exceptionExpected = attTypeCurrent == null;
try
{
@@ -358,9 +358,8 @@
}
// Check type, value
- // As we provide dummy type and value string, attType and attVal could
- // be null.
- if ((type != null) && (value != null))
+ // As we provide dummy type and value string, attType and attVal could be null.
+ if (type != null && value != null)
{
MatchedValuesFilter mvf;
mvf = MatchedValuesFilter.createGreaterOrEqualFilter(type,
@@ -411,7 +410,7 @@
}
// Check type, value
- if ((attType != null) && (attVal != null))
+ if (attType != null && attVal != null)
{
MatchedValuesFilter mvf;
mvf = MatchedValuesFilter.createGreaterOrEqualFilter(attType, attVal);
@@ -507,9 +506,8 @@
}
// Check type, value
- // As we provide dummy type and value string, attType and attVal could
- // be null.
- if ((attType != null) && (attVal != null))
+ // As we provide dummy type and value string, attType and attVal could be null.
+ if (attType != null && attVal != null)
{
mvf = MatchedValuesFilter.createLessOrEqualFilter(attType, attVal);
assertNotNull(mvf);
@@ -653,9 +651,8 @@
}
// Check type, value
- // As we provide dummy type and value string, attType and attVal could
- // be null.
- if ((attType != null) && (attVal != null))
+ // As we provide dummy type and value string, attType and attVal could be null.
+ if (attType != null && attVal != null)
{
mvf = MatchedValuesFilter.createApproximateFilter(attType, attVal);
assertNotNull(mvf);
@@ -742,8 +739,9 @@
attValueTestCurrent = attValueTest;
}
- boolean exceptionExpected = (attTypeTestCurrent == null)
- || (attValueTestCurrent == null) || (matchingRuleidTestCurrent == null);
+ boolean exceptionExpected = attTypeTestCurrent == null
+ || attValueTestCurrent == null
+ || matchingRuleidTestCurrent == null;
MatchedValuesFilter mvf = null;
try
--
Gitblit v1.10.0