/*
 * Copyright (c) 2008-2019, Hazelcast, Inc. All Rights Reserved.
 *
 * Licensed 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 com.hazelcast.internal.util;

import com.hazelcast.test.annotation.ParallelJVMTest;
import com.hazelcast.test.annotation.QuickTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;

import java.util.Optional;

import static com.hazelcast.query.impl.predicates.PredicateUtils.unwrapIfOptional;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;

@Category({QuickTest.class, ParallelJVMTest.class})
public class OptionalsTest {

    @SuppressWarnings("ConstantConditions")
    @Test
    public void testUnwrapping() {
        Object value = new Object();
        assertSame(value, unwrapIfOptional(value));

        assertNull(unwrapIfOptional(null));

        assertSame(value, unwrapIfOptional(Optional.of(value)));

        assertNull(unwrapIfOptional(Optional.empty()));
    }

}

@@ -654,24 +654,80 @@
 rnal.util;%0A%0A
+import com.hazelcast.test.HazelcastParallelClassRunner;%0A
 import com.h
@@ -764,24 +764,24 @@
 lelJVMTest;%0A
-
 import com.h
@@ -889,16 +889,49 @@
 ategory;
+%0Aimport org.junit.runner.RunWith;
 %0A%0Aimport
@@ -1122,16 +1122,61 @@
 tSame;%0A%0A
+@RunWith(HazelcastParallelClassRunner.class)%0A
 @Categor

Fix test runner