/*
 * Copyright 2013-2017 the original author or authors.
 *
 * 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 org.springframework.cloud.gateway.test;

import org.junit.Ignore;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
import org.springframework.cloud.gateway.filter.route.AddRequestHeaderRouteFilterIntegrationTests;
import org.springframework.cloud.gateway.filter.route.AddRequestParameterRouteFilterIntegrationTests;
import org.springframework.cloud.gateway.filter.route.HystrixRouteFilterIntegrationTests;
import org.springframework.cloud.gateway.filter.route.RedirectToRouteFilterIntegrationTests;
import org.springframework.cloud.gateway.filter.route.RemoveNonProxyHeadersRouteFilterIntegrationTests;
import org.springframework.cloud.gateway.filter.route.RemoveRequestHeaderRouteFilterIntegrationTests;
import org.springframework.cloud.gateway.filter.route.RewritePathRouteFilterIntegrationTests;
import org.springframework.cloud.gateway.filter.route.RewritePathRouteFilterTests;
import org.springframework.cloud.gateway.filter.route.SecureHeadersRouteFilterIntegrationTests;
import org.springframework.cloud.gateway.filter.route.SetPathRouteFilterIntegrationTests;
import org.springframework.cloud.gateway.filter.route.SetPathRouteFilterTests;
import org.springframework.cloud.gateway.filter.route.SetResponseRouteFilterIntegrationTests;
import org.springframework.cloud.gateway.filter.route.SetStatusRouteFilterIntegrationTests;
import org.springframework.cloud.gateway.handler.predicate.AfterRoutePredicateTests;
import org.springframework.cloud.gateway.handler.predicate.BeforeRoutePredicateTests;
import org.springframework.cloud.gateway.handler.predicate.BetweenRoutePredicateTests;
import org.springframework.cloud.gateway.handler.predicate.HostRoutePredicateIntegrationTests;
import org.springframework.cloud.gateway.handler.predicate.PathRoutePredicateIntegrationTests;

/**
 * @author Spencer Gibb
 */
@Ignore
@RunWith(Suite.class)
@SuiteClasses({GatewayIntegrationTests.class,
		FormIntegrationTests.class,
		// route filter tests
		AddRequestHeaderRouteFilterIntegrationTests.class,
		AddRequestParameterRouteFilterIntegrationTests.class,
		HystrixRouteFilterIntegrationTests.class,
		RedirectToRouteFilterIntegrationTests.class,
		RemoveNonProxyHeadersRouteFilterIntegrationTests.class,
		RemoveRequestHeaderRouteFilterIntegrationTests.class,
		RewritePathRouteFilterIntegrationTests.class,
		SecureHeadersRouteFilterIntegrationTests.class,
		SetPathRouteFilterIntegrationTests.class,
		SetPathRouteFilterTests.class,
		SetResponseRouteFilterIntegrationTests.class,
		SetStatusRouteFilterIntegrationTests.class,
		RewritePathRouteFilterTests.class,
		// route predicate tests
		AfterRoutePredicateTests.class,
		BeforeRoutePredicateTests.class,
		BetweenRoutePredicateTests.class,
		HostRoutePredicateIntegrationTests.class,
		PathRoutePredicateIntegrationTests.class,
})
public class AdhocTestSuite {
}

@@ -2081,28 +2081,30 @@
 icate.AfterR
-oute
+equest
 PredicateTes
@@ -2092,32 +2092,39 @@
 RequestPredicate
+Factory
 Tests;%0Aimport or
@@ -2176,28 +2176,30 @@
 cate.BeforeR
-oute
+equest
 PredicateTes
@@ -2187,32 +2187,39 @@
 RequestPredicate
+Factory
 Tests;%0Aimport or
@@ -2268,36 +2268,38 @@
 edicate.BetweenR
-oute
+equest
 PredicateTests;%0A
@@ -2287,24 +2287,31 @@
 estPredicate
+Factory
 Tests;%0Aimpor
@@ -2463,37 +2463,130 @@
 ate.
-PathRoutePredicateIntegration
+MethodRequestPredicateFactoryTests;%0Aimport org.springframework.cloud.gateway.handler.predicate.PathRequestPredicateFactory
 Test
@@ -3406,20 +3406,22 @@
 %09%09AfterR
-oute
+equest
 Predicat
@@ -3413,32 +3413,39 @@
 RequestPredicate
+Factory
 Tests.class,%0A%09%09B
@@ -3450,20 +3450,22 @@
 %09BeforeR
-oute
+equest
 Predicat
@@ -3457,32 +3457,39 @@
 RequestPredicate
+Factory
 Tests.class,%0A%09%09B
@@ -3495,20 +3495,22 @@
 BetweenR
-oute
+equest
 Predicat
@@ -3510,16 +3510,23 @@
 redicate
+Factory
 Tests.cl
@@ -3580,37 +3580,79 @@
 ,%0A%09%09
-PathRoutePredicateIntegration
+MethodRequestPredicateFactoryTests.class,%0A%09%09PathRequestPredicateFactory
 Test

Fix test names