Complete moving test + infra into test/ and benchmark/ (#2032)
Complete moving test + infra into test/ and benchmark/
Signed-off-by: Otto van der Schaaf <oschaaf@we-amp.com>
diff --git a/.travis.yml b/.travis.yml
index 9036642..bf10d47 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,8 +26,8 @@
- BIT_FLAG=
script:
- - bazel build -c dbg -- //... -//pagespeed/envoy/... -//benchmark/...
- - bazel test --test_env=REDIS_PORT=6379 --test_env=MEMCACHED_PORT=11211 -c dbg -- //... -//pagespeed/envoy/... -//benchmark/...
+ - bazel build -c dbg -- //... -//pagespeed/envoy/...
+ - bazel test --test_env=REDIS_PORT=6379 --test_env=MEMCACHED_PORT=11211 -c dbg -- //test/... -//benchmark/...
after_failure:
- cat build.log
diff --git a/benchmark/net/instaweb/rewriter/BUILD b/benchmark/net/instaweb/rewriter/BUILD
index 470e59d..ba70fa3 100644
--- a/benchmark/net/instaweb/rewriter/BUILD
+++ b/benchmark/net/instaweb/rewriter/BUILD
@@ -6,10 +6,10 @@
name = "rewriter",
srcs = glob(["*.cc"]),
deps = [
- "//net/instaweb/rewriter:rewriter_test_base",
+ "//test/net/instaweb/rewriter:test_base",
"//test/pagespeed/kernel/base:kernel_test_util",
"//benchmark",
# TODO(XXX): this is just for data2c generated stuff. Lean up to just that.
- "//pagespeed/system",
+ "//pagespeed/system",
],
)
diff --git a/benchmark/net/instaweb/rewriter/image_speed_test.cc b/benchmark/net/instaweb/rewriter/image_speed_test.cc
index abea641..baa86a9 100644
--- a/benchmark/net/instaweb/rewriter/image_speed_test.cc
+++ b/benchmark/net/instaweb/rewriter/image_speed_test.cc
@@ -51,7 +51,7 @@
namespace {
-const char kTestData[] = "/net/instaweb/rewriter/testdata/";
+const char kTestData[] = "/test/net/instaweb/rewriter/testdata/";
const char kCuppa[] = "Cuppa.png";
const char kIronChef[] = "IronChef2.gif";
const char kPuzzle[] = "Puzzle.jpg";
diff --git a/benchmark/net/instaweb/rewriter/rewrite_driver_speed_test.cc b/benchmark/net/instaweb/rewriter/rewrite_driver_speed_test.cc
index b5406e5..e51e6d7 100644
--- a/benchmark/net/instaweb/rewriter/rewrite_driver_speed_test.cc
+++ b/benchmark/net/instaweb/rewriter/rewrite_driver_speed_test.cc
@@ -33,7 +33,6 @@
#include <memory>
-#include "net/instaweb/http/public/mock_url_fetcher.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/rewriter/public/critical_selector_finder.h"
#include "net/instaweb/rewriter/public/process_context.h"
@@ -41,12 +40,13 @@
#include "net/instaweb/rewriter/public/rewrite_driver_factory.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/util/public/mock_property_page.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/http/user_agent_matcher.h"
#include "pagespeed/opt/http/property_cache.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
// clang-format off
#include "benchmark/benchmark.h"
// clang-format on
diff --git a/benchmark/pagespeed/automatic/BUILD b/benchmark/pagespeed/automatic/BUILD
index 5fed3e7..9b64395 100644
--- a/benchmark/pagespeed/automatic/BUILD
+++ b/benchmark/pagespeed/automatic/BUILD
@@ -5,9 +5,9 @@
pagespeed_cc_benchmark(
name = "automatic",
srcs = glob(["*.cc"]),
- data = ["//net/instaweb/rewriter:testdata"],
+ data = ["//test/net/instaweb/rewriter:testdata"],
deps = [
- "//pagespeed/automatic:static_rewriter",
+ "//pagespeed/automatic:static_rewriter_lib",
"//benchmark",
],
)
diff --git a/benchmark/pagespeed/kernel/base/BUILD b/benchmark/pagespeed/kernel/base/BUILD
index 03db07b..8cd3b00 100644
--- a/benchmark/pagespeed/kernel/base/BUILD
+++ b/benchmark/pagespeed/kernel/base/BUILD
@@ -10,6 +10,6 @@
srcs = glob(["*.cc"]),
deps = [
"//benchmark",
- "//pagespeed/kernel/sharedmem:shared_mem",
+ "//pagespeed/kernel/sharedmem",
],
)
diff --git a/net/instaweb/http/BUILD b/net/instaweb/http/BUILD
index 7e59d66..08561e3 100644
--- a/net/instaweb/http/BUILD
+++ b/net/instaweb/http/BUILD
@@ -1,9 +1,4 @@
load("@rules_cc//cc:defs.bzl", "cc_library")
-load(
- "//bazel:pagespeed_test.bzl",
- "pagespeed_cc_test",
- "pagespeed_cc_test_library",
-)
licenses(["notice"]) # Apache 2
@@ -40,33 +35,3 @@
"//pagespeed/opt/http",
],
)
-
-pagespeed_cc_test_library(
- name = "http_test_base",
- srcs = [
- "mock_url_fetcher.cc",
- "ua_sensitive_test_fetcher.cc",
- ],
- hdrs = [
- "public/mock_url_fetcher.h",
- "public/ua_sensitive_test_fetcher.h",
- ],
- deps = [
- ":http",
- "//test/pagespeed/kernel/base:kernel_test_util",
- "//pagespeed/kernel/sharedmem:shared_mem_test_base",
- "//test/pagespeed/kernel/thread:thread_test_base",
- ],
-)
-
-pagespeed_cc_test(
- name = "http_test",
- srcs = glob(["*_test.cc"]),
- data = glob([
- "testdata/*",
- "testdata/www.google.com/*",
- ]),
- deps = [
- ":http_test_base",
- ],
-)
diff --git a/net/instaweb/rewriter/BUILD b/net/instaweb/rewriter/BUILD
index 24cb994..be7e9dc 100644
--- a/net/instaweb/rewriter/BUILD
+++ b/net/instaweb/rewriter/BUILD
@@ -1,10 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
-load(
- "//bazel:pagespeed_test.bzl",
- "pagespeed_cc_test",
- "pagespeed_cc_test_library",
-)
load("//bazel:data2c.bzl", "data2c_gen2", "data2c_gen2_opt")
load("//bazel:closure_compiler.bzl", "closure_compiler_gen", "closure_compiler_without_dependency_mode")
@@ -572,61 +567,3 @@
"//third_party/css_parser",
],
)
-
-pagespeed_cc_test_library(
- name = "rewriter_test_base",
- srcs = [
- "critical_images_finder_test_base.cc",
- "css_rewrite_test_base.cc",
- "image_test_base.cc",
- "mock_critical_images_finder.cc",
- "mock_resource_callback.cc",
- "notifying_fetch.cc",
- "rewrite_context_test_base.cc",
- "rewrite_test_base.cc",
- "test_rewrite_driver_factory.cc",
- "test_url_namer.cc",
- ],
- hdrs = [
- "image_testing_peer.h",
- "public/critical_images_finder_test_base.h",
- "public/css_rewrite_test_base.h",
- "public/custom_rewrite_test_base.h",
- "public/image_test_base.h",
- "public/mock_critical_images_finder.h",
- "public/mock_resource_callback.h",
- "public/notifying_fetch.h",
- "public/rewrite_context_test_base.h",
- "public/rewrite_options_test_base.h",
- "public/rewrite_test_base.h",
- "public/test_rewrite_driver_factory.h",
- "public/test_url_namer.h",
- ],
- deps = [
- ":rewriter",
- "//net/instaweb/http:http_test_base",
- "//pagespeed/kernel/http:http_test_base",
- "//pagespeed/kernel/image:image_test_base",
- "//pagespeed/kernel/util:util_test_base",
- "//pagespeed/opt/http:http_test_base",
- "//pagespeed/opt/logging:logging_test_base",
- "//test/pagespeed/kernel/cache:cache_test_base",
- "//test/pagespeed/kernel/html:html_test_base",
- "//test/pagespeed/kernel/thread:thread_test_base",
- ],
-)
-
-filegroup(
- name = "testdata",
- srcs = glob(["testdata/*"]),
- visibility = ["//visibility:public"],
-)
-
-pagespeed_cc_test(
- name = "rewriter_test",
- srcs = glob(["*_test.cc"]),
- data = [":testdata"],
- deps = [
- ":rewriter_test_base",
- ],
-)
diff --git a/net/instaweb/rewriter/config/README.md b/net/instaweb/rewriter/config/README.md
deleted file mode 100644
index 73bb380..0000000
--- a/net/instaweb/rewriter/config/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-this dir is a copy.
-rewriter and config have a circular dep.
-we break that by unifying that build.
\ No newline at end of file
diff --git a/net/instaweb/spriter/BUILD b/net/instaweb/spriter/BUILD
index a7f1fac..9e24e36 100644
--- a/net/instaweb/spriter/BUILD
+++ b/net/instaweb/spriter/BUILD
@@ -1,24 +1,17 @@
-licenses(["notice"]) # Apache 2
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
-load(
- "//bazel:pagespeed_test.bzl",
- "pagespeed_cc_test",
- "pagespeed_cc_test_library",
-)
+licenses(["notice"]) # Apache 2
proto_library(
name = "spriter_protos",
- srcs = [
- "public/image_spriter.proto",
- ],
+ srcs = ["public/image_spriter.proto"],
visibility = ["//visibility:public"],
)
cc_proto_library(
name = "spriter_protos_cc",
- deps = [
- ":spriter_protos",
- ]
+ deps = [":spriter_protos"],
)
cc_library(
@@ -30,35 +23,13 @@
],
hdrs = [
"image_library_interface.h",
- "public/image_spriter.h",
"libpng_image_library.h",
+ "public/image_spriter.h",
],
visibility = ["//visibility:public"],
deps = [
- "@libpng//:libpng",
- "//pagespeed/kernel/base:pagespeed_base",
":spriter_protos_cc",
+ "//pagespeed/kernel/base:pagespeed_base",
+ "@libpng",
],
)
-
-pagespeed_cc_test_library (
- name = "spriter_test_base",
- srcs = [
- "mock_image_library_interface.h",
- ],
- deps = [
- ":spriter",
- ]
-)
-
-pagespeed_cc_test(
- name = "spriter_test",
- srcs = [
- "image_spriter_test.cc",
- "libpng_image_library_test.cc",
- ],
- deps = [
- ":spriter_test_base",
- ],
- data = ["//net/instaweb/rewriter:testdata"],
-)
\ No newline at end of file
diff --git a/net/instaweb/util/public/mock_property_page.h b/net/instaweb/util/public/mock_property_page.h
index db7b2a6..ed77495 100644
--- a/net/instaweb/util/public/mock_property_page.h
+++ b/net/instaweb/util/public/mock_property_page.h
@@ -21,6 +21,6 @@
#define NET_INSTAWEB_UTIL_PUBLIC_MOCK_PROPERTY_PAGE_H_
// TODO(morlovich): Remove this forwarding header and change all references.
-#include "pagespeed/opt/http/mock_property_page.h"
+#include "test/pagespeed/opt/http/mock_property_page.h"
#endif // NET_INSTAWEB_UTIL_PUBLIC_MOCK_PROPERTY_PAGE_H_
diff --git a/pagespeed/apache/BUILD b/pagespeed/apache/BUILD
index 4cb2e98..731f4a5 100644
--- a/pagespeed/apache/BUILD
+++ b/pagespeed/apache/BUILD
@@ -1,9 +1,4 @@
load("@rules_cc//cc:defs.bzl", "cc_library")
-load(
- "//bazel:pagespeed_test.bzl",
- "pagespeed_cc_test",
- "pagespeed_cc_test_library",
-)
licenses(["notice"]) # Apache 2
@@ -65,60 +60,3 @@
"//pagespeed/system",
],
)
-
-pagespeed_cc_test_library(
- name = "apache_test_base",
- srcs = [
- "mock_apache.cc",
- ],
- hdrs = [
- "mock_apache.h",
- ],
- copts = [
- "-I/usr/include/apache2/",
- "-Iexternal/aprutil/include/",
- "-Iexternal/aprutil/include/arch/unix/",
- "-Iexternal/aprutil/",
- "-Ithird_party/aprutil/gen/arch/linux/x64/include/",
- "-Ithird_party/apr/gen/arch/linux/x64/include/",
- "-Iexternal/apr/include/",
- "-Iexternal/apr/include/arch/unix/",
- "-Iexternal/apr/",
- "-Iexternal/serf/include/",
- "-Iexternal/serf/",
- ],
- deps = [
- ":apache",
- "//net/instaweb/rewriter:rewriter_test_base",
- "//test/pagespeed/kernel/base:kernel_test_util",
- "//pagespeed/kernel/util:util_test_base",
- ],
-)
-
-pagespeed_cc_test(
- name = "apache_test",
- srcs = [
- "apache_config_test.cc",
- "apache_fetch_test.cc",
- "apache_writer_test.cc",
- "header_util_test.cc",
- "simple_buffered_apache_fetch_test.cc",
- ],
- copts = [
- "-I/usr/include/apache2/",
- "-Iexternal/aprutil/include/",
- "-Iexternal/aprutil/include/arch/unix/",
- "-Iexternal/aprutil/",
- "-Ithird_party/aprutil/gen/arch/linux/x64/include/",
- "-Ithird_party/apr/gen/arch/linux/x64/include/",
- "-Iexternal/apr/include/",
- "-Iexternal/apr/include/arch/unix/",
- "-Iexternal/apr/",
- "-Iexternal/serf/include/",
- "-Iexternal/serf/",
- ],
- data = ["//net/instaweb/rewriter:testdata"],
- deps = [
- ":apache_test_base",
- ],
-)
diff --git a/pagespeed/automatic/BUILD b/pagespeed/automatic/BUILD
index 61a8aaa..052a54f 100644
--- a/pagespeed/automatic/BUILD
+++ b/pagespeed/automatic/BUILD
@@ -1,13 +1,23 @@
-load("@rules_cc//cc:defs.bzl", "cc_library")
-load(
- "//bazel:pagespeed_test.bzl",
- "pagespeed_cc_test",
- "pagespeed_cc_test_library",
-)
+load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
licenses(["notice"]) # Apache 2
cc_library(
+ name = "static_rewriter_lib",
+ srcs = ["static_rewriter.cc"],
+ hdrs = ["static_rewriter.h"],
+ visibility = ["//visibility:public"],
+ deps = ["//pagespeed/system"],
+
+)
+
+cc_binary(
+ name = "static_rewriter",
+ srcs = ["static_rewriter_main.cc"],
+ deps = ["//pagespeed/automatic:static_rewriter_lib"],
+)
+
+cc_library(
name = "automatic",
srcs = [
"html_detector.cc",
@@ -23,47 +33,7 @@
visibility = ["//visibility:public"],
deps = [
"//net/instaweb/http",
- "//net/instaweb/util",
"//net/instaweb/rewriter",
- "//pagespeed/kernel/base:pagespeed_base",
- #"//pagespeed/kernel/thread",
- ],
-)
-
-pagespeed_cc_test_library(
- name = "automatic_test_base",
- srcs = [
- "proxy_interface_test_base.cc",
- ],
- hdrs = [
- "proxy_interface_test_base.h",
- ],
- deps = [
- ":automatic",
- "//net/instaweb/rewriter:rewriter_test_base",
- "//pagespeed/kernel/util:util_test_base",
- "//test/pagespeed/kernel/base:kernel_test_util",
- ],
-)
-
-pagespeed_cc_test_library(
- name = "static_rewriter",
- srcs = [
- "static_rewriter.cc",
- ],
- hdrs = [
- "static_rewriter.h",
- ],
- deps = [
- "//pagespeed/system",
- ],
-)
-
-pagespeed_cc_test(
- name = "automatic_test",
- srcs = glob(["*_test.cc"]),
- data = ["//net/instaweb/rewriter:testdata"],
- deps = [
- ":automatic_test_base",
+ "//net/instaweb/util",
],
)
diff --git a/pagespeed/controller/BUILD b/pagespeed/controller/BUILD
index 12fe6e9..be8c34a 100644
--- a/pagespeed/controller/BUILD
+++ b/pagespeed/controller/BUILD
@@ -1,11 +1,6 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
-load(
- "//bazel:pagespeed_test.bzl",
- "pagespeed_cc_test",
- "pagespeed_cc_test_library",
-)
licenses(["notice"]) # Apache 2
@@ -87,68 +82,3 @@
"//pagespeed/system:system_controller_process_h",
],
)
-
-pagespeed_cc_test_library(
- name = "controller_test_base",
- srcs = [
- "grpc_server_test.cc",
- ],
- hdrs = [
- "controller_grpc_mocks.h",
- "grpc_server_test.h",
- ],
- deps = [
- ":controller",
- "//test/pagespeed/kernel/thread:thread_test_base",
- "//pagespeed/kernel/util",
- ],
-)
-
-proto_library(
- name = "grpc_test_proto",
- srcs = ["grpc_test.proto"],
-)
-
-cc_proto_library(
- name = "grpc_test_proto_cc",
- deps = [":grpc_test_proto"],
-)
-
-cc_grpc_library(
- name = "grpc_test_proto_grpc",
- srcs = [
- ":grpc_test_proto",
- ],
- grpc_only = True,
- proto_only = False,
- use_external = False,
- visibility = ["//visibility:public"],
- well_known_protos = True,
- deps = [
- ":grpc_test_proto_cc",
- ],
-)
-
-pagespeed_cc_test(
- name = "controller_test",
- srcs = [
- "central_controller_callback_test.cc",
- "context_registry_test.cc",
- "expensive_operation_rpc_context_test.cc",
- "expensive_operation_rpc_handler_test.cc",
- "named_lock_schedule_rewrite_controller_test.cc",
- "popularity_contest_schedule_rewrite_controller_test.cc",
- "priority_queue_test.cc",
- "queued_expensive_operation_controller_test.cc",
- "rpc_handler_test.cc",
- "schedule_rewrite_rpc_context_test.cc",
- "schedule_rewrite_rpc_handler_test.cc",
- "work_bound_expensive_operation_controller_test.cc",
- ],
- shard_count = 1,
- deps = [
- ":controller_test_base",
- ":grpc_test_proto_grpc",
- "//pagespeed/kernel/base:pagespeed_base",
- ],
-)
diff --git a/pagespeed/kernel/http/BUILD b/pagespeed/kernel/http/BUILD
index e8be042..9bbd452 100644
--- a/pagespeed/kernel/http/BUILD
+++ b/pagespeed/kernel/http/BUILD
@@ -1,10 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
-load(
- "//bazel:pagespeed_test.bzl",
- "pagespeed_cc_test",
- "pagespeed_cc_test_library",
-)
licenses(["notice"]) # Apache 2
@@ -79,27 +74,3 @@
"@drp",
],
)
-
-pagespeed_cc_test_library(
- name = "http_test_base",
- srcs = [
- "user_agent_matcher_test_base.cc",
- ],
- hdrs = [
- "user_agent_matcher_test_base.h",
- ],
- deps = [
- ":http",
- "//test/pagespeed/kernel/base:kernel_test_util",
- "//pagespeed/kernel/util:util_test_base",
- ],
-)
-
-pagespeed_cc_test(
- name = "http_test",
- srcs = glob(["*_test.cc"]),
- deps = [
- ":http",
- ":http_test_base",
- ],
-)
diff --git a/pagespeed/kernel/image/BUILD b/pagespeed/kernel/image/BUILD
index 3931d66..af045fa 100644
--- a/pagespeed/kernel/image/BUILD
+++ b/pagespeed/kernel/image/BUILD
@@ -1,10 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
-load(
- "//bazel:pagespeed_test.bzl",
- "pagespeed_cc_test",
- "pagespeed_cc_test_library",
-)
licenses(["notice"]) # Apache 2
@@ -75,36 +70,3 @@
"@optipng//:opngreduc",
],
)
-
-pagespeed_cc_test_library(
- name = "image_test_base",
- srcs = [
- "jpeg_optimizer_test_helper.cc",
- "test_utils.cc",
- ],
- hdrs = [
- "jpeg_optimizer_test_helper.h",
- "test_utils.h",
- ],
- deps = [
- ":image",
- "//test/pagespeed/kernel/base:kernel_test_util",
- ],
-)
-
-pagespeed_cc_test(
- name = "image_test",
- srcs = glob(["*_test.cc"]),
- data = glob([
- "testdata/gif/*",
- "testdata/jpeg/*",
- "testdata/png/*",
- "testdata/pngsuite/*",
- "testdata/pngsuite/gif/*",
- "testdata/resized/*",
- "testdata/webp/*",
- ]),
- deps = [
- ":image_test_base",
- ],
-)
diff --git a/pagespeed/kernel/js/BUILD b/pagespeed/kernel/js/BUILD
index 076948d..05b55c3 100644
--- a/pagespeed/kernel/js/BUILD
+++ b/pagespeed/kernel/js/BUILD
@@ -1,8 +1,4 @@
load("@rules_cc//cc:defs.bzl", "cc_library")
-load(
- "//bazel:pagespeed_test.bzl",
- "pagespeed_cc_test",
-)
licenses(["notice"]) # Apache 2
@@ -32,12 +28,3 @@
"@re2",
],
)
-
-pagespeed_cc_test(
- name = "js_test",
- srcs = glob(["*_test.cc"]),
- data = glob(["testdata/third_party/*"]),
- deps = [
- ":js",
- ],
-)
diff --git a/pagespeed/kernel/sharedmem/BUILD b/pagespeed/kernel/sharedmem/BUILD
index 1ec639e..d7511ec 100644
--- a/pagespeed/kernel/sharedmem/BUILD
+++ b/pagespeed/kernel/sharedmem/BUILD
@@ -1,15 +1,10 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
-load(
- "//bazel:pagespeed_test.bzl",
- "pagespeed_cc_test",
- "pagespeed_cc_test_library",
-)
licenses(["notice"]) # Apache 2
cc_library(
- name = "shared_mem",
+ name = "sharedmem",
srcs = [
"inprocess_shared_mem.cc",
"shared_circular_buffer.cc",
@@ -46,43 +41,3 @@
name = "shared_mem_cache_shapshot_proto_cc",
deps = [":shared_mem_cache_shapshot_proto"],
)
-
-pagespeed_cc_test_library(
- name = "shared_mem_test_base",
- srcs = [
- "shared_circular_buffer_test_base.cc",
- "shared_dynamic_string_map_test_base.cc",
- "shared_mem_cache_data_test_base.cc",
- "shared_mem_cache_test_base.cc",
- "shared_mem_lock_manager_test_base.cc",
- "shared_mem_statistics_test_base.cc",
- "shared_mem_test_base.cc",
- ],
- hdrs = [
- "shared_circular_buffer_test_base.h",
- "shared_dynamic_string_map_test_base.h",
- "shared_mem_cache_data_test_base.h",
- "shared_mem_cache_test_base.h",
- "shared_mem_lock_manager_test_base.h",
- "shared_mem_statistics_test_base.h",
- "shared_mem_test_base.h",
- ],
- deps = [
- ":shared_mem",
- "//test/pagespeed/kernel/base:kernel_test_util",
- "//test/pagespeed/kernel/cache:cache_test_base",
- "//test/pagespeed/kernel/thread:thread_test_base",
- "//pagespeed/kernel/util:util_test_base",
- ],
-)
-
-pagespeed_cc_test(
- name = "shared_mem_test",
- srcs = glob(["*_test.cc"]),
- shard_count = 1,
- deps = [
- ":shared_mem",
- ":shared_mem_test_base",
- "//pagespeed/kernel/cache",
- ],
-)
diff --git a/pagespeed/kernel/util/BUILD b/pagespeed/kernel/util/BUILD
index 67b9008..d2f6483 100644
--- a/pagespeed/kernel/util/BUILD
+++ b/pagespeed/kernel/util/BUILD
@@ -1,9 +1,4 @@
load("@rules_cc//cc:defs.bzl", "cc_library")
-load(
- "//bazel:pagespeed_test.bzl",
- "pagespeed_cc_test",
- "pagespeed_cc_test_library",
-)
licenses(["notice"]) # Apache 2
@@ -76,30 +71,3 @@
"@envoy//bazel/foreign_cc:zlib",
],
)
-
-pagespeed_cc_test_library(
- name = "util_test_base",
- srcs = [
- "lock_manager_spammer.cc",
- "mock_nonce_generator.cc",
- "nonce_generator_test_base.cc",
- ],
- hdrs = [
- "lock_manager_spammer.h",
- "mock_nonce_generator.h",
- "nonce_generator_test_base.h",
- ],
- deps = [
- ":util",
- "//test/pagespeed/kernel/base:kernel_test_util",
- "//test/pagespeed/kernel/thread:thread_test_base",
- ],
-)
-
-pagespeed_cc_test(
- name = "util_test",
- srcs = glob(["*_test.cc"]),
- deps = [
- ":util_test_base",
- ],
-)
diff --git a/pagespeed/opt/ads/BUILD b/pagespeed/opt/ads/BUILD
index a14a731..088617a 100644
--- a/pagespeed/opt/ads/BUILD
+++ b/pagespeed/opt/ads/BUILD
@@ -1,8 +1,4 @@
-load(
- "//bazel:pagespeed_test.bzl",
- "pagespeed_cc_test",
- "pagespeed_cc_test_library",
-)
+load("@rules_cc//cc:defs.bzl", "cc_library")
licenses(["notice"]) # Apache 2
@@ -21,18 +17,7 @@
visibility = ["//visibility:public"],
deps = [
"//pagespeed/kernel/base:pagespeed_base",
- "//pagespeed/kernel/html:html",
- "//pagespeed/kernel/js:js",
+ "//pagespeed/kernel/html",
+ "//pagespeed/kernel/js",
],
)
-
-pagespeed_cc_test_library(
- name = "ads_test_base",
- deps = [
- ":ads",
- ],
-)
-
-pagespeed_cc_test(
- name = "ads_test",
-)
diff --git a/pagespeed/opt/http/BUILD b/pagespeed/opt/http/BUILD
index 686505a..16fbe95 100644
--- a/pagespeed/opt/http/BUILD
+++ b/pagespeed/opt/http/BUILD
@@ -1,10 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
-load(
- "//bazel:pagespeed_test.bzl",
- "pagespeed_cc_test",
- "pagespeed_cc_test_library",
-)
licenses(["notice"]) # Apache 2
@@ -49,23 +44,3 @@
"//pagespeed/opt/logging",
],
)
-
-pagespeed_cc_test_library(
- name = "http_test_base",
- srcs = [
- "mock_property_page.cc",
- ],
- hdrs = [
- "mock_property_page.h",
- ],
- deps = [
- ":http",
- "//test/pagespeed/kernel/base:kernel_test_util",
- ],
-)
-
-pagespeed_cc_test(
- name = "http_test",
- srcs = glob(["*_test.cc"]),
- deps = [":http_test_base"],
-)
diff --git a/pagespeed/opt/logging/BUILD b/pagespeed/opt/logging/BUILD
index 69c306e..fb516ab 100644
--- a/pagespeed/opt/logging/BUILD
+++ b/pagespeed/opt/logging/BUILD
@@ -1,10 +1,5 @@
load("@rules_proto//proto:defs.bzl", "proto_library")
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
-load(
- "//bazel:pagespeed_test.bzl",
- "pagespeed_cc_test",
- "pagespeed_cc_test_library",
-)
licenses(["notice"]) # Apache 2
@@ -44,25 +39,3 @@
"//pagespeed/kernel/base:pagespeed_base",
],
)
-
-pagespeed_cc_test_library(
- name = "logging_test_base",
- srcs = [
- "log_record_test_helper.cc",
- ],
- hdrs = [
- "log_record_test_helper.h",
- ],
- deps = [
- ":logging",
- "//test/pagespeed/kernel/base:kernel_test_util",
- ],
-)
-
-pagespeed_cc_test(
- name = "logging_test",
- srcs = glob(["*_test.cc"]),
- deps = [
- ":logging_test_base",
- ],
-)
diff --git a/pagespeed/system/BUILD b/pagespeed/system/BUILD
index f9f336d..e3411ed 100644
--- a/pagespeed/system/BUILD
+++ b/pagespeed/system/BUILD
@@ -1,11 +1,6 @@
-load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
+load("@rules_cc//cc:defs.bzl", "cc_library")
load("//bazel:closure_compiler.bzl", "closure_compiler_gen")
load("//bazel:data2c.bzl", "data2c_gen2_admin_css", "data2c_gen2_admin_js")
-load(
- "//bazel:pagespeed_test.bzl",
- "pagespeed_cc_test",
- "pagespeed_cc_test_library",
-)
licenses(["notice"]) # Apache 2
@@ -241,7 +236,7 @@
":system_controller_process_h",
"//net/instaweb/http",
"//net/instaweb/rewriter",
- "//pagespeed/kernel/sharedmem:shared_mem",
+ "//pagespeed/kernel/sharedmem",
"//third_party/redis-crc",
"@apr",
"@aprutil",
@@ -259,53 +254,3 @@
],
visibility = ["//visibility:public"],
)
-
-cc_binary(
- name = "redis_cache_cluster_setup",
- testonly = True,
- srcs = [
- "redis_cache_cluster_setup_main.cc",
- ],
- deps = [
- ":system_test_base",
- ],
-)
-
-pagespeed_cc_test_library(
- name = "system_test_base",
- srcs = [
- "redis_cache_cluster_setup.cc",
- "tcp_connection_for_testing.cc",
- "tcp_server_thread_for_testing.cc",
- ],
- hdrs = [
- "redis_cache_cluster_setup.h",
- "tcp_connection_for_testing.h",
- "tcp_server_thread_for_testing.h",
- ],
- deps = [
- ":system",
- "//net/instaweb/rewriter:rewriter_test_base",
- "//test/pagespeed/kernel/base:kernel_test_util",
- "//test/pagespeed/kernel/cache:cache_test_base",
- "//test/pagespeed/kernel/thread:thread_test_base",
- ],
-)
-
-pagespeed_cc_test(
- name = "system_test",
- srcs = [
- "apr_mem_cache_test.cc",
- "external_server_spec_test.cc",
- "in_place_resource_recorder_test.cc",
- "loopback_route_fetcher_test.cc",
- "redis_cache_cluster_test.cc",
- "serf_url_async_fetcher_test.cc",
- "system_caches_test.cc",
- "system_message_handler_test.cc",
- ],
- shard_count = 1,
- deps = [
- ":system_test_base",
- ],
-)
diff --git a/test/net/instaweb/http/BUILD b/test/net/instaweb/http/BUILD
new file mode 100644
index 0000000..03f6045
--- /dev/null
+++ b/test/net/instaweb/http/BUILD
@@ -0,0 +1,34 @@
+load(
+ "//bazel:pagespeed_test.bzl",
+ "pagespeed_cc_test",
+ "pagespeed_cc_test_library",
+)
+
+licenses(["notice"]) # Apache 2
+
+pagespeed_cc_test_library(
+ name = "http_test_base",
+ srcs = glob(
+ ["*.cc"],
+ exclude = ["*_test.cc"],
+ ),
+ hdrs = glob(["*.h"]),
+ deps = [
+ "//net/instaweb/http",
+ "//test/pagespeed/kernel/base:kernel_test_util",
+ "//test/pagespeed/kernel/sharedmem:test_base",
+ "//test/pagespeed/kernel/thread:thread_test_base",
+ ],
+)
+
+pagespeed_cc_test(
+ name = "http",
+ srcs = glob(["*_test.cc"]),
+ data = glob([
+ "testdata/*",
+ "testdata/www.google.com/*",
+ ]),
+ deps = [
+ "//test/net/instaweb/http:http_test_base",
+ ],
+)
diff --git a/net/instaweb/http/async_fetch_test.cc b/test/net/instaweb/http/async_fetch_test.cc
similarity index 100%
rename from net/instaweb/http/async_fetch_test.cc
rename to test/net/instaweb/http/async_fetch_test.cc
diff --git a/net/instaweb/http/cache_url_async_fetcher_test.cc b/test/net/instaweb/http/cache_url_async_fetcher_test.cc
similarity index 99%
rename from net/instaweb/http/cache_url_async_fetcher_test.cc
rename to test/net/instaweb/http/cache_url_async_fetcher_test.cc
index cf7ad2a..16dede9 100644
--- a/net/instaweb/http/cache_url_async_fetcher_test.cc
+++ b/test/net/instaweb/http/cache_url_async_fetcher_test.cc
@@ -28,7 +28,6 @@
#include "net/instaweb/http/public/http_cache_failure.h"
#include "net/instaweb/http/public/http_value.h"
#include "net/instaweb/http/public/logging_proto_impl.h"
-#include "net/instaweb/http/public/mock_url_fetcher.h"
#include "net/instaweb/http/public/request_context.h"
#include "pagespeed/kernel/base/abstract_mutex.h" // for ScopedMutex
#include "pagespeed/kernel/base/function.h"
@@ -52,6 +51,7 @@
#include "pagespeed/kernel/util/platform.h"
#include "pagespeed/kernel/util/simple_stats.h"
#include "pagespeed/opt/logging/log_record.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mem_file_system.h"
#include "test/pagespeed/kernel/base/mock_hasher.h"
diff --git a/net/instaweb/http/fetcher_test.cc b/test/net/instaweb/http/fetcher_test.cc
similarity index 98%
rename from net/instaweb/http/fetcher_test.cc
rename to test/net/instaweb/http/fetcher_test.cc
index b1a74ee..5b04a43 100644
--- a/net/instaweb/http/fetcher_test.cc
+++ b/test/net/instaweb/http/fetcher_test.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "net/instaweb/http/public/fetcher_test.h"
+#include "test/net/instaweb/http/fetcher_test.h"
#include "base/logging.h"
#include "net/instaweb/http/public/http_cache.h"
diff --git a/net/instaweb/http/public/fetcher_test.h b/test/net/instaweb/http/fetcher_test.h
similarity index 97%
rename from net/instaweb/http/public/fetcher_test.h
rename to test/net/instaweb/http/fetcher_test.h
index 4271678..0c91c6a 100644
--- a/net/instaweb/http/public/fetcher_test.h
+++ b/test/net/instaweb/http/fetcher_test.h
@@ -25,7 +25,6 @@
#include "base/logging.h"
#include "net/instaweb/http/public/async_fetch.h"
#include "net/instaweb/http/public/counting_url_async_fetcher.h"
-#include "net/instaweb/http/public/mock_url_fetcher.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/http/public/wait_url_async_fetcher.h"
#include "pagespeed/kernel/base/basictypes.h"
@@ -35,6 +34,7 @@
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/base/thread_system.h"
#include "pagespeed/kernel/util/simple_stats.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
@@ -117,7 +117,7 @@
};
GoogleString TestFilename() {
- return (GTestSrcDir() + "/net/instaweb/http/testdata/google.http");
+ return (GTestSrcDir() + "/test/net/instaweb/http/testdata/google.http");
}
// This validation code is hard-coded to the http request capture in
diff --git a/net/instaweb/http/headers_cookie_util_test.cc b/test/net/instaweb/http/headers_cookie_util_test.cc
similarity index 100%
rename from net/instaweb/http/headers_cookie_util_test.cc
rename to test/net/instaweb/http/headers_cookie_util_test.cc
diff --git a/net/instaweb/http/http_cache_test.cc b/test/net/instaweb/http/http_cache_test.cc
similarity index 100%
rename from net/instaweb/http/http_cache_test.cc
rename to test/net/instaweb/http/http_cache_test.cc
diff --git a/net/instaweb/http/http_dump_url_async_writer_test.cc b/test/net/instaweb/http/http_dump_url_async_writer_test.cc
similarity index 98%
rename from net/instaweb/http/http_dump_url_async_writer_test.cc
rename to test/net/instaweb/http/http_dump_url_async_writer_test.cc
index fe5601d..764beeb 100644
--- a/net/instaweb/http/http_dump_url_async_writer_test.cc
+++ b/test/net/instaweb/http/http_dump_url_async_writer_test.cc
@@ -20,12 +20,12 @@
#include "net/instaweb/http/public/http_dump_url_async_writer.h"
#include "net/instaweb/http/public/counting_url_async_fetcher.h"
-#include "net/instaweb/http/public/fetcher_test.h"
#include "net/instaweb/http/public/wait_url_async_fetcher.h"
#include "pagespeed/kernel/base/null_mutex.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
+#include "test/net/instaweb/http/fetcher_test.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mem_file_system.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
diff --git a/net/instaweb/http/http_dump_url_fetcher_test.cc b/test/net/instaweb/http/http_dump_url_fetcher_test.cc
similarity index 98%
rename from net/instaweb/http/http_dump_url_fetcher_test.cc
rename to test/net/instaweb/http/http_dump_url_fetcher_test.cc
index 7383c60..5525fdb 100644
--- a/net/instaweb/http/http_dump_url_fetcher_test.cc
+++ b/test/net/instaweb/http/http_dump_url_fetcher_test.cc
@@ -53,7 +53,7 @@
HttpDumpUrlFetcherTest()
: thread_system_(Platform::CreateThreadSystem()),
mock_timer_(thread_system_->NewMutex(), 0),
- http_dump_fetcher_(GTestSrcDir() + "/net/instaweb/http/testdata",
+ http_dump_fetcher_(GTestSrcDir() + "/test/net/instaweb/http/testdata",
&file_system_, &mock_timer_) {}
protected:
diff --git a/net/instaweb/http/http_response_parser_test.cc b/test/net/instaweb/http/http_response_parser_test.cc
similarity index 97%
rename from net/instaweb/http/http_response_parser_test.cc
rename to test/net/instaweb/http/http_response_parser_test.cc
index 911486b..42fe361 100644
--- a/net/instaweb/http/http_response_parser_test.cc
+++ b/test/net/instaweb/http/http_response_parser_test.cc
@@ -19,13 +19,13 @@
#include "net/instaweb/http/public/http_response_parser.h"
-#include "net/instaweb/http/public/fetcher_test.h"
#include "pagespeed/kernel/base/google_message_handler.h"
#include "pagespeed/kernel/base/null_mutex.h"
#include "pagespeed/kernel/base/stdio_file_system.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_writer.h"
#include "pagespeed/kernel/http/response_headers.h"
+#include "test/net/instaweb/http/fetcher_test.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
diff --git a/net/instaweb/http/http_value_test.cc b/test/net/instaweb/http/http_value_test.cc
similarity index 100%
rename from net/instaweb/http/http_value_test.cc
rename to test/net/instaweb/http/http_value_test.cc
diff --git a/net/instaweb/http/inflating_fetch_test.cc b/test/net/instaweb/http/inflating_fetch_test.cc
similarity index 100%
rename from net/instaweb/http/inflating_fetch_test.cc
rename to test/net/instaweb/http/inflating_fetch_test.cc
diff --git a/net/instaweb/http/public/log_record_test_helper.h b/test/net/instaweb/http/log_record_test_helper.h
similarity index 93%
rename from net/instaweb/http/public/log_record_test_helper.h
rename to test/net/instaweb/http/log_record_test_helper.h
index 45aaea1..ac0189f 100644
--- a/net/instaweb/http/public/log_record_test_helper.h
+++ b/test/net/instaweb/http/log_record_test_helper.h
@@ -21,6 +21,6 @@
#define NET_INSTAWEB_HTTP_PUBLIC_LOG_RECORD_TEST_HELPER_H_
// TODO(morlovich): Remove this forwarding header and change all references.
-#include "pagespeed/opt/logging/log_record_test_helper.h"
+#include "test/pagespeed/opt/logging/log_record_test_helper.h"
#endif // NET_INSTAWEB_HTTP_PUBLIC_LOG_RECORD_TEST_HELPER_H_
diff --git a/net/instaweb/http/public/mock_callback.h b/test/net/instaweb/http/mock_callback.h
similarity index 100%
rename from net/instaweb/http/public/mock_callback.h
rename to test/net/instaweb/http/mock_callback.h
diff --git a/net/instaweb/http/mock_url_fetcher.cc b/test/net/instaweb/http/mock_url_fetcher.cc
similarity index 99%
rename from net/instaweb/http/mock_url_fetcher.cc
rename to test/net/instaweb/http/mock_url_fetcher.cc
index bacc449..e203c84 100644
--- a/net/instaweb/http/mock_url_fetcher.cc
+++ b/test/net/instaweb/http/mock_url_fetcher.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "net/instaweb/http/public/mock_url_fetcher.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
#include <map>
#include <utility> // for pair
diff --git a/net/instaweb/http/public/mock_url_fetcher.h b/test/net/instaweb/http/mock_url_fetcher.h
similarity index 100%
rename from net/instaweb/http/public/mock_url_fetcher.h
rename to test/net/instaweb/http/mock_url_fetcher.h
diff --git a/net/instaweb/http/mock_url_fetcher_test.cc b/test/net/instaweb/http/mock_url_fetcher_test.cc
similarity index 99%
rename from net/instaweb/http/mock_url_fetcher_test.cc
rename to test/net/instaweb/http/mock_url_fetcher_test.cc
index 5de391f..16183c7 100644
--- a/net/instaweb/http/mock_url_fetcher_test.cc
+++ b/test/net/instaweb/http/mock_url_fetcher_test.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "net/instaweb/http/public/mock_url_fetcher.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
#include "net/instaweb/http/public/async_fetch.h"
#include "net/instaweb/http/public/request_context.h"
diff --git a/net/instaweb/http/rate_controlling_url_async_fetcher_test.cc b/test/net/instaweb/http/rate_controlling_url_async_fetcher_test.cc
similarity index 99%
rename from net/instaweb/http/rate_controlling_url_async_fetcher_test.cc
rename to test/net/instaweb/http/rate_controlling_url_async_fetcher_test.cc
index 2a63168..79066f4 100644
--- a/net/instaweb/http/rate_controlling_url_async_fetcher_test.cc
+++ b/test/net/instaweb/http/rate_controlling_url_async_fetcher_test.cc
@@ -24,7 +24,6 @@
#include "net/instaweb/http/public/async_fetch.h"
#include "net/instaweb/http/public/counting_url_async_fetcher.h"
-#include "net/instaweb/http/public/mock_url_fetcher.h"
#include "net/instaweb/http/public/rate_controller.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/http/public/wait_url_async_fetcher.h"
@@ -39,6 +38,7 @@
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/util/platform.h"
#include "pagespeed/kernel/util/simple_stats.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
diff --git a/net/instaweb/http/public/reflecting_test_fetcher.h b/test/net/instaweb/http/reflecting_test_fetcher.h
similarity index 100%
rename from net/instaweb/http/public/reflecting_test_fetcher.h
rename to test/net/instaweb/http/reflecting_test_fetcher.h
diff --git a/net/instaweb/http/reflecting_test_fetcher_test.cc b/test/net/instaweb/http/reflecting_test_fetcher_test.cc
similarity index 94%
rename from net/instaweb/http/reflecting_test_fetcher_test.cc
rename to test/net/instaweb/http/reflecting_test_fetcher_test.cc
index e1fae98..250ca52 100644
--- a/net/instaweb/http/reflecting_test_fetcher_test.cc
+++ b/test/net/instaweb/http/reflecting_test_fetcher_test.cc
@@ -21,9 +21,8 @@
// Unit tests for ReflectingTestFetcher
//
-#include "net/instaweb/http/public/reflecting_test_fetcher.h"
+#include "test/net/instaweb/http/reflecting_test_fetcher.h"
-#include "net/instaweb/http/public/mock_callback.h"
#include "net/instaweb/http/public/request_context.h"
#include "pagespeed/kernel/base/google_message_handler.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
@@ -32,6 +31,7 @@
#include "pagespeed/kernel/http/request_headers.h"
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/util/platform.h"
+#include "test/net/instaweb/http/mock_callback.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/http/simulated_delay_fetcher_test.cc b/test/net/instaweb/http/simulated_delay_fetcher_test.cc
similarity index 100%
rename from net/instaweb/http/simulated_delay_fetcher_test.cc
rename to test/net/instaweb/http/simulated_delay_fetcher_test.cc
diff --git a/net/instaweb/http/sync_fetcher_adapter_test.cc b/test/net/instaweb/http/sync_fetcher_adapter_test.cc
similarity index 100%
rename from net/instaweb/http/sync_fetcher_adapter_test.cc
rename to test/net/instaweb/http/sync_fetcher_adapter_test.cc
diff --git a/net/instaweb/http/testdata/google.http b/test/net/instaweb/http/testdata/google.http
similarity index 100%
rename from net/instaweb/http/testdata/google.http
rename to test/net/instaweb/http/testdata/google.http
diff --git a/net/instaweb/http/testdata/www.google.com/, b/test/net/instaweb/http/testdata/www.google.com/,
similarity index 100%
rename from net/instaweb/http/testdata/www.google.com/,
rename to test/net/instaweb/http/testdata/www.google.com/,
Binary files differ
diff --git a/net/instaweb/http/ua_sensitive_test_fetcher.cc b/test/net/instaweb/http/ua_sensitive_test_fetcher.cc
similarity index 97%
rename from net/instaweb/http/ua_sensitive_test_fetcher.cc
rename to test/net/instaweb/http/ua_sensitive_test_fetcher.cc
index cdc5082..03c8cf0 100644
--- a/net/instaweb/http/ua_sensitive_test_fetcher.cc
+++ b/test/net/instaweb/http/ua_sensitive_test_fetcher.cc
@@ -22,7 +22,7 @@
// query param before delegating to another fetcher. Meant for use in
// unit tests.
-#include "net/instaweb/http/public/ua_sensitive_test_fetcher.h"
+#include "test/net/instaweb/http/ua_sensitive_test_fetcher.h"
#include "base/logging.h"
#include "net/instaweb/http/public/async_fetch.h"
diff --git a/net/instaweb/http/public/ua_sensitive_test_fetcher.h b/test/net/instaweb/http/ua_sensitive_test_fetcher.h
similarity index 100%
rename from net/instaweb/http/public/ua_sensitive_test_fetcher.h
rename to test/net/instaweb/http/ua_sensitive_test_fetcher.h
diff --git a/net/instaweb/http/ua_sensitive_test_fetcher_test.cc b/test/net/instaweb/http/ua_sensitive_test_fetcher_test.cc
similarity index 96%
rename from net/instaweb/http/ua_sensitive_test_fetcher_test.cc
rename to test/net/instaweb/http/ua_sensitive_test_fetcher_test.cc
index 563231d..fa4f605 100644
--- a/net/instaweb/http/ua_sensitive_test_fetcher_test.cc
+++ b/test/net/instaweb/http/ua_sensitive_test_fetcher_test.cc
@@ -19,10 +19,8 @@
// Unit tests for UserAgentSensitiveTestFetcher
-#include "net/instaweb/http/public/ua_sensitive_test_fetcher.h"
+#include "test/net/instaweb/http/ua_sensitive_test_fetcher.h"
-#include "net/instaweb/http/public/mock_callback.h"
-#include "net/instaweb/http/public/mock_url_fetcher.h"
#include "net/instaweb/http/public/request_context.h"
#include "pagespeed/kernel/base/google_message_handler.h"
#include "pagespeed/kernel/base/null_mutex.h"
@@ -36,6 +34,8 @@
#include "pagespeed/kernel/http/request_headers.h"
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/util/platform.h"
+#include "test/net/instaweb/http/mock_callback.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
diff --git a/net/instaweb/http/url_async_fetcher_stats_test.cc b/test/net/instaweb/http/url_async_fetcher_stats_test.cc
similarity index 98%
rename from net/instaweb/http/url_async_fetcher_stats_test.cc
rename to test/net/instaweb/http/url_async_fetcher_stats_test.cc
index 0dd524f..33de5f4 100644
--- a/net/instaweb/http/url_async_fetcher_stats_test.cc
+++ b/test/net/instaweb/http/url_async_fetcher_stats_test.cc
@@ -19,8 +19,6 @@
#include "net/instaweb/http/public/url_async_fetcher_stats.h"
-#include "net/instaweb/http/public/mock_callback.h"
-#include "net/instaweb/http/public/mock_url_fetcher.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/http/public/wait_url_async_fetcher.h"
#include "pagespeed/kernel/base/basictypes.h"
@@ -35,6 +33,8 @@
#include "pagespeed/kernel/sharedmem/inprocess_shared_mem.h"
#include "pagespeed/kernel/sharedmem/shared_mem_statistics.h"
#include "pagespeed/kernel/util/platform.h"
+#include "test/net/instaweb/http/mock_callback.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mem_file_system.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
diff --git a/net/instaweb/http/wait_url_async_fetcher_test.cc b/test/net/instaweb/http/wait_url_async_fetcher_test.cc
similarity index 97%
rename from net/instaweb/http/wait_url_async_fetcher_test.cc
rename to test/net/instaweb/http/wait_url_async_fetcher_test.cc
index 1c6d9ca..2f06887 100644
--- a/net/instaweb/http/wait_url_async_fetcher_test.cc
+++ b/test/net/instaweb/http/wait_url_async_fetcher_test.cc
@@ -21,14 +21,14 @@
#include <memory>
-#include "net/instaweb/http/public/mock_callback.h"
-#include "net/instaweb/http/public/mock_url_fetcher.h"
#include "net/instaweb/http/public/request_context.h"
#include "pagespeed/kernel/base/google_message_handler.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/thread_system.h"
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/util/platform.h"
+#include "test/net/instaweb/http/mock_callback.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/test/net/instaweb/rewriter/BUILD b/test/net/instaweb/rewriter/BUILD
new file mode 100644
index 0000000..1adcdb1
--- /dev/null
+++ b/test/net/instaweb/rewriter/BUILD
@@ -0,0 +1,71 @@
+load(
+ "//bazel:pagespeed_test.bzl",
+ "pagespeed_cc_test",
+ "pagespeed_cc_test_library",
+)
+
+licenses(["notice"]) # Apache 2
+
+pagespeed_cc_test_library(
+ name = "test_base",
+ srcs = [
+ "critical_images_finder_test_base.cc",
+ "css_rewrite_test_base.cc",
+ "image_test_base.cc",
+ "mock_critical_images_finder.cc",
+ "mock_resource_callback.cc",
+ "notifying_fetch.cc",
+ "rewrite_context_test_base.cc",
+ "rewrite_test_base.cc",
+ "test_rewrite_driver_factory.cc",
+ "test_url_namer.cc",
+ ],
+ hdrs = [
+ "critical_images_finder_test_base.h",
+ "css_rewrite_test_base.h",
+ "custom_rewrite_test_base.h",
+ "image_test_base.h",
+ "image_testing_peer.h",
+ "mock_critical_images_finder.h",
+ "mock_resource_callback.h",
+ "notifying_fetch.h",
+ "rewrite_context_test_base.h",
+ "rewrite_options_test_base.h",
+ "rewrite_test_base.h",
+ "test_rewrite_driver_factory.h",
+ "test_url_namer.h",
+ ],
+ deps = [
+ "//net/instaweb/rewriter",
+ "//test/net/instaweb/http:http_test_base",
+ "//test/pagespeed/kernel/cache:cache_test_base",
+ "//test/pagespeed/kernel/html:html_test_base",
+ "//test/pagespeed/kernel/http:http_test_base",
+ "//test/pagespeed/kernel/image:image_test_base",
+ "//test/pagespeed/kernel/thread:thread_test_base",
+ "//test/pagespeed/kernel/util:util_test_base",
+ "//test/pagespeed/opt/http:test_base",
+ "//test/pagespeed/opt/logging:test_base",
+ ],
+)
+
+filegroup(
+ name = "testdata",
+ srcs = glob(["testdata/*"]),
+ visibility = ["//visibility:public"],
+)
+
+pagespeed_cc_test(
+ name = "rewriter",
+ srcs = glob(["*_test.cc"]),
+ data = [":testdata"],
+ deps = ["//test/net/instaweb/rewriter:test_base"],
+)
+
+pagespeed_cc_test(
+ name = "rewriter_config",
+ srcs = glob(["config/*_test.cc"]),
+ deps = [
+ "//test/pagespeed/automatic:test_base",
+ ],
+)
diff --git a/net/instaweb/rewriter/add_ids_filter_test.cc b/test/net/instaweb/rewriter/add_ids_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/add_ids_filter_test.cc
rename to test/net/instaweb/rewriter/add_ids_filter_test.cc
index f8ceb72..2583e9c 100644
--- a/net/instaweb/rewriter/add_ids_filter_test.cc
+++ b/test/net/instaweb/rewriter/add_ids_filter_test.cc
@@ -19,8 +19,8 @@
#include "net/instaweb/rewriter/public/add_ids_filter.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/string_util.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/add_instrumentation_filter_test.cc b/test/net/instaweb/rewriter/add_instrumentation_filter_test.cc
similarity index 98%
rename from net/instaweb/rewriter/add_instrumentation_filter_test.cc
rename to test/net/instaweb/rewriter/add_instrumentation_filter_test.cc
index 11ec78c..8d2044c 100644
--- a/net/instaweb/rewriter/add_instrumentation_filter_test.cc
+++ b/test/net/instaweb/rewriter/add_instrumentation_filter_test.cc
@@ -23,7 +23,6 @@
#include "net/instaweb/http/public/request_timing_info.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/kernel/base/escaping.h"
#include "pagespeed/kernel/base/null_message_handler.h"
@@ -35,9 +34,10 @@
#include "pagespeed/kernel/http/google_url.h"
#include "pagespeed/kernel/http/http_names.h"
#include "pagespeed/kernel/http/response_headers.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/association_transformer_test.cc b/test/net/instaweb/rewriter/association_transformer_test.cc
similarity index 100%
rename from net/instaweb/rewriter/association_transformer_test.cc
rename to test/net/instaweb/rewriter/association_transformer_test.cc
diff --git a/net/instaweb/rewriter/base_tag_filter_test.cc b/test/net/instaweb/rewriter/base_tag_filter_test.cc
similarity index 97%
rename from net/instaweb/rewriter/base_tag_filter_test.cc
rename to test/net/instaweb/rewriter/base_tag_filter_test.cc
index 1d9dd07..d554e0b 100644
--- a/net/instaweb/rewriter/base_tag_filter_test.cc
+++ b/test/net/instaweb/rewriter/base_tag_filter_test.cc
@@ -19,7 +19,7 @@
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/beacon_critical_images_finder_test.cc b/test/net/instaweb/rewriter/beacon_critical_images_finder_test.cc
similarity index 98%
rename from net/instaweb/rewriter/beacon_critical_images_finder_test.cc
rename to test/net/instaweb/rewriter/beacon_critical_images_finder_test.cc
index 8f8f813..a62bb1b 100644
--- a/net/instaweb/rewriter/beacon_critical_images_finder_test.cc
+++ b/test/net/instaweb/rewriter/beacon_critical_images_finder_test.cc
@@ -24,14 +24,14 @@
#include "net/instaweb/rewriter/critical_keys.pb.h"
#include "net/instaweb/rewriter/public/critical_finder_support_util.h"
#include "net/instaweb/rewriter/public/critical_images_finder.h"
-#include "net/instaweb/rewriter/public/critical_images_finder_test_base.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/util/public/property_cache.h"
#include "pagespeed/kernel/base/timer.h"
+#include "test/net/instaweb/rewriter/critical_images_finder_test_base.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gmock.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
diff --git a/net/instaweb/rewriter/cache_extender_test.cc b/test/net/instaweb/rewriter/cache_extender_test.cc
similarity index 99%
rename from net/instaweb/rewriter/cache_extender_test.cc
rename to test/net/instaweb/rewriter/cache_extender_test.cc
index da64827..245b7bf 100644
--- a/net/instaweb/rewriter/cache_extender_test.cc
+++ b/test/net/instaweb/rewriter/cache_extender_test.cc
@@ -31,9 +31,7 @@
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
#include "net/instaweb/rewriter/public/rewrite_stats.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_url_namer.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/hasher.h"
#include "pagespeed/kernel/base/ref_counted_ptr.h"
@@ -48,6 +46,8 @@
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/http/semantic_type.h"
#include "pagespeed/opt/logging/log_record.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_url_namer.h"
#include "test/pagespeed/kernel/base/gmock.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
diff --git a/net/instaweb/rewriter/cacheable_resource_base_test.cc b/test/net/instaweb/rewriter/cacheable_resource_base_test.cc
similarity index 98%
rename from net/instaweb/rewriter/cacheable_resource_base_test.cc
rename to test/net/instaweb/rewriter/cacheable_resource_base_test.cc
index 70644cf..124f355 100644
--- a/net/instaweb/rewriter/cacheable_resource_base_test.cc
+++ b/test/net/instaweb/rewriter/cacheable_resource_base_test.cc
@@ -23,13 +23,10 @@
#include "net/instaweb/http/public/http_cache.h"
#include "net/instaweb/http/public/http_cache_failure.h"
#include "net/instaweb/http/public/http_value.h"
-#include "net/instaweb/http/public/mock_url_fetcher.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/rewriter/cached_result.pb.h"
-#include "net/instaweb/rewriter/public/mock_resource_callback.h"
#include "net/instaweb/rewriter/public/resource.h" // for Resource, etc
#include "net/instaweb/rewriter/public/rewrite_driver.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/ref_counted_ptr.h"
#include "pagespeed/kernel/base/statistics.h"
#include "pagespeed/kernel/base/string.h" // for GoogleString
@@ -39,6 +36,9 @@
#include "pagespeed/kernel/http/http_names.h"
#include "pagespeed/kernel/http/request_headers.h"
#include "pagespeed/kernel/http/response_headers.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
+#include "test/net/instaweb/rewriter/mock_resource_callback.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
diff --git a/net/instaweb/rewriter/collect_dependencies_filter_test.cc b/test/net/instaweb/rewriter/collect_dependencies_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/collect_dependencies_filter_test.cc
rename to test/net/instaweb/rewriter/collect_dependencies_filter_test.cc
index 7dc8eb4..f6ba72c 100644
--- a/net/instaweb/rewriter/collect_dependencies_filter_test.cc
+++ b/test/net/instaweb/rewriter/collect_dependencies_filter_test.cc
@@ -25,9 +25,7 @@
#include "net/instaweb/rewriter/public/dependency_tracker.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/util/public/mock_property_page.h"
#include "net/instaweb/util/public/property_cache.h"
#include "pagespeed/kernel/base/proto_matcher.h"
@@ -35,6 +33,8 @@
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/opt/http/request_context.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gmock.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
diff --git a/net/instaweb/rewriter/common_filter_test.cc b/test/net/instaweb/rewriter/common_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/common_filter_test.cc
rename to test/net/instaweb/rewriter/common_filter_test.cc
index 31676fd..4b1baf4 100644
--- a/net/instaweb/rewriter/common_filter_test.cc
+++ b/test/net/instaweb/rewriter/common_filter_test.cc
@@ -25,12 +25,12 @@
#include "net/instaweb/rewriter/public/resource.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/html/html_node.h"
#include "pagespeed/kernel/http/google_url.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
diff --git a/net/instaweb/rewriter/config/measurement_proxy_rewrite_options_manager_test.cc b/test/net/instaweb/rewriter/config/measurement_proxy_rewrite_options_manager_test.cc
similarity index 98%
rename from net/instaweb/rewriter/config/measurement_proxy_rewrite_options_manager_test.cc
rename to test/net/instaweb/rewriter/config/measurement_proxy_rewrite_options_manager_test.cc
index aeba3a4..d8531c2 100644
--- a/net/instaweb/rewriter/config/measurement_proxy_rewrite_options_manager_test.cc
+++ b/test/net/instaweb/rewriter/config/measurement_proxy_rewrite_options_manager_test.cc
@@ -25,7 +25,6 @@
#include "net/instaweb/rewriter/public/rewrite_options.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "net/instaweb/rewriter/public/url_namer.h"
-#include "pagespeed/automatic/proxy_interface_test_base.h"
#include "pagespeed/kernel/base/callback.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
@@ -34,6 +33,7 @@
#include "pagespeed/kernel/http/http_names.h"
#include "pagespeed/kernel/http/request_headers.h"
#include "pagespeed/kernel/http/response_headers.h"
+#include "test/pagespeed/automatic/proxy_interface_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/config/rewrite_options_manager_test.cc b/test/net/instaweb/rewriter/config/rewrite_options_manager_test.cc
similarity index 98%
rename from net/instaweb/rewriter/config/rewrite_options_manager_test.cc
rename to test/net/instaweb/rewriter/config/rewrite_options_manager_test.cc
index 2532b92..5428e70 100644
--- a/net/instaweb/rewriter/config/rewrite_options_manager_test.cc
+++ b/test/net/instaweb/rewriter/config/rewrite_options_manager_test.cc
@@ -21,7 +21,6 @@
#include "net/instaweb/rewriter/public/domain_lawyer.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_options_test_base.h"
#include "pagespeed/kernel/base/callback.h"
#include "pagespeed/kernel/base/ref_counted_ptr.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
@@ -33,6 +32,7 @@
#include "pagespeed/kernel/http/http_names.h"
#include "pagespeed/kernel/http/request_headers.h"
#include "pagespeed/kernel/util/platform.h"
+#include "test/net/instaweb/rewriter/rewrite_options_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/critical_css_beacon_filter_test.cc b/test/net/instaweb/rewriter/critical_css_beacon_filter_test.cc
similarity index 98%
rename from net/instaweb/rewriter/critical_css_beacon_filter_test.cc
rename to test/net/instaweb/rewriter/critical_css_beacon_filter_test.cc
index ed367a5..e81b744 100644
--- a/net/instaweb/rewriter/critical_css_beacon_filter_test.cc
+++ b/test/net/instaweb/rewriter/critical_css_beacon_filter_test.cc
@@ -24,10 +24,8 @@
#include "net/instaweb/rewriter/public/css_summarizer_base.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "net/instaweb/rewriter/public/static_asset_manager.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/util/public/mock_property_page.h"
#include "net/instaweb/util/public/property_cache.h"
#include "pagespeed/kernel/base/statistics.h"
@@ -35,9 +33,11 @@
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/semantic_type.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/critical_finder_support_util_test.cc b/test/net/instaweb/rewriter/critical_finder_support_util_test.cc
similarity index 96%
rename from net/instaweb/rewriter/critical_finder_support_util_test.cc
rename to test/net/instaweb/rewriter/critical_finder_support_util_test.cc
index 5a2c337..3f8a1f0 100644
--- a/net/instaweb/rewriter/critical_finder_support_util_test.cc
+++ b/test/net/instaweb/rewriter/critical_finder_support_util_test.cc
@@ -21,8 +21,8 @@
#include "net/instaweb/rewriter/critical_keys.pb.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
diff --git a/net/instaweb/rewriter/critical_images_beacon_filter_test.cc b/test/net/instaweb/rewriter/critical_images_beacon_filter_test.cc
similarity index 98%
rename from net/instaweb/rewriter/critical_images_beacon_filter_test.cc
rename to test/net/instaweb/rewriter/critical_images_beacon_filter_test.cc
index 4c344c9..7872dec 100644
--- a/net/instaweb/rewriter/critical_images_beacon_filter_test.cc
+++ b/test/net/instaweb/rewriter/critical_images_beacon_filter_test.cc
@@ -27,9 +27,7 @@
#include "net/instaweb/rewriter/public/lazyload_images_filter.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/util/public/mock_property_page.h"
#include "net/instaweb/util/public/property_cache.h"
#include "pagespeed/kernel/base/escaping.h"
@@ -39,12 +37,14 @@
#include "pagespeed/kernel/base/string_hash.h"
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/google_url.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
#include "pagespeed/opt/logging/enums.pb.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gmock.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
using testing::HasSubstr;
using testing::Not;
diff --git a/net/instaweb/rewriter/critical_images_finder_test.cc b/test/net/instaweb/rewriter/critical_images_finder_test.cc
similarity index 99%
rename from net/instaweb/rewriter/critical_images_finder_test.cc
rename to test/net/instaweb/rewriter/critical_images_finder_test.cc
index 91559c3..e38eceb 100644
--- a/net/instaweb/rewriter/critical_images_finder_test.cc
+++ b/test/net/instaweb/rewriter/critical_images_finder_test.cc
@@ -24,7 +24,6 @@
#include "net/instaweb/http/public/logging_proto_impl.h"
#include "net/instaweb/rewriter/critical_images.pb.h"
#include "net/instaweb/rewriter/critical_keys.pb.h"
-#include "net/instaweb/rewriter/public/critical_images_finder_test_base.h"
#include "net/instaweb/rewriter/public/property_cache_util.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
@@ -34,6 +33,7 @@
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/timer.h"
#include "pagespeed/kernel/http/google_url.h"
+#include "test/net/instaweb/rewriter/critical_images_finder_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/critical_images_finder_test_base.cc b/test/net/instaweb/rewriter/critical_images_finder_test_base.cc
similarity index 97%
rename from net/instaweb/rewriter/critical_images_finder_test_base.cc
rename to test/net/instaweb/rewriter/critical_images_finder_test_base.cc
index 68b051e..6855814 100644
--- a/net/instaweb/rewriter/critical_images_finder_test_base.cc
+++ b/test/net/instaweb/rewriter/critical_images_finder_test_base.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "net/instaweb/rewriter/public/critical_images_finder_test_base.h"
+#include "test/net/instaweb/rewriter/critical_images_finder_test_base.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/server_context.h"
diff --git a/net/instaweb/rewriter/public/critical_images_finder_test_base.h b/test/net/instaweb/rewriter/critical_images_finder_test_base.h
similarity index 97%
rename from net/instaweb/rewriter/public/critical_images_finder_test_base.h
rename to test/net/instaweb/rewriter/critical_images_finder_test_base.h
index 8780c7d..b85f48d 100644
--- a/net/instaweb/rewriter/public/critical_images_finder_test_base.h
+++ b/test/net/instaweb/rewriter/critical_images_finder_test_base.h
@@ -21,10 +21,10 @@
#define NET_INSTAWEB_REWRITER_PUBLIC_CRITICAL_IMAGES_FINDER_TEST_BASE_H_
#include "net/instaweb/rewriter/public/critical_images_finder.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/util/public/property_cache.h"
#include "pagespeed/kernel/base/null_statistics.h"
#include "pagespeed/kernel/base/string_util.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/critical_selector_filter_test.cc b/test/net/instaweb/rewriter/critical_selector_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/critical_selector_filter_test.cc
rename to test/net/instaweb/rewriter/critical_selector_filter_test.cc
index e3cc461..23d4617 100644
--- a/net/instaweb/rewriter/critical_selector_filter_test.cc
+++ b/test/net/instaweb/rewriter/critical_selector_filter_test.cc
@@ -26,10 +26,8 @@
#include "net/instaweb/rewriter/public/css_summarizer_base.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "net/instaweb/rewriter/public/static_asset_manager.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/util/public/mock_property_page.h"
#include "net/instaweb/util/public/property_cache.h"
#include "pagespeed/kernel/base/hasher.h"
@@ -39,11 +37,13 @@
#include "pagespeed/kernel/base/timer.h"
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/semantic_type.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
#include "pagespeed/opt/logging/enums.pb.h"
#include "pagespeed/opt/logging/log_record.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/critical_selector_finder_test.cc b/test/net/instaweb/rewriter/critical_selector_finder_test.cc
similarity index 99%
rename from net/instaweb/rewriter/critical_selector_finder_test.cc
rename to test/net/instaweb/rewriter/critical_selector_finder_test.cc
index c6344c5..a082006 100644
--- a/net/instaweb/rewriter/critical_selector_finder_test.cc
+++ b/test/net/instaweb/rewriter/critical_selector_finder_test.cc
@@ -24,13 +24,13 @@
#include "net/instaweb/rewriter/public/property_cache_util.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/util/public/mock_property_page.h"
#include "net/instaweb/util/public/property_cache.h"
#include "pagespeed/kernel/base/statistics.h"
#include "pagespeed/kernel/base/timer.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
diff --git a/net/instaweb/rewriter/csp_test.cc b/test/net/instaweb/rewriter/csp_test.cc
similarity index 100%
rename from net/instaweb/rewriter/csp_test.cc
rename to test/net/instaweb/rewriter/csp_test.cc
diff --git a/net/instaweb/rewriter/css_combine_filter_test.cc b/test/net/instaweb/rewriter/css_combine_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/css_combine_filter_test.cc
rename to test/net/instaweb/rewriter/css_combine_filter_test.cc
index bd0b8f5..b28f396 100644
--- a/net/instaweb/rewriter/css_combine_filter_test.cc
+++ b/test/net/instaweb/rewriter/css_combine_filter_test.cc
@@ -24,7 +24,6 @@
#include <vector>
#include "base/logging.h"
-#include "net/instaweb/http/public/mock_callback.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/rewriter/public/cache_extender.h"
#include "net/instaweb/rewriter/public/debug_filter.h"
@@ -32,7 +31,6 @@
#include "net/instaweb/rewriter/public/resource_namer.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/kernel/base/charset_util.h"
#include "pagespeed/kernel/base/message_handler.h"
@@ -48,6 +46,8 @@
#include "pagespeed/kernel/http/request_headers.h"
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/http/semantic_type.h"
+#include "test/net/instaweb/http/mock_callback.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mem_file_system.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
diff --git a/net/instaweb/rewriter/css_embedded_config_test.cc b/test/net/instaweb/rewriter/css_embedded_config_test.cc
similarity index 99%
rename from net/instaweb/rewriter/css_embedded_config_test.cc
rename to test/net/instaweb/rewriter/css_embedded_config_test.cc
index f9391f3..120bf11 100644
--- a/net/instaweb/rewriter/css_embedded_config_test.cc
+++ b/test/net/instaweb/rewriter/css_embedded_config_test.cc
@@ -19,7 +19,6 @@
#include <cstddef>
-#include "net/instaweb/rewriter/public/css_rewrite_test_base.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
#include "pagespeed/kernel/base/dynamic_annotations.h" // RunningOnValgrind
#include "pagespeed/kernel/base/string.h"
@@ -27,6 +26,7 @@
#include "pagespeed/kernel/cache/lru_cache.h"
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/response_headers.h"
+#include "test/net/instaweb/rewriter/css_rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/css_filter_test.cc b/test/net/instaweb/rewriter/css_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/css_filter_test.cc
rename to test/net/instaweb/rewriter/css_filter_test.cc
index 5b330d1..1b90859 100644
--- a/net/instaweb/rewriter/css_filter_test.cc
+++ b/test/net/instaweb/rewriter/css_filter_test.cc
@@ -26,13 +26,10 @@
#include "net/instaweb/http/public/logging_proto.h"
#include "net/instaweb/http/public/logging_proto_impl.h"
#include "net/instaweb/http/public/request_context.h"
-#include "net/instaweb/rewriter/public/css_rewrite_test_base.h"
#include "net/instaweb/rewriter/public/domain_lawyer.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
-#include "net/instaweb/rewriter/public/test_url_namer.h"
#include "pagespeed/kernel/base/abstract_mutex.h" // for ScopedMutex
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/dynamic_annotations.h" // RunningOnValgrind
@@ -46,6 +43,9 @@
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/google_url.h"
#include "pagespeed/opt/logging/log_record.h"
+#include "test/net/instaweb/rewriter/css_rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
+#include "test/net/instaweb/rewriter/test_url_namer.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/css_flatten_imports_test.cc b/test/net/instaweb/rewriter/css_flatten_imports_test.cc
similarity index 99%
rename from net/instaweb/rewriter/css_flatten_imports_test.cc
rename to test/net/instaweb/rewriter/css_flatten_imports_test.cc
index 5b4d70f..c8825a5 100644
--- a/net/instaweb/rewriter/css_flatten_imports_test.cc
+++ b/test/net/instaweb/rewriter/css_flatten_imports_test.cc
@@ -20,10 +20,8 @@
#include <cstddef>
#include "base/logging.h"
-#include "net/instaweb/rewriter/public/css_rewrite_test_base.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/statistics.h"
@@ -33,6 +31,8 @@
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/http_names.h"
#include "pagespeed/kernel/http/response_headers.h"
+#include "test/net/instaweb/rewriter/css_rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/css_hierarchy_test.cc b/test/net/instaweb/rewriter/css_hierarchy_test.cc
similarity index 99%
rename from net/instaweb/rewriter/css_hierarchy_test.cc
rename to test/net/instaweb/rewriter/css_hierarchy_test.cc
index ceffcf5..f2e1eed 100644
--- a/net/instaweb/rewriter/css_hierarchy_test.cc
+++ b/test/net/instaweb/rewriter/css_hierarchy_test.cc
@@ -24,7 +24,6 @@
#include "net/instaweb/rewriter/public/css_minify.h"
#include "net/instaweb/rewriter/public/data_url_input_resource.h"
#include "net/instaweb/rewriter/public/resource.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/message_handler.h"
#include "pagespeed/kernel/base/null_mutex.h"
#include "pagespeed/kernel/base/ref_counted_ptr.h"
@@ -33,6 +32,7 @@
#include "pagespeed/kernel/base/string_writer.h"
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/response_headers.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/css_image_rewriter_test.cc b/test/net/instaweb/rewriter/css_image_rewriter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/css_image_rewriter_test.cc
rename to test/net/instaweb/rewriter/css_image_rewriter_test.cc
index 27668c8..ac722f4 100644
--- a/net/instaweb/rewriter/css_image_rewriter_test.cc
+++ b/test/net/instaweb/rewriter/css_image_rewriter_test.cc
@@ -20,15 +20,11 @@
#include "base/logging.h"
#include "net/instaweb/http/public/http_cache.h"
#include "net/instaweb/http/public/http_value.h"
-#include "net/instaweb/rewriter/public/css_rewrite_test_base.h"
#include "net/instaweb/rewriter/public/domain_lawyer.h"
#include "net/instaweb/rewriter/public/image_rewrite_filter.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
-#include "net/instaweb/rewriter/public/test_url_namer.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/dynamic_annotations.h" // RunningOnValgrind
#include "pagespeed/kernel/base/hasher.h"
@@ -41,11 +37,15 @@
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/data_url.h"
#include "pagespeed/kernel/http/response_headers.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
#include "pagespeed/kernel/image/jpeg_utils.h"
+#include "test/net/instaweb/rewriter/css_rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
+#include "test/net/instaweb/rewriter/test_url_namer.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
using net_instaweb::MockMessageHandler;
using net_instaweb::NullMutex;
diff --git a/net/instaweb/rewriter/css_inline_filter_test.cc b/test/net/instaweb/rewriter/css_inline_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/css_inline_filter_test.cc
rename to test/net/instaweb/rewriter/css_inline_filter_test.cc
index dbe6ac2..c8423fb 100644
--- a/net/instaweb/rewriter/css_inline_filter_test.cc
+++ b/test/net/instaweb/rewriter/css_inline_filter_test.cc
@@ -25,7 +25,6 @@
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_filter.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/charset_util.h"
@@ -37,6 +36,7 @@
#include "pagespeed/kernel/http/google_url.h"
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/http/semantic_type.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/css_inline_import_to_link_filter_test.cc b/test/net/instaweb/rewriter/css_inline_import_to_link_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/css_inline_import_to_link_filter_test.cc
rename to test/net/instaweb/rewriter/css_inline_import_to_link_filter_test.cc
index dd0c4f0..45069f9 100644
--- a/net/instaweb/rewriter/css_inline_import_to_link_filter_test.cc
+++ b/test/net/instaweb/rewriter/css_inline_import_to_link_filter_test.cc
@@ -21,10 +21,10 @@
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/http/content_type.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/css_minify_test.cc b/test/net/instaweb/rewriter/css_minify_test.cc
similarity index 100%
rename from net/instaweb/rewriter/css_minify_test.cc
rename to test/net/instaweb/rewriter/css_minify_test.cc
diff --git a/net/instaweb/rewriter/css_move_to_head_filter_test.cc b/test/net/instaweb/rewriter/css_move_to_head_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/css_move_to_head_filter_test.cc
rename to test/net/instaweb/rewriter/css_move_to_head_filter_test.cc
index cd287ba..7b44e69 100644
--- a/net/instaweb/rewriter/css_move_to_head_filter_test.cc
+++ b/test/net/instaweb/rewriter/css_move_to_head_filter_test.cc
@@ -24,7 +24,7 @@
#include "base/logging.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/css_outline_filter_test.cc b/test/net/instaweb/rewriter/css_outline_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/css_outline_filter_test.cc
rename to test/net/instaweb/rewriter/css_outline_filter_test.cc
index d096816..7ede0a6 100644
--- a/net/instaweb/rewriter/css_outline_filter_test.cc
+++ b/test/net/instaweb/rewriter/css_outline_filter_test.cc
@@ -22,7 +22,6 @@
#include "net/instaweb/rewriter/public/debug_filter.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "net/instaweb/rewriter/public/support_noscript_filter.h"
#include "pagespeed/kernel/base/hasher.h"
@@ -31,6 +30,7 @@
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/google_url.h"
#include "pagespeed/kernel/http/response_headers.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/css_rewrite_test_base.cc b/test/net/instaweb/rewriter/css_rewrite_test_base.cc
similarity index 99%
rename from net/instaweb/rewriter/css_rewrite_test_base.cc
rename to test/net/instaweb/rewriter/css_rewrite_test_base.cc
index 597c347..dd234fd 100644
--- a/net/instaweb/rewriter/css_rewrite_test_base.cc
+++ b/test/net/instaweb/rewriter/css_rewrite_test_base.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "net/instaweb/rewriter/public/css_rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/css_rewrite_test_base.h"
#include "base/logging.h"
#include "net/instaweb/rewriter/public/css_url_extractor.h"
diff --git a/net/instaweb/rewriter/public/css_rewrite_test_base.h b/test/net/instaweb/rewriter/css_rewrite_test_base.h
similarity index 98%
rename from net/instaweb/rewriter/public/css_rewrite_test_base.h
rename to test/net/instaweb/rewriter/css_rewrite_test_base.h
index 4529121..d1ea03d 100644
--- a/net/instaweb/rewriter/public/css_rewrite_test_base.h
+++ b/test/net/instaweb/rewriter/css_rewrite_test_base.h
@@ -25,10 +25,10 @@
#include "base/logging.h"
#include "net/instaweb/rewriter/public/css_filter.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/statistics.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/css_summarizer_base_test.cc b/test/net/instaweb/rewriter/css_summarizer_base_test.cc
similarity index 99%
rename from net/instaweb/rewriter/css_summarizer_base_test.cc
rename to test/net/instaweb/rewriter/css_summarizer_base_test.cc
index 31234bb..89f23c0 100644
--- a/net/instaweb/rewriter/css_summarizer_base_test.cc
+++ b/test/net/instaweb/rewriter/css_summarizer_base_test.cc
@@ -22,7 +22,6 @@
#include "net/instaweb/rewriter/public/css_minify.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
@@ -31,6 +30,7 @@
#include "pagespeed/kernel/html/html_node.h"
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/semantic_type.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/css_tag_scanner_test.cc b/test/net/instaweb/rewriter/css_tag_scanner_test.cc
similarity index 99%
rename from net/instaweb/rewriter/css_tag_scanner_test.cc
rename to test/net/instaweb/rewriter/css_tag_scanner_test.cc
index 496dd23..86aa222 100644
--- a/net/instaweb/rewriter/css_tag_scanner_test.cc
+++ b/test/net/instaweb/rewriter/css_tag_scanner_test.cc
@@ -22,7 +22,6 @@
#include "net/instaweb/rewriter/public/css_tag_scanner.h"
#include "net/instaweb/rewriter/public/css_util.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/google_message_handler.h"
#include "pagespeed/kernel/base/null_message_handler.h"
@@ -34,6 +33,7 @@
#include "pagespeed/kernel/html/html_name.h"
#include "pagespeed/kernel/html/html_parse.h"
#include "pagespeed/kernel/http/google_url.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
diff --git a/net/instaweb/rewriter/css_url_encoder_test.cc b/test/net/instaweb/rewriter/css_url_encoder_test.cc
similarity index 100%
rename from net/instaweb/rewriter/css_url_encoder_test.cc
rename to test/net/instaweb/rewriter/css_url_encoder_test.cc
diff --git a/net/instaweb/rewriter/css_util_test.cc b/test/net/instaweb/rewriter/css_util_test.cc
similarity index 100%
rename from net/instaweb/rewriter/css_util_test.cc
rename to test/net/instaweb/rewriter/css_util_test.cc
diff --git a/net/instaweb/rewriter/public/custom_rewrite_test_base.h b/test/net/instaweb/rewriter/custom_rewrite_test_base.h
similarity index 93%
rename from net/instaweb/rewriter/public/custom_rewrite_test_base.h
rename to test/net/instaweb/rewriter/custom_rewrite_test_base.h
index 2c08549..06e854e 100644
--- a/net/instaweb/rewriter/public/custom_rewrite_test_base.h
+++ b/test/net/instaweb/rewriter/custom_rewrite_test_base.h
@@ -25,9 +25,9 @@
#include <utility>
-#include "net/instaweb/http/public/mock_url_fetcher.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/debug_filter_test.cc b/test/net/instaweb/rewriter/debug_filter_test.cc
similarity index 98%
rename from net/instaweb/rewriter/debug_filter_test.cc
rename to test/net/instaweb/rewriter/debug_filter_test.cc
index 007f30d..4a7faf9 100644
--- a/net/instaweb/rewriter/debug_filter_test.cc
+++ b/test/net/instaweb/rewriter/debug_filter_test.cc
@@ -19,16 +19,16 @@
#include "net/instaweb/rewriter/public/debug_filter.h"
-#include "net/instaweb/rewriter/public/mock_critical_images_finder.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "net/instaweb/rewriter/public/support_noscript_filter.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/timer.h"
#include "pagespeed/kernel/http/content_type.h"
+#include "test/net/instaweb/rewriter/mock_critical_images_finder.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gmock.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/disable_test_filter.h"
diff --git a/net/instaweb/rewriter/decode_rewritten_urls_filter_test.cc b/test/net/instaweb/rewriter/decode_rewritten_urls_filter_test.cc
similarity index 97%
rename from net/instaweb/rewriter/decode_rewritten_urls_filter_test.cc
rename to test/net/instaweb/rewriter/decode_rewritten_urls_filter_test.cc
index e757eee..8277e6b 100644
--- a/net/instaweb/rewriter/decode_rewritten_urls_filter_test.cc
+++ b/test/net/instaweb/rewriter/decode_rewritten_urls_filter_test.cc
@@ -22,10 +22,10 @@
#include "net/instaweb/http/public/logging_proto_impl.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/opt/logging/enums.pb.h"
#include "pagespeed/opt/logging/log_record.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/dedup_inlined_images_filter_test.cc b/test/net/instaweb/rewriter/dedup_inlined_images_filter_test.cc
similarity index 98%
rename from net/instaweb/rewriter/dedup_inlined_images_filter_test.cc
rename to test/net/instaweb/rewriter/dedup_inlined_images_filter_test.cc
index 1218c16..9dbfec9 100644
--- a/net/instaweb/rewriter/dedup_inlined_images_filter_test.cc
+++ b/test/net/instaweb/rewriter/dedup_inlined_images_filter_test.cc
@@ -23,16 +23,16 @@
#include "net/instaweb/rewriter/public/delay_images_filter.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "net/instaweb/rewriter/public/static_asset_manager.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/base/wildcard.h"
#include "pagespeed/kernel/http/content_type.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/defer_iframe_filter_test.cc b/test/net/instaweb/rewriter/defer_iframe_filter_test.cc
similarity index 98%
rename from net/instaweb/rewriter/defer_iframe_filter_test.cc
rename to test/net/instaweb/rewriter/defer_iframe_filter_test.cc
index d4934e4..ab032b9 100644
--- a/net/instaweb/rewriter/defer_iframe_filter_test.cc
+++ b/test/net/instaweb/rewriter/defer_iframe_filter_test.cc
@@ -20,11 +20,11 @@
#include "net/instaweb/rewriter/public/defer_iframe_filter.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "net/instaweb/rewriter/public/static_asset_manager.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/delay_images_filter_test.cc b/test/net/instaweb/rewriter/delay_images_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/delay_images_filter_test.cc
rename to test/net/instaweb/rewriter/delay_images_filter_test.cc
index 92fc59f..67eff77 100644
--- a/net/instaweb/rewriter/delay_images_filter_test.cc
+++ b/test/net/instaweb/rewriter/delay_images_filter_test.cc
@@ -19,16 +19,13 @@
#include "net/instaweb/rewriter/public/delay_images_filter.h"
-#include "net/instaweb/http/public/log_record_test_helper.h"
#include "net/instaweb/http/public/logging_proto.h"
#include "net/instaweb/http/public/logging_proto_impl.h"
#include "net/instaweb/public/global_constants.h"
#include "net/instaweb/rewriter/public/critical_images_beacon_filter.h"
#include "net/instaweb/rewriter/public/critical_images_finder.h"
-#include "net/instaweb/rewriter/public/critical_images_finder_test_base.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "net/instaweb/rewriter/public/static_asset_manager.h"
#include "pagespeed/kernel/base/abstract_mutex.h"
@@ -38,11 +35,14 @@
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/image_types.pb.h"
#include "pagespeed/kernel/http/semantic_type.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
#include "pagespeed/opt/logging/enums.pb.h"
#include "pagespeed/opt/logging/log_record.h"
+#include "test/net/instaweb/http/log_record_test_helper.h"
+#include "test/net/instaweb/rewriter/critical_images_finder_test_base.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gmock.h"
#include "test/pagespeed/kernel/base/gtest.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
namespace {
const char kSampleJpgFile[] = "Sample.jpg";
diff --git a/net/instaweb/rewriter/dependency_tracker_test.cc b/test/net/instaweb/rewriter/dependency_tracker_test.cc
similarity index 98%
rename from net/instaweb/rewriter/dependency_tracker_test.cc
rename to test/net/instaweb/rewriter/dependency_tracker_test.cc
index 19cf7f8..b3feccc 100644
--- a/net/instaweb/rewriter/dependency_tracker_test.cc
+++ b/test/net/instaweb/rewriter/dependency_tracker_test.cc
@@ -21,14 +21,14 @@
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/util/public/mock_property_page.h"
#include "net/instaweb/util/public/property_cache.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/cache/lru_cache.h"
#include "pagespeed/opt/http/request_context.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/deterministic_js_filter_test.cc b/test/net/instaweb/rewriter/deterministic_js_filter_test.cc
similarity index 98%
rename from net/instaweb/rewriter/deterministic_js_filter_test.cc
rename to test/net/instaweb/rewriter/deterministic_js_filter_test.cc
index 15080c2..5a6c88e 100644
--- a/net/instaweb/rewriter/deterministic_js_filter_test.cc
+++ b/test/net/instaweb/rewriter/deterministic_js_filter_test.cc
@@ -22,12 +22,12 @@
#include <memory>
#include "net/instaweb/rewriter/public/rewrite_driver.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "net/instaweb/rewriter/public/static_asset_manager.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/device_properties_test.cc b/test/net/instaweb/rewriter/device_properties_test.cc
similarity index 98%
rename from net/instaweb/rewriter/device_properties_test.cc
rename to test/net/instaweb/rewriter/device_properties_test.cc
index 5b7395f..02c33df 100644
--- a/net/instaweb/rewriter/device_properties_test.cc
+++ b/test/net/instaweb/rewriter/device_properties_test.cc
@@ -22,8 +22,8 @@
#include "pagespeed/kernel/http/http_names.h"
#include "pagespeed/kernel/http/request_headers.h"
#include "pagespeed/kernel/http/user_agent_matcher.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/dom_stats_filter_test.cc b/test/net/instaweb/rewriter/dom_stats_filter_test.cc
similarity index 96%
rename from net/instaweb/rewriter/dom_stats_filter_test.cc
rename to test/net/instaweb/rewriter/dom_stats_filter_test.cc
index bac665a..4e7b577 100644
--- a/net/instaweb/rewriter/dom_stats_filter_test.cc
+++ b/test/net/instaweb/rewriter/dom_stats_filter_test.cc
@@ -19,13 +19,13 @@
#include "net/instaweb/rewriter/public/dom_stats_filter.h"
-#include "net/instaweb/rewriter/public/mock_critical_images_finder.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
+#include "test/net/instaweb/rewriter/mock_critical_images_finder.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/domain_lawyer_test.cc b/test/net/instaweb/rewriter/domain_lawyer_test.cc
similarity index 100%
rename from net/instaweb/rewriter/domain_lawyer_test.cc
rename to test/net/instaweb/rewriter/domain_lawyer_test.cc
diff --git a/net/instaweb/rewriter/domain_rewrite_filter_test.cc b/test/net/instaweb/rewriter/domain_rewrite_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/domain_rewrite_filter_test.cc
rename to test/net/instaweb/rewriter/domain_rewrite_filter_test.cc
index ee16640..615bfda 100644
--- a/net/instaweb/rewriter/domain_rewrite_filter_test.cc
+++ b/test/net/instaweb/rewriter/domain_rewrite_filter_test.cc
@@ -24,7 +24,6 @@
#include "net/instaweb/rewriter/public/domain_lawyer.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "net/instaweb/rewriter/public/static_asset_manager.h"
#include "pagespeed/kernel/base/statistics.h"
@@ -33,6 +32,7 @@
#include "pagespeed/kernel/http/google_url.h"
#include "pagespeed/kernel/http/http_names.h"
#include "pagespeed/kernel/http/response_headers.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
diff --git a/net/instaweb/rewriter/downstream_cache_purger_test.cc b/test/net/instaweb/rewriter/downstream_cache_purger_test.cc
similarity index 98%
rename from net/instaweb/rewriter/downstream_cache_purger_test.cc
rename to test/net/instaweb/rewriter/downstream_cache_purger_test.cc
index 281cf10..178a03b 100644
--- a/net/instaweb/rewriter/downstream_cache_purger_test.cc
+++ b/test/net/instaweb/rewriter/downstream_cache_purger_test.cc
@@ -23,13 +23,13 @@
#include "net/instaweb/public/global_constants.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_stats.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "pagespeed/kernel/base/statistics.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/google_url.h"
#include "pagespeed/kernel/http/request_headers.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/downstream_caching_directives_test.cc b/test/net/instaweb/rewriter/downstream_caching_directives_test.cc
similarity index 100%
rename from net/instaweb/rewriter/downstream_caching_directives_test.cc
rename to test/net/instaweb/rewriter/downstream_caching_directives_test.cc
diff --git a/net/instaweb/rewriter/experiment_matcher_test.cc b/test/net/instaweb/rewriter/experiment_matcher_test.cc
similarity index 98%
rename from net/instaweb/rewriter/experiment_matcher_test.cc
rename to test/net/instaweb/rewriter/experiment_matcher_test.cc
index c4f815f..862561e 100644
--- a/net/instaweb/rewriter/experiment_matcher_test.cc
+++ b/test/net/instaweb/rewriter/experiment_matcher_test.cc
@@ -23,7 +23,6 @@
#include "net/instaweb/rewriter/public/experiment_util.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_options_test_base.h"
#include "pagespeed/kernel/base/null_message_handler.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string.h"
@@ -32,8 +31,9 @@
#include "pagespeed/kernel/http/request_headers.h"
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/http/user_agent_matcher.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h" // for User Agent constants
+#include "test/net/instaweb/rewriter/rewrite_options_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h" // for User Agent constants
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/experiment_util_test.cc b/test/net/instaweb/rewriter/experiment_util_test.cc
similarity index 98%
rename from net/instaweb/rewriter/experiment_util_test.cc
rename to test/net/instaweb/rewriter/experiment_util_test.cc
index 1503a64..2755d8b 100644
--- a/net/instaweb/rewriter/experiment_util_test.cc
+++ b/test/net/instaweb/rewriter/experiment_util_test.cc
@@ -22,7 +22,6 @@
#include "net/instaweb/rewriter/public/experiment_util.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_options_test_base.h"
#include "pagespeed/kernel/base/null_message_handler.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/time_util.h"
@@ -31,6 +30,7 @@
#include "pagespeed/kernel/http/request_headers.h"
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/http/user_agent_matcher.h"
+#include "test/net/instaweb/rewriter/rewrite_options_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/file_load_policy_test.cc b/test/net/instaweb/rewriter/file_load_policy_test.cc
similarity index 100%
rename from net/instaweb/rewriter/file_load_policy_test.cc
rename to test/net/instaweb/rewriter/file_load_policy_test.cc
diff --git a/net/instaweb/rewriter/fix_reflow_filter_test.cc b/test/net/instaweb/rewriter/fix_reflow_filter_test.cc
similarity index 97%
rename from net/instaweb/rewriter/fix_reflow_filter_test.cc
rename to test/net/instaweb/rewriter/fix_reflow_filter_test.cc
index c244671..91b5e10 100644
--- a/net/instaweb/rewriter/fix_reflow_filter_test.cc
+++ b/test/net/instaweb/rewriter/fix_reflow_filter_test.cc
@@ -22,12 +22,9 @@
#include "net/instaweb/http/public/logging_proto_impl.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/public/global_constants.h"
-#include "net/instaweb/rewriter/public/custom_rewrite_test_base.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/util/public/mock_property_page.h"
#include "net/instaweb/util/public/property_cache.h"
#include "pagespeed/kernel/base/abstract_mutex.h"
@@ -37,6 +34,9 @@
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/opt/logging/enums.pb.h"
#include "pagespeed/opt/logging/log_record.h"
+#include "test/net/instaweb/rewriter/custom_rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/flush_html_filter_test.cc b/test/net/instaweb/rewriter/flush_html_filter_test.cc
similarity index 97%
rename from net/instaweb/rewriter/flush_html_filter_test.cc
rename to test/net/instaweb/rewriter/flush_html_filter_test.cc
index dcccfaa..0f8a0f9 100644
--- a/net/instaweb/rewriter/flush_html_filter_test.cc
+++ b/test/net/instaweb/rewriter/flush_html_filter_test.cc
@@ -22,11 +22,11 @@
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
#include "net/instaweb/rewriter/public/rewrite_stats.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/kernel/base/statistics.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/google_analytics_filter_test.cc b/test/net/instaweb/rewriter/google_analytics_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/google_analytics_filter_test.cc
rename to test/net/instaweb/rewriter/google_analytics_filter_test.cc
index ee92214..750554a 100644
--- a/net/instaweb/rewriter/google_analytics_filter_test.cc
+++ b/test/net/instaweb/rewriter/google_analytics_filter_test.cc
@@ -21,9 +21,9 @@
#include "net/instaweb/rewriter/google_analytics_snippet.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/google_font_css_inline_filter_test.cc b/test/net/instaweb/rewriter/google_font_css_inline_filter_test.cc
similarity index 98%
rename from net/instaweb/rewriter/google_font_css_inline_filter_test.cc
rename to test/net/instaweb/rewriter/google_font_css_inline_filter_test.cc
index 749cde7..56c5cda 100644
--- a/net/instaweb/rewriter/google_font_css_inline_filter_test.cc
+++ b/test/net/instaweb/rewriter/google_font_css_inline_filter_test.cc
@@ -19,11 +19,9 @@
// Unit tests for GoogleFontCssInlineFilter
-#include "net/instaweb/http/public/ua_sensitive_test_fetcher.h"
#include "net/instaweb/rewriter/public/domain_lawyer.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/kernel/base/ref_counted_ptr.h"
#include "pagespeed/kernel/base/string_util.h"
@@ -31,6 +29,8 @@
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/opt/http/request_context.h"
+#include "test/net/instaweb/http/ua_sensitive_test_fetcher.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
diff --git a/net/instaweb/rewriter/google_font_service_input_resource_test.cc b/test/net/instaweb/rewriter/google_font_service_input_resource_test.cc
similarity index 98%
rename from net/instaweb/rewriter/google_font_service_input_resource_test.cc
rename to test/net/instaweb/rewriter/google_font_service_input_resource_test.cc
index 6f3b13c..b08ac6e 100644
--- a/net/instaweb/rewriter/google_font_service_input_resource_test.cc
+++ b/test/net/instaweb/rewriter/google_font_service_input_resource_test.cc
@@ -20,11 +20,8 @@
#include "net/instaweb/rewriter/public/google_font_service_input_resource.h"
#include "net/instaweb/http/public/counting_url_async_fetcher.h"
-#include "net/instaweb/http/public/ua_sensitive_test_fetcher.h"
-#include "net/instaweb/rewriter/public/mock_resource_callback.h"
#include "net/instaweb/rewriter/public/resource.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/kernel/base/ref_counted_ptr.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
@@ -33,6 +30,9 @@
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/google_url.h"
#include "pagespeed/kernel/http/response_headers.h"
+#include "test/net/instaweb/http/ua_sensitive_test_fetcher.h"
+#include "test/net/instaweb/rewriter/mock_resource_callback.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/handle_noscript_redirect_filter_test.cc b/test/net/instaweb/rewriter/handle_noscript_redirect_filter_test.cc
similarity index 98%
rename from net/instaweb/rewriter/handle_noscript_redirect_filter_test.cc
rename to test/net/instaweb/rewriter/handle_noscript_redirect_filter_test.cc
index aebbda6..e63b88e 100644
--- a/net/instaweb/rewriter/handle_noscript_redirect_filter_test.cc
+++ b/test/net/instaweb/rewriter/handle_noscript_redirect_filter_test.cc
@@ -21,8 +21,8 @@
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/string.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/image_combine_filter_test.cc b/test/net/instaweb/rewriter/image_combine_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/image_combine_filter_test.cc
rename to test/net/instaweb/rewriter/image_combine_filter_test.cc
index 27f5088..ed2586a 100644
--- a/net/instaweb/rewriter/image_combine_filter_test.cc
+++ b/test/net/instaweb/rewriter/image_combine_filter_test.cc
@@ -20,13 +20,13 @@
#include <algorithm>
#include <memory>
-#include "net/instaweb/rewriter/public/css_rewrite_test_base.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/http_names.h"
#include "pagespeed/kernel/http/response_headers.h"
+#include "test/net/instaweb/rewriter/css_rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/image_endian_test.cc b/test/net/instaweb/rewriter/image_endian_test.cc
similarity index 100%
rename from net/instaweb/rewriter/image_endian_test.cc
rename to test/net/instaweb/rewriter/image_endian_test.cc
diff --git a/net/instaweb/rewriter/image_rewrite_filter_test.cc b/test/net/instaweb/rewriter/image_rewrite_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/image_rewrite_filter_test.cc
rename to test/net/instaweb/rewriter/image_rewrite_filter_test.cc
index 41938ac..81fe563 100644
--- a/net/instaweb/rewriter/image_rewrite_filter_test.cc
+++ b/test/net/instaweb/rewriter/image_rewrite_filter_test.cc
@@ -23,27 +23,21 @@
#include "net/instaweb/http/public/counting_url_async_fetcher.h"
#include "net/instaweb/http/public/http_cache.h"
#include "net/instaweb/http/public/http_value.h"
-#include "net/instaweb/http/public/log_record_test_helper.h"
#include "net/instaweb/http/public/logging_proto.h"
#include "net/instaweb/http/public/logging_proto_impl.h"
-#include "net/instaweb/http/public/mock_callback.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/http/public/wait_url_async_fetcher.h"
#include "net/instaweb/rewriter/cached_result.pb.h"
-#include "net/instaweb/rewriter/image_testing_peer.h"
#include "net/instaweb/rewriter/public/dom_stats_filter.h"
#include "net/instaweb/rewriter/public/domain_lawyer.h"
#include "net/instaweb/rewriter/public/image.h"
-#include "net/instaweb/rewriter/public/mock_critical_images_finder.h"
#include "net/instaweb/rewriter/public/resource.h"
#include "net/instaweb/rewriter/public/resource_namer.h"
#include "net/instaweb/rewriter/public/resource_tag_scanner.h"
#include "net/instaweb/rewriter/public/rewrite_context.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/rewriter/rendered_image.pb.h"
#include "net/instaweb/util/public/mock_property_page.h"
#include "net/instaweb/util/public/property_cache.h"
@@ -68,15 +62,21 @@
#include "pagespeed/kernel/http/http_options.h"
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/http/semantic_type.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
-#include "pagespeed/kernel/image/test_utils.h"
#include "pagespeed/opt/logging/enums.pb.h"
#include "pagespeed/opt/logging/log_record.h"
+#include "test/net/instaweb/http/log_record_test_helper.h"
+#include "test/net/instaweb/http/mock_callback.h"
+#include "test/net/instaweb/rewriter/image_testing_peer.h"
+#include "test/net/instaweb/rewriter/mock_critical_images_finder.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gmock.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/base/null_thread_system.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
+#include "test/pagespeed/kernel/image/test_utils.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/image_test.cc b/test/net/instaweb/rewriter/image_test.cc
similarity index 99%
rename from net/instaweb/rewriter/image_test.cc
rename to test/net/instaweb/rewriter/image_test.cc
index 7d27dec..776fd3d 100644
--- a/net/instaweb/rewriter/image_test.cc
+++ b/test/net/instaweb/rewriter/image_test.cc
@@ -25,9 +25,7 @@
#include <cstdlib>
#include "net/instaweb/rewriter/cached_result.pb.h"
-#include "net/instaweb/rewriter/image_testing_peer.h"
#include "net/instaweb/rewriter/public/image_data_lookup.h"
-#include "net/instaweb/rewriter/public/image_test_base.h"
#include "net/instaweb/rewriter/public/image_url_encoder.h"
#include "pagespeed/kernel/base/base64_util.h"
#include "pagespeed/kernel/base/basictypes.h"
@@ -42,15 +40,17 @@
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/data_url.h"
#include "pagespeed/kernel/image/image_util.h"
-#include "pagespeed/kernel/image/jpeg_optimizer_test_helper.h"
#include "pagespeed/kernel/image/jpeg_utils.h"
#include "pagespeed/kernel/image/read_image.h"
-#include "pagespeed/kernel/image/test_utils.h"
#include "pagespeed/kernel/util/platform.h"
#include "pagespeed/kernel/util/simple_stats.h"
+#include "test/net/instaweb/rewriter/image_test_base.h"
+#include "test/net/instaweb/rewriter/image_testing_peer.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
+#include "test/pagespeed/kernel/image/jpeg_optimizer_test_helper.h"
+#include "test/pagespeed/kernel/image/test_utils.h"
using pagespeed::image_compression::JpegUtils;
using pagespeed::image_compression::kMessagePatternAnimatedGif;
diff --git a/net/instaweb/rewriter/image_test_base.cc b/test/net/instaweb/rewriter/image_test_base.cc
similarity index 96%
rename from net/instaweb/rewriter/image_test_base.cc
rename to test/net/instaweb/rewriter/image_test_base.cc
index bf1345b..9943700 100644
--- a/net/instaweb/rewriter/image_test_base.cc
+++ b/test/net/instaweb/rewriter/image_test_base.cc
@@ -19,7 +19,7 @@
// Some common routines and constants for tests dealing with Images
-#include "net/instaweb/rewriter/public/image_test_base.h"
+#include "test/net/instaweb/rewriter/image_test_base.h"
#include "pagespeed/kernel/base/stdio_file_system.h"
#include "pagespeed/kernel/base/string.h"
@@ -29,7 +29,7 @@
namespace net_instaweb {
-const char ImageTestBase::kTestData[] = "/net/instaweb/rewriter/testdata/";
+const char ImageTestBase::kTestData[] = "/test/net/instaweb/rewriter/testdata/";
const char ImageTestBase::kAppSegments[] = "AppSegments.jpg";
const char ImageTestBase::kBikeCrash[] = "BikeCrashIcn.png";
const char ImageTestBase::kCradle[] = "CradleAnimation.gif";
diff --git a/net/instaweb/rewriter/public/image_test_base.h b/test/net/instaweb/rewriter/image_test_base.h
similarity index 100%
rename from net/instaweb/rewriter/public/image_test_base.h
rename to test/net/instaweb/rewriter/image_test_base.h
diff --git a/net/instaweb/rewriter/image_testing_peer.h b/test/net/instaweb/rewriter/image_testing_peer.h
similarity index 100%
rename from net/instaweb/rewriter/image_testing_peer.h
rename to test/net/instaweb/rewriter/image_testing_peer.h
diff --git a/net/instaweb/rewriter/image_url_encoder_test.cc b/test/net/instaweb/rewriter/image_url_encoder_test.cc
similarity index 100%
rename from net/instaweb/rewriter/image_url_encoder_test.cc
rename to test/net/instaweb/rewriter/image_url_encoder_test.cc
diff --git a/net/instaweb/rewriter/in_place_rewrite_context_test.cc b/test/net/instaweb/rewriter/in_place_rewrite_context_test.cc
similarity index 99%
rename from net/instaweb/rewriter/in_place_rewrite_context_test.cc
rename to test/net/instaweb/rewriter/in_place_rewrite_context_test.cc
index 3631fc5..1055e32 100644
--- a/net/instaweb/rewriter/in_place_rewrite_context_test.cc
+++ b/test/net/instaweb/rewriter/in_place_rewrite_context_test.cc
@@ -21,17 +21,13 @@
#include "net/instaweb/http/public/counting_url_async_fetcher.h"
#include "net/instaweb/http/public/http_cache.h"
-#include "net/instaweb/http/public/mock_url_fetcher.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/rewriter/cached_result.pb.h"
#include "net/instaweb/rewriter/public/fake_filter.h"
#include "net/instaweb/rewriter/public/file_load_policy.h"
-#include "net/instaweb/rewriter/public/notifying_fetch.h"
#include "net/instaweb/rewriter/public/output_resource.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "pagespeed/kernel/base/hasher.h"
#include "pagespeed/kernel/base/statistics.h"
#include "pagespeed/kernel/base/string_util.h"
@@ -44,10 +40,14 @@
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/http/semantic_type.h"
#include "pagespeed/kernel/http/user_agent_matcher.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
+#include "test/net/instaweb/rewriter/notifying_fetch.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
#include "test/pagespeed/kernel/thread/mock_scheduler.h"
#include "test/pagespeed/kernel/thread/worker_test_base.h"
diff --git a/net/instaweb/rewriter/insert_amp_link_filter_test.cc b/test/net/instaweb/rewriter/insert_amp_link_filter_test.cc
similarity index 98%
rename from net/instaweb/rewriter/insert_amp_link_filter_test.cc
rename to test/net/instaweb/rewriter/insert_amp_link_filter_test.cc
index e85dddf..d36039b 100644
--- a/net/instaweb/rewriter/insert_amp_link_filter_test.cc
+++ b/test/net/instaweb/rewriter/insert_amp_link_filter_test.cc
@@ -20,8 +20,8 @@
#include "net/instaweb/rewriter/public/insert_amp_link_filter.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/string_util.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/insert_dns_prefetch_filter_test.cc b/test/net/instaweb/rewriter/insert_dns_prefetch_filter_test.cc
similarity index 98%
rename from net/instaweb/rewriter/insert_dns_prefetch_filter_test.cc
rename to test/net/instaweb/rewriter/insert_dns_prefetch_filter_test.cc
index 8abeea3..3e52330 100644
--- a/net/instaweb/rewriter/insert_dns_prefetch_filter_test.cc
+++ b/test/net/instaweb/rewriter/insert_dns_prefetch_filter_test.cc
@@ -24,7 +24,6 @@
#include "net/instaweb/rewriter/flush_early.pb.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string.h"
@@ -32,10 +31,11 @@
#include "pagespeed/kernel/base/string_writer.h"
#include "pagespeed/kernel/base/timer.h"
#include "pagespeed/kernel/http/response_headers.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
#include "pagespeed/opt/logging/enums.pb.h"
#include "pagespeed/opt/logging/log_record.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
// TODO(bharathbhushan): Test interaction with the flush early flow and related
// filters.
diff --git a/net/instaweb/rewriter/insert_ga_filter_test.cc b/test/net/instaweb/rewriter/insert_ga_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/insert_ga_filter_test.cc
rename to test/net/instaweb/rewriter/insert_ga_filter_test.cc
index a6d0037..bc5720c 100644
--- a/net/instaweb/rewriter/insert_ga_filter_test.cc
+++ b/test/net/instaweb/rewriter/insert_ga_filter_test.cc
@@ -24,10 +24,10 @@
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/null_message_handler.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/javascript_code_block_test.cc b/test/net/instaweb/rewriter/javascript_code_block_test.cc
similarity index 100%
rename from net/instaweb/rewriter/javascript_code_block_test.cc
rename to test/net/instaweb/rewriter/javascript_code_block_test.cc
diff --git a/net/instaweb/rewriter/javascript_filter_test.cc b/test/net/instaweb/rewriter/javascript_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/javascript_filter_test.cc
rename to test/net/instaweb/rewriter/javascript_filter_test.cc
index a9e0bed..cb4ed9a 100644
--- a/net/instaweb/rewriter/javascript_filter_test.cc
+++ b/test/net/instaweb/rewriter/javascript_filter_test.cc
@@ -24,7 +24,6 @@
#include "net/instaweb/http/public/http_cache.h"
#include "net/instaweb/http/public/logging_proto.h"
#include "net/instaweb/http/public/logging_proto_impl.h"
-#include "net/instaweb/http/public/mock_url_fetcher.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/rewriter/public/debug_filter.h"
#include "net/instaweb/rewriter/public/javascript_code_block.h"
@@ -32,7 +31,6 @@
#include "net/instaweb/rewriter/public/js_outline_filter.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "net/instaweb/rewriter/public/support_noscript_filter.h"
#include "pagespeed/kernel/base/basictypes.h"
@@ -48,6 +46,8 @@
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/http/semantic_type.h"
#include "pagespeed/opt/logging/log_record.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gmock.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/js_combine_filter_test.cc b/test/net/instaweb/rewriter/js_combine_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/js_combine_filter_test.cc
rename to test/net/instaweb/rewriter/js_combine_filter_test.cc
index 31f0ffc..37e4fe9 100644
--- a/net/instaweb/rewriter/js_combine_filter_test.cc
+++ b/test/net/instaweb/rewriter/js_combine_filter_test.cc
@@ -31,7 +31,6 @@
#include "net/instaweb/rewriter/public/resource_namer.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/charset_util.h"
@@ -47,6 +46,7 @@
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/http/semantic_type.h"
#include "pagespeed/kernel/thread/queued_worker_pool.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/js_defer_disabled_filter_test.cc b/test/net/instaweb/rewriter/js_defer_disabled_filter_test.cc
similarity index 98%
rename from net/instaweb/rewriter/js_defer_disabled_filter_test.cc
rename to test/net/instaweb/rewriter/js_defer_disabled_filter_test.cc
index e568873..6fda027 100644
--- a/net/instaweb/rewriter/js_defer_disabled_filter_test.cc
+++ b/test/net/instaweb/rewriter/js_defer_disabled_filter_test.cc
@@ -23,14 +23,14 @@
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "net/instaweb/rewriter/public/static_asset_manager.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/js_disable_filter_test.cc b/test/net/instaweb/rewriter/js_disable_filter_test.cc
similarity index 98%
rename from net/instaweb/rewriter/js_disable_filter_test.cc
rename to test/net/instaweb/rewriter/js_disable_filter_test.cc
index 5411734..f1f48f9 100644
--- a/net/instaweb/rewriter/js_disable_filter_test.cc
+++ b/test/net/instaweb/rewriter/js_disable_filter_test.cc
@@ -23,13 +23,13 @@
#include "net/instaweb/public/global_constants.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
#include "pagespeed/opt/logging/enums.pb.h"
#include "pagespeed/opt/logging/log_record.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/js_inline_filter_test.cc b/test/net/instaweb/rewriter/js_inline_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/js_inline_filter_test.cc
rename to test/net/instaweb/rewriter/js_inline_filter_test.cc
index 340c036..9a9c4a3 100644
--- a/net/instaweb/rewriter/js_inline_filter_test.cc
+++ b/test/net/instaweb/rewriter/js_inline_filter_test.cc
@@ -21,7 +21,6 @@
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/statistics.h"
@@ -31,6 +30,7 @@
#include "pagespeed/kernel/http/google_url.h"
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/http/semantic_type.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/js_outline_filter_test.cc b/test/net/instaweb/rewriter/js_outline_filter_test.cc
similarity index 98%
rename from net/instaweb/rewriter/js_outline_filter_test.cc
rename to test/net/instaweb/rewriter/js_outline_filter_test.cc
index a60aac7..51bee6a 100644
--- a/net/instaweb/rewriter/js_outline_filter_test.cc
+++ b/test/net/instaweb/rewriter/js_outline_filter_test.cc
@@ -22,13 +22,13 @@
#include "net/instaweb/rewriter/public/debug_filter.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/support_noscript_filter.h"
#include "pagespeed/kernel/base/hasher.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/response_headers.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/js_replacer_test.cc b/test/net/instaweb/rewriter/js_replacer_test.cc
similarity index 100%
rename from net/instaweb/rewriter/js_replacer_test.cc
rename to test/net/instaweb/rewriter/js_replacer_test.cc
diff --git a/net/instaweb/rewriter/lazyload_images_filter_test.cc b/test/net/instaweb/rewriter/lazyload_images_filter_test.cc
similarity index 98%
rename from net/instaweb/rewriter/lazyload_images_filter_test.cc
rename to test/net/instaweb/rewriter/lazyload_images_filter_test.cc
index a8ebe4f..dc1ffd3 100644
--- a/net/instaweb/rewriter/lazyload_images_filter_test.cc
+++ b/test/net/instaweb/rewriter/lazyload_images_filter_test.cc
@@ -23,19 +23,19 @@
#include "net/instaweb/http/public/logging_proto_impl.h"
#include "net/instaweb/rewriter/public/critical_images_beacon_filter.h"
-#include "net/instaweb/rewriter/public/mock_critical_images_finder.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/http/http_names.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
#include "pagespeed/opt/logging/enums.pb.h"
#include "pagespeed/opt/logging/log_record.h"
+#include "test/net/instaweb/rewriter/mock_critical_images_finder.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/local_storage_cache_filter_test.cc b/test/net/instaweb/rewriter/local_storage_cache_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/local_storage_cache_filter_test.cc
rename to test/net/instaweb/rewriter/local_storage_cache_filter_test.cc
index 7602adc..a8ebdc1 100644
--- a/net/instaweb/rewriter/local_storage_cache_filter_test.cc
+++ b/test/net/instaweb/rewriter/local_storage_cache_filter_test.cc
@@ -22,7 +22,6 @@
#include "net/instaweb/public/global_constants.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "net/instaweb/rewriter/public/static_asset_manager.h"
#include "pagespeed/kernel/base/string.h"
@@ -30,6 +29,7 @@
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/http_names.h"
#include "pagespeed/kernel/http/request_headers.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/make_show_ads_async_filter_test.cc b/test/net/instaweb/rewriter/make_show_ads_async_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/make_show_ads_async_filter_test.cc
rename to test/net/instaweb/rewriter/make_show_ads_async_filter_test.cc
index 7daf791..bfdc68e 100644
--- a/net/instaweb/rewriter/make_show_ads_async_filter_test.cc
+++ b/test/net/instaweb/rewriter/make_show_ads_async_filter_test.cc
@@ -22,10 +22,10 @@
#include <memory>
#include "net/instaweb/rewriter/public/rewrite_driver.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/statistics.h"
#include "pagespeed/kernel/base/string_util.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/measurement_proxy_url_namer_test.cc b/test/net/instaweb/rewriter/measurement_proxy_url_namer_test.cc
similarity index 98%
rename from net/instaweb/rewriter/measurement_proxy_url_namer_test.cc
rename to test/net/instaweb/rewriter/measurement_proxy_url_namer_test.cc
index 558bed9..a04e9a2 100644
--- a/net/instaweb/rewriter/measurement_proxy_url_namer_test.cc
+++ b/test/net/instaweb/rewriter/measurement_proxy_url_namer_test.cc
@@ -25,11 +25,11 @@
#include "net/instaweb/rewriter/public/output_resource_kind.h"
#include "net/instaweb/rewriter/public/resource_namer.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/http/google_url.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/meta_tag_filter_test.cc b/test/net/instaweb/rewriter/meta_tag_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/meta_tag_filter_test.cc
rename to test/net/instaweb/rewriter/meta_tag_filter_test.cc
index 9960cdf..ed9d413 100644
--- a/net/instaweb/rewriter/meta_tag_filter_test.cc
+++ b/test/net/instaweb/rewriter/meta_tag_filter_test.cc
@@ -24,12 +24,12 @@
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/http_names.h" // for HttpAttributes, etc
#include "pagespeed/kernel/http/response_headers.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/mock_critical_images_finder.cc b/test/net/instaweb/rewriter/mock_critical_images_finder.cc
similarity index 96%
rename from net/instaweb/rewriter/mock_critical_images_finder.cc
rename to test/net/instaweb/rewriter/mock_critical_images_finder.cc
index 4fb386e..67e55d4 100644
--- a/net/instaweb/rewriter/mock_critical_images_finder.cc
+++ b/test/net/instaweb/rewriter/mock_critical_images_finder.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "net/instaweb/rewriter/public/mock_critical_images_finder.h"
+#include "test/net/instaweb/rewriter/mock_critical_images_finder.h"
#include <map> // for map<>::mapped_type
#include <utility> // for make_pair
diff --git a/net/instaweb/rewriter/public/mock_critical_images_finder.h b/test/net/instaweb/rewriter/mock_critical_images_finder.h
similarity index 97%
rename from net/instaweb/rewriter/public/mock_critical_images_finder.h
rename to test/net/instaweb/rewriter/mock_critical_images_finder.h
index 3ec091e..ce45dee 100644
--- a/net/instaweb/rewriter/public/mock_critical_images_finder.h
+++ b/test/net/instaweb/rewriter/mock_critical_images_finder.h
@@ -21,12 +21,12 @@
#define NET_INSTAWEB_REWRITER_PUBLIC_MOCK_CRITICAL_IMAGES_FINDER_H_
#include "net/instaweb/rewriter/public/critical_images_finder.h"
-#include "net/instaweb/rewriter/public/critical_images_finder_test_base.h"
#include "net/instaweb/rewriter/rendered_image.pb.h"
#include "net/instaweb/util/public/property_cache.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string_util.h"
+#include "test/net/instaweb/rewriter/critical_images_finder_test_base.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/mock_resource_callback.cc b/test/net/instaweb/rewriter/mock_resource_callback.cc
similarity index 93%
rename from net/instaweb/rewriter/mock_resource_callback.cc
rename to test/net/instaweb/rewriter/mock_resource_callback.cc
index b1bc4ee..b6725be 100644
--- a/net/instaweb/rewriter/mock_resource_callback.cc
+++ b/test/net/instaweb/rewriter/mock_resource_callback.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "net/instaweb/rewriter/public/mock_resource_callback.h"
+#include "test/net/instaweb/rewriter/mock_resource_callback.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/public/mock_resource_callback.h b/test/net/instaweb/rewriter/mock_resource_callback.h
similarity index 100%
rename from net/instaweb/rewriter/public/mock_resource_callback.h
rename to test/net/instaweb/rewriter/mock_resource_callback.h
diff --git a/net/instaweb/rewriter/notifying_fetch.cc b/test/net/instaweb/rewriter/notifying_fetch.cc
similarity index 97%
rename from net/instaweb/rewriter/notifying_fetch.cc
rename to test/net/instaweb/rewriter/notifying_fetch.cc
index 506f28c..0c19bdd 100644
--- a/net/instaweb/rewriter/notifying_fetch.cc
+++ b/test/net/instaweb/rewriter/notifying_fetch.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "net/instaweb/rewriter/public/notifying_fetch.h"
+#include "test/net/instaweb/rewriter/notifying_fetch.h"
#include "net/instaweb/http/public/async_fetch.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
diff --git a/net/instaweb/rewriter/public/notifying_fetch.h b/test/net/instaweb/rewriter/notifying_fetch.h
similarity index 100%
rename from net/instaweb/rewriter/public/notifying_fetch.h
rename to test/net/instaweb/rewriter/notifying_fetch.h
diff --git a/net/instaweb/rewriter/pedantic_filter_test.cc b/test/net/instaweb/rewriter/pedantic_filter_test.cc
similarity index 100%
rename from net/instaweb/rewriter/pedantic_filter_test.cc
rename to test/net/instaweb/rewriter/pedantic_filter_test.cc
diff --git a/net/instaweb/rewriter/property_cache_util_test.cc b/test/net/instaweb/rewriter/property_cache_util_test.cc
similarity index 97%
rename from net/instaweb/rewriter/property_cache_util_test.cc
rename to test/net/instaweb/rewriter/property_cache_util_test.cc
index be47dc1..01d29a8 100644
--- a/net/instaweb/rewriter/property_cache_util_test.cc
+++ b/test/net/instaweb/rewriter/property_cache_util_test.cc
@@ -21,13 +21,13 @@
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/util/public/mock_property_page.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/http/http.pb.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/push_preload_filter_test.cc b/test/net/instaweb/rewriter/push_preload_filter_test.cc
similarity index 98%
rename from net/instaweb/rewriter/push_preload_filter_test.cc
rename to test/net/instaweb/rewriter/push_preload_filter_test.cc
index cb1ffd9..ba9b037 100644
--- a/net/instaweb/rewriter/push_preload_filter_test.cc
+++ b/test/net/instaweb/rewriter/push_preload_filter_test.cc
@@ -19,9 +19,7 @@
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/util/public/mock_property_page.h"
#include "net/instaweb/util/public/property_cache.h"
#include "pagespeed/kernel/base/string.h"
@@ -30,6 +28,8 @@
#include "pagespeed/kernel/http/http_names.h"
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/opt/http/request_context.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/redirect_on_size_limit_filter_test.cc b/test/net/instaweb/rewriter/redirect_on_size_limit_filter_test.cc
similarity index 98%
rename from net/instaweb/rewriter/redirect_on_size_limit_filter_test.cc
rename to test/net/instaweb/rewriter/redirect_on_size_limit_filter_test.cc
index f577b83..77dc3a1 100644
--- a/net/instaweb/rewriter/redirect_on_size_limit_filter_test.cc
+++ b/test/net/instaweb/rewriter/redirect_on_size_limit_filter_test.cc
@@ -23,11 +23,11 @@
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/base/string_writer.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/request_properties_test.cc b/test/net/instaweb/rewriter/request_properties_test.cc
similarity index 97%
rename from net/instaweb/rewriter/request_properties_test.cc
rename to test/net/instaweb/rewriter/request_properties_test.cc
index f8b3505..65d62a2 100644
--- a/net/instaweb/rewriter/request_properties_test.cc
+++ b/test/net/instaweb/rewriter/request_properties_test.cc
@@ -24,8 +24,8 @@
#include "pagespeed/kernel/http/http_names.h"
#include "pagespeed/kernel/http/request_headers.h"
#include "pagespeed/kernel/http/user_agent_matcher.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/resource_combiner_test.cc b/test/net/instaweb/rewriter/resource_combiner_test.cc
similarity index 99%
rename from net/instaweb/rewriter/resource_combiner_test.cc
rename to test/net/instaweb/rewriter/resource_combiner_test.cc
index f49ddac..9ee8e6f 100644
--- a/net/instaweb/rewriter/resource_combiner_test.cc
+++ b/test/net/instaweb/rewriter/resource_combiner_test.cc
@@ -34,7 +34,6 @@
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_filter.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/hasher.h"
#include "pagespeed/kernel/base/message_handler.h"
@@ -47,6 +46,7 @@
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/util/url_multipart_encoder.h"
#include "pagespeed/kernel/util/url_segment_encoder.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/resource_fetch_test.cc b/test/net/instaweb/rewriter/resource_fetch_test.cc
similarity index 98%
rename from net/instaweb/rewriter/resource_fetch_test.cc
rename to test/net/instaweb/rewriter/resource_fetch_test.cc
index e4e4df6..3458093 100644
--- a/net/instaweb/rewriter/resource_fetch_test.cc
+++ b/test/net/instaweb/rewriter/resource_fetch_test.cc
@@ -24,9 +24,7 @@
#include "net/instaweb/http/public/sync_fetcher_adapter_callback.h"
#include "net/instaweb/http/public/wait_url_async_fetcher.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "pagespeed/kernel/base/function.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
@@ -34,6 +32,8 @@
#include "pagespeed/kernel/base/timer.h"
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/google_url.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
#include "test/pagespeed/kernel/thread/mock_scheduler.h"
diff --git a/net/instaweb/rewriter/resource_namer_test.cc b/test/net/instaweb/rewriter/resource_namer_test.cc
similarity index 100%
rename from net/instaweb/rewriter/resource_namer_test.cc
rename to test/net/instaweb/rewriter/resource_namer_test.cc
diff --git a/net/instaweb/rewriter/resource_slot_test.cc b/test/net/instaweb/rewriter/resource_slot_test.cc
similarity index 98%
rename from net/instaweb/rewriter/resource_slot_test.cc
rename to test/net/instaweb/rewriter/resource_slot_test.cc
index c275442..7c18f1c 100644
--- a/net/instaweb/rewriter/resource_slot_test.cc
+++ b/test/net/instaweb/rewriter/resource_slot_test.cc
@@ -27,7 +27,6 @@
#include "net/instaweb/rewriter/public/data_url_input_resource.h"
#include "net/instaweb/rewriter/public/resource.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h" // for StrCat
@@ -35,6 +34,7 @@
#include "pagespeed/kernel/html/html_name.h"
#include "pagespeed/kernel/html/html_writer_filter.h"
#include "pagespeed/kernel/http/content_type.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace {
diff --git a/net/instaweb/rewriter/resource_tag_scanner_test.cc b/test/net/instaweb/rewriter/resource_tag_scanner_test.cc
similarity index 99%
rename from net/instaweb/rewriter/resource_tag_scanner_test.cc
rename to test/net/instaweb/rewriter/resource_tag_scanner_test.cc
index aa79bb9..4797564 100644
--- a/net/instaweb/rewriter/resource_tag_scanner_test.cc
+++ b/test/net/instaweb/rewriter/resource_tag_scanner_test.cc
@@ -25,13 +25,13 @@
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/html/empty_html_filter.h"
#include "pagespeed/kernel/html/html_element.h"
#include "pagespeed/kernel/http/semantic_type.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/resource_update_test.cc b/test/net/instaweb/rewriter/resource_update_test.cc
similarity index 98%
rename from net/instaweb/rewriter/resource_update_test.cc
rename to test/net/instaweb/rewriter/resource_update_test.cc
index 3159496..32c5678 100644
--- a/net/instaweb/rewriter/resource_update_test.cc
+++ b/test/net/instaweb/rewriter/resource_update_test.cc
@@ -24,16 +24,13 @@
#include "base/logging.h"
#include "net/instaweb/http/public/counting_url_async_fetcher.h"
-#include "net/instaweb/http/public/mock_url_fetcher.h"
#include "net/instaweb/rewriter/public/file_load_policy.h"
#include "net/instaweb/rewriter/public/output_resource_kind.h"
#include "net/instaweb/rewriter/public/resource_namer.h"
-#include "net/instaweb/rewriter/public/rewrite_context_test_base.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
#include "net/instaweb/rewriter/public/rewrite_stats.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/hasher.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
@@ -44,6 +41,9 @@
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/http_names.h" // for Code::kOK
#include "pagespeed/kernel/http/response_headers.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
+#include "test/net/instaweb/rewriter/rewrite_context_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mem_file_system.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/responsive_image_filter_test.cc b/test/net/instaweb/rewriter/responsive_image_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/responsive_image_filter_test.cc
rename to test/net/instaweb/rewriter/responsive_image_filter_test.cc
index 5033df8..b008044 100644
--- a/net/instaweb/rewriter/responsive_image_filter_test.cc
+++ b/test/net/instaweb/rewriter/responsive_image_filter_test.cc
@@ -22,16 +22,16 @@
#include "net/instaweb/rewriter/public/delay_images_filter.h"
#include "net/instaweb/rewriter/public/local_storage_cache_filter.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "net/instaweb/rewriter/public/static_asset_manager.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/html/html_keywords.h"
#include "pagespeed/kernel/http/content_type.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gmock.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/rewrite_context_test.cc b/test/net/instaweb/rewriter/rewrite_context_test.cc
similarity index 99%
rename from net/instaweb/rewriter/rewrite_context_test.cc
rename to test/net/instaweb/rewriter/rewrite_context_test.cc
index 8d4e492..cfab807 100644
--- a/net/instaweb/rewriter/rewrite_context_test.cc
+++ b/test/net/instaweb/rewriter/rewrite_context_test.cc
@@ -27,7 +27,6 @@
#include "net/instaweb/http/public/counting_url_async_fetcher.h"
#include "net/instaweb/http/public/http_cache_failure.h"
#include "net/instaweb/http/public/logging_proto_impl.h"
-#include "net/instaweb/http/public/mock_url_fetcher.h"
#include "net/instaweb/http/public/rate_controller.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/http/public/wait_url_async_fetcher.h"
@@ -38,16 +37,13 @@
#include "net/instaweb/rewriter/public/output_resource_kind.h"
#include "net/instaweb/rewriter/public/resource.h" // for ResourcePtr, etc
#include "net/instaweb/rewriter/public/resource_slot.h"
-#include "net/instaweb/rewriter/public/rewrite_context_test_base.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_filter.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
#include "net/instaweb/rewriter/public/rewrite_stats.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "net/instaweb/rewriter/public/simple_text_filter.h"
#include "net/instaweb/rewriter/public/single_rewrite_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/charset_util.h"
#include "pagespeed/kernel/base/named_lock_manager.h"
@@ -66,13 +62,17 @@
#include "pagespeed/kernel/http/request_headers.h"
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/http/semantic_type.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
#include "pagespeed/kernel/thread/queued_worker_pool.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
+#include "test/net/instaweb/rewriter/rewrite_context_test_base.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mem_file_system.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/base/named_lock_tester.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
#include "test/pagespeed/kernel/thread/worker_test_base.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/rewrite_context_test_base.cc b/test/net/instaweb/rewriter/rewrite_context_test_base.cc
similarity index 99%
rename from net/instaweb/rewriter/rewrite_context_test_base.cc
rename to test/net/instaweb/rewriter/rewrite_context_test_base.cc
index 7e863d0..7dbd321 100644
--- a/net/instaweb/rewriter/rewrite_context_test_base.cc
+++ b/test/net/instaweb/rewriter/rewrite_context_test_base.cc
@@ -20,7 +20,7 @@
// Base-class & helper classes for testing RewriteContext and its
// interaction with various subsystems.
-#include "net/instaweb/rewriter/public/rewrite_context_test_base.h"
+#include "test/net/instaweb/rewriter/rewrite_context_test_base.h"
#include <memory>
diff --git a/net/instaweb/rewriter/public/rewrite_context_test_base.h b/test/net/instaweb/rewriter/rewrite_context_test_base.h
similarity index 98%
rename from net/instaweb/rewriter/public/rewrite_context_test_base.h
rename to test/net/instaweb/rewriter/rewrite_context_test_base.h
index e0b5103..b4aaf0d 100644
--- a/net/instaweb/rewriter/public/rewrite_context_test_base.h
+++ b/test/net/instaweb/rewriter/rewrite_context_test_base.h
@@ -35,11 +35,9 @@
#include "net/instaweb/rewriter/public/rewrite_context.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_filter.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "net/instaweb/rewriter/public/simple_text_filter.h"
#include "net/instaweb/rewriter/public/single_rewrite_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/message_handler.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
@@ -52,6 +50,8 @@
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/util/url_multipart_encoder.h"
#include "pagespeed/kernel/util/url_segment_encoder.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
#include "test/pagespeed/kernel/thread/worker_test_base.h"
diff --git a/net/instaweb/rewriter/rewrite_driver_test.cc b/test/net/instaweb/rewriter/rewrite_driver_test.cc
similarity index 99%
rename from net/instaweb/rewriter/rewrite_driver_test.cc
rename to test/net/instaweb/rewriter/rewrite_driver_test.cc
index 40cba5d..130e2ca 100644
--- a/net/instaweb/rewriter/rewrite_driver_test.cc
+++ b/test/net/instaweb/rewriter/rewrite_driver_test.cc
@@ -22,22 +22,17 @@
#include "net/instaweb/http/public/async_fetch.h"
#include "net/instaweb/http/public/counting_url_async_fetcher.h"
#include "net/instaweb/http/public/logging_proto_impl.h"
-#include "net/instaweb/http/public/mock_url_fetcher.h"
#include "net/instaweb/http/public/wait_url_async_fetcher.h"
#include "net/instaweb/rewriter/public/domain_lawyer.h"
#include "net/instaweb/rewriter/public/file_load_policy.h"
-#include "net/instaweb/rewriter/public/mock_resource_callback.h"
#include "net/instaweb/rewriter/public/output_resource_kind.h"
#include "net/instaweb/rewriter/public/request_properties.h"
#include "net/instaweb/rewriter/public/resource.h"
#include "net/instaweb/rewriter/public/resource_slot.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
#include "net/instaweb/rewriter/public/rewrite_stats.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "net/instaweb/rewriter/public/single_rewrite_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
-#include "net/instaweb/rewriter/public/test_url_namer.h"
#include "net/instaweb/rewriter/public/url_namer.h"
#include "pagespeed/kernel/base/abstract_mutex.h"
#include "pagespeed/kernel/base/basictypes.h"
@@ -56,12 +51,17 @@
#include "pagespeed/kernel/http/http_options.h"
#include "pagespeed/kernel/http/request_headers.h"
#include "pagespeed/kernel/http/semantic_type.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
#include "pagespeed/opt/logging/log_record.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
+#include "test/net/instaweb/rewriter/mock_resource_callback.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
+#include "test/net/instaweb/rewriter/test_url_namer.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
#include "test/pagespeed/kernel/thread/worker_test_base.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/rewrite_options_test.cc b/test/net/instaweb/rewriter/rewrite_options_test.cc
similarity index 99%
rename from net/instaweb/rewriter/rewrite_options_test.cc
rename to test/net/instaweb/rewriter/rewrite_options_test.cc
index 8b693f5..8bb449d 100644
--- a/net/instaweb/rewriter/rewrite_options_test.cc
+++ b/test/net/instaweb/rewriter/rewrite_options_test.cc
@@ -21,12 +21,12 @@
#include "net/instaweb/rewriter/public/domain_lawyer.h"
#include "net/instaweb/rewriter/public/experiment_util.h"
-#include "net/instaweb/rewriter/public/rewrite_options_test_base.h"
#include "pagespeed/kernel/base/google_message_handler.h"
#include "pagespeed/kernel/base/message_handler.h"
#include "pagespeed/kernel/base/null_message_handler.h"
#include "pagespeed/kernel/http/google_url.h"
#include "pagespeed/kernel/http/request_headers.h"
+#include "test/net/instaweb/rewriter/rewrite_options_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/message_handler_test_base.h"
#include "test/pagespeed/kernel/base/mock_hasher.h"
diff --git a/net/instaweb/rewriter/public/rewrite_options_test_base.h b/test/net/instaweb/rewriter/rewrite_options_test_base.h
similarity index 100%
rename from net/instaweb/rewriter/public/rewrite_options_test_base.h
rename to test/net/instaweb/rewriter/rewrite_options_test_base.h
diff --git a/net/instaweb/rewriter/rewrite_query_test.cc b/test/net/instaweb/rewriter/rewrite_query_test.cc
similarity index 99%
rename from net/instaweb/rewriter/rewrite_query_test.cc
rename to test/net/instaweb/rewriter/rewrite_query_test.cc
index eb7f734..ddeb8cb 100644
--- a/net/instaweb/rewriter/rewrite_query_test.cc
+++ b/test/net/instaweb/rewriter/rewrite_query_test.cc
@@ -22,14 +22,14 @@
#include "base/logging.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "pagespeed/kernel/base/google_message_handler.h"
#include "pagespeed/kernel/base/ref_counted_ptr.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/http/google_url.h"
#include "pagespeed/kernel/http/http_names.h"
#include "pagespeed/kernel/http/response_headers.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/rewrite_single_resource_filter_test.cc b/test/net/instaweb/rewriter/rewrite_single_resource_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/rewrite_single_resource_filter_test.cc
rename to test/net/instaweb/rewriter/rewrite_single_resource_filter_test.cc
index beccfa2..2804a79 100644
--- a/net/instaweb/rewriter/rewrite_single_resource_filter_test.cc
+++ b/test/net/instaweb/rewriter/rewrite_single_resource_filter_test.cc
@@ -30,7 +30,6 @@
#include "net/instaweb/rewriter/public/rewrite_filter.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
#include "net/instaweb/rewriter/public/rewrite_result.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "net/instaweb/rewriter/public/single_rewrite_context.h"
#include "pagespeed/kernel/base/basictypes.h"
@@ -45,6 +44,7 @@
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/util/url_escaper.h"
#include "pagespeed/kernel/util/url_segment_encoder.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/rewrite_test_base.cc b/test/net/instaweb/rewriter/rewrite_test_base.cc
similarity index 99%
rename from net/instaweb/rewriter/rewrite_test_base.cc
rename to test/net/instaweb/rewriter/rewrite_test_base.cc
index 7f83bf7..f062a8a 100644
--- a/net/instaweb/rewriter/rewrite_test_base.cc
+++ b/test/net/instaweb/rewriter/rewrite_test_base.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include <cstddef>
#include <memory>
@@ -30,10 +30,8 @@
#include "net/instaweb/http/public/http_cache.h"
#include "net/instaweb/http/public/http_cache_failure.h"
#include "net/instaweb/http/public/http_value.h"
-#include "net/instaweb/http/public/log_record_test_helper.h"
#include "net/instaweb/http/public/logging_proto.h"
#include "net/instaweb/http/public/logging_proto_impl.h"
-#include "net/instaweb/http/public/mock_callback.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/public/global_constants.h"
#include "net/instaweb/rewriter/cached_result.pb.h"
@@ -52,8 +50,6 @@
#include "net/instaweb/rewriter/public/rewrite_options.h"
#include "net/instaweb/rewriter/public/rewrite_stats.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
-#include "net/instaweb/rewriter/public/test_url_namer.h"
#include "pagespeed/kernel/base/abstract_mutex.h"
#include "pagespeed/kernel/base/base64_util.h"
#include "pagespeed/kernel/base/ref_counted_ptr.h"
@@ -77,6 +73,10 @@
#include "pagespeed/kernel/util/simple_stats.h"
#include "pagespeed/kernel/util/url_multipart_encoder.h"
#include "pagespeed/opt/logging/log_record.h"
+#include "test/net/instaweb/http/log_record_test_helper.h"
+#include "test/net/instaweb/http/mock_callback.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
+#include "test/net/instaweb/rewriter/test_url_namer.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/cache/mock_time_cache.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
@@ -119,7 +119,8 @@
} // namespace
-const char RewriteTestBase::kTestData[] = "/net/instaweb/rewriter/testdata/";
+const char RewriteTestBase::kTestData[] =
+ "/test/net/instaweb/rewriter/testdata/";
const char RewriteTestBase::kConfiguredBeaconingKey[] =
"configured_beaconing_key";
const char RewriteTestBase::kWrongBeaconingKey[] = "wrong_beaconing_key";
diff --git a/net/instaweb/rewriter/public/rewrite_test_base.h b/test/net/instaweb/rewriter/rewrite_test_base.h
similarity index 99%
rename from net/instaweb/rewriter/public/rewrite_test_base.h
rename to test/net/instaweb/rewriter/rewrite_test_base.h
index 080a40e..b942bb5 100644
--- a/net/instaweb/rewriter/public/rewrite_test_base.h
+++ b/test/net/instaweb/rewriter/rewrite_test_base.h
@@ -29,21 +29,21 @@
#include "net/instaweb/http/public/http_value.h"
#include "net/instaweb/http/public/logging_proto.h"
#include "net/instaweb/http/public/logging_proto_impl.h"
-#include "net/instaweb/http/public/mock_url_fetcher.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/rewriter/public/resource.h"
#include "net/instaweb/rewriter/public/resource_namer.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
// We need to include rewrite_driver.h due to covariant return of html_parse()
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/util/public/mock_property_page.h"
#include "net/instaweb/util/public/property_cache.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/hasher.h"
#include "pagespeed/kernel/base/md5_hasher.h"
#include "pagespeed/kernel/base/message_handler.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/mem_file_system.h"
#include "test/pagespeed/kernel/base/mock_hasher.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
diff --git a/net/instaweb/rewriter/rewriter_test.cc b/test/net/instaweb/rewriter/rewriter_test.cc
similarity index 98%
rename from net/instaweb/rewriter/rewriter_test.cc
rename to test/net/instaweb/rewriter/rewriter_test.cc
index d9aa1d5..382f12f 100644
--- a/net/instaweb/rewriter/rewriter_test.cc
+++ b/test/net/instaweb/rewriter/rewriter_test.cc
@@ -20,12 +20,12 @@
// Unit-test some small filters.
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/hasher.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/cache/lru_cache.h"
#include "pagespeed/kernel/http/content_type.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/rewritten_content_scanning_filter_test.cc b/test/net/instaweb/rewriter/rewritten_content_scanning_filter_test.cc
similarity index 96%
rename from net/instaweb/rewriter/rewritten_content_scanning_filter_test.cc
rename to test/net/instaweb/rewriter/rewritten_content_scanning_filter_test.cc
index ef21aea..fee6380 100644
--- a/net/instaweb/rewriter/rewritten_content_scanning_filter_test.cc
+++ b/test/net/instaweb/rewriter/rewritten_content_scanning_filter_test.cc
@@ -22,13 +22,13 @@
#include <memory>
#include "net/instaweb/rewriter/public/rewrite_driver.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_url_namer.h"
#include "net/instaweb/util/public/mock_property_page.h"
#include "net/instaweb/util/public/property_cache.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string_util.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_url_namer.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/scan_filter_test.cc b/test/net/instaweb/rewriter/scan_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/scan_filter_test.cc
rename to test/net/instaweb/rewriter/scan_filter_test.cc
index d97bade..22b89f2 100644
--- a/net/instaweb/rewriter/scan_filter_test.cc
+++ b/test/net/instaweb/rewriter/scan_filter_test.cc
@@ -23,11 +23,11 @@
#include "net/instaweb/rewriter/public/scan_filter.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/charset_util.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/http/google_url.h"
#include "pagespeed/kernel/http/response_headers.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/script_tag_scanner_test.cc b/test/net/instaweb/rewriter/script_tag_scanner_test.cc
similarity index 100%
rename from net/instaweb/rewriter/script_tag_scanner_test.cc
rename to test/net/instaweb/rewriter/script_tag_scanner_test.cc
diff --git a/net/instaweb/rewriter/server_context_test.cc b/test/net/instaweb/rewriter/server_context_test.cc
similarity index 99%
rename from net/instaweb/rewriter/server_context_test.cc
rename to test/net/instaweb/rewriter/server_context_test.cc
index 18e7a5a..a22babf 100644
--- a/net/instaweb/rewriter/server_context_test.cc
+++ b/test/net/instaweb/rewriter/server_context_test.cc
@@ -29,7 +29,6 @@
#include "net/instaweb/http/public/http_cache.h"
#include "net/instaweb/http/public/http_cache_failure.h"
#include "net/instaweb/http/public/http_value.h"
-#include "net/instaweb/http/public/mock_url_fetcher.h"
#include "net/instaweb/rewriter/input_info.pb.h"
#include "net/instaweb/rewriter/public/beacon_critical_images_finder.h"
#include "net/instaweb/rewriter/public/critical_finder_support_util.h"
@@ -38,7 +37,6 @@
#include "net/instaweb/rewriter/public/css_outline_filter.h"
#include "net/instaweb/rewriter/public/domain_lawyer.h"
#include "net/instaweb/rewriter/public/file_load_policy.h"
-#include "net/instaweb/rewriter/public/mock_resource_callback.h"
#include "net/instaweb/rewriter/public/output_resource.h"
#include "net/instaweb/rewriter/public/output_resource_kind.h"
#include "net/instaweb/rewriter/public/resource.h"
@@ -47,8 +45,6 @@
#include "net/instaweb/rewriter/public/rewrite_filter.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
#include "net/instaweb/rewriter/public/rewrite_query.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/rewriter/rendered_image.pb.h"
#include "net/instaweb/util/public/mock_property_page.h"
#include "net/instaweb/util/public/property_cache.h"
@@ -68,12 +64,16 @@
#include "pagespeed/kernel/http/request_headers.h"
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/http/user_agent_matcher.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
#include "pagespeed/kernel/util/url_escaper.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
+#include "test/net/instaweb/rewriter/mock_resource_callback.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
namespace {
diff --git a/net/instaweb/rewriter/shared_cache_test.cc b/test/net/instaweb/rewriter/shared_cache_test.cc
similarity index 98%
rename from net/instaweb/rewriter/shared_cache_test.cc
rename to test/net/instaweb/rewriter/shared_cache_test.cc
index 23eaf29..17f33fb 100644
--- a/net/instaweb/rewriter/shared_cache_test.cc
+++ b/test/net/instaweb/rewriter/shared_cache_test.cc
@@ -24,12 +24,9 @@
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/rewriter/public/file_load_policy.h"
#include "net/instaweb/rewriter/public/output_resource_kind.h"
-#include "net/instaweb/rewriter/public/rewrite_context_test_base.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/file_system.h"
#include "pagespeed/kernel/base/ref_counted_ptr.h"
@@ -39,6 +36,9 @@
#include "pagespeed/kernel/cache/delay_cache.h"
#include "pagespeed/kernel/cache/lru_cache.h"
#include "pagespeed/opt/logging/log_record.h"
+#include "test/net/instaweb/rewriter/rewrite_context_test_base.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mem_file_system.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
diff --git a/net/instaweb/rewriter/srcset_slot_test.cc b/test/net/instaweb/rewriter/srcset_slot_test.cc
similarity index 98%
rename from net/instaweb/rewriter/srcset_slot_test.cc
rename to test/net/instaweb/rewriter/srcset_slot_test.cc
index 968d041..da061b9 100644
--- a/net/instaweb/rewriter/srcset_slot_test.cc
+++ b/test/net/instaweb/rewriter/srcset_slot_test.cc
@@ -24,13 +24,13 @@
#include "net/instaweb/rewriter/public/resource.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_filter.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/html/html_element.h"
#include "pagespeed/kernel/html/html_name.h"
#include "pagespeed/kernel/html/html_writer_filter.h"
#include "pagespeed/kernel/http/content_type.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace {
diff --git a/net/instaweb/rewriter/static_asserts_test.cc b/test/net/instaweb/rewriter/static_asserts_test.cc
similarity index 100%
rename from net/instaweb/rewriter/static_asserts_test.cc
rename to test/net/instaweb/rewriter/static_asserts_test.cc
diff --git a/net/instaweb/rewriter/static_asset_manager_test.cc b/test/net/instaweb/rewriter/static_asset_manager_test.cc
similarity index 99%
rename from net/instaweb/rewriter/static_asset_manager_test.cc
rename to test/net/instaweb/rewriter/static_asset_manager_test.cc
index d9211e8..d0eb804 100644
--- a/net/instaweb/rewriter/static_asset_manager_test.cc
+++ b/test/net/instaweb/rewriter/static_asset_manager_test.cc
@@ -24,7 +24,6 @@
#include "net/instaweb/rewriter/public/common_filter.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string_util.h"
@@ -32,6 +31,7 @@
#include "pagespeed/kernel/html/html_filter.h"
#include "pagespeed/kernel/html/html_name.h"
#include "pagespeed/kernel/http/content_type.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/strip_scripts_filter_test.cc b/test/net/instaweb/rewriter/strip_scripts_filter_test.cc
similarity index 100%
rename from net/instaweb/rewriter/strip_scripts_filter_test.cc
rename to test/net/instaweb/rewriter/strip_scripts_filter_test.cc
diff --git a/net/instaweb/rewriter/strip_subresource_hints_filter_test.cc b/test/net/instaweb/rewriter/strip_subresource_hints_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/strip_subresource_hints_filter_test.cc
rename to test/net/instaweb/rewriter/strip_subresource_hints_filter_test.cc
index e2289da..37d1620 100644
--- a/net/instaweb/rewriter/strip_subresource_hints_filter_test.cc
+++ b/test/net/instaweb/rewriter/strip_subresource_hints_filter_test.cc
@@ -22,10 +22,10 @@
#include "net/instaweb/rewriter/public/domain_lawyer.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/html/empty_html_filter.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
diff --git a/net/instaweb/rewriter/support_noscript_filter_test.cc b/test/net/instaweb/rewriter/support_noscript_filter_test.cc
similarity index 98%
rename from net/instaweb/rewriter/support_noscript_filter_test.cc
rename to test/net/instaweb/rewriter/support_noscript_filter_test.cc
index d2293fe..257f0f5 100644
--- a/net/instaweb/rewriter/support_noscript_filter_test.cc
+++ b/test/net/instaweb/rewriter/support_noscript_filter_test.cc
@@ -20,9 +20,9 @@
#include "net/instaweb/rewriter/public/support_noscript_filter.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/http/content_type.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/test_rewrite_driver_factory.cc b/test/net/instaweb/rewriter/test_rewrite_driver_factory.cc
similarity index 97%
rename from net/instaweb/rewriter/test_rewrite_driver_factory.cc
rename to test/net/instaweb/rewriter/test_rewrite_driver_factory.cc
index 794a471..73ec1d6 100644
--- a/net/instaweb/rewriter/test_rewrite_driver_factory.cc
+++ b/test/net/instaweb/rewriter/test_rewrite_driver_factory.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include <memory>
#include <vector>
@@ -25,7 +25,6 @@
#include "base/logging.h"
#include "net/instaweb/http/public/counting_url_async_fetcher.h"
#include "net/instaweb/http/public/http_cache.h"
-#include "net/instaweb/http/public/mock_url_fetcher.h"
#include "net/instaweb/http/public/rate_controller.h"
#include "net/instaweb/http/public/rate_controlling_url_async_fetcher.h"
#include "net/instaweb/http/public/url_async_fetcher.h"
@@ -34,7 +33,6 @@
#include "net/instaweb/rewriter/public/rewrite_driver_factory.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_url_namer.h"
#include "net/instaweb/rewriter/public/url_namer.h"
#include "net/instaweb/util/public/cache_property_store.h"
#include "net/instaweb/util/public/property_cache.h"
@@ -54,16 +52,18 @@
#include "pagespeed/kernel/cache/threadsafe_cache.h"
#include "pagespeed/kernel/html/html_filter.h"
#include "pagespeed/kernel/thread/scheduler.h"
-#include "pagespeed/kernel/util/mock_nonce_generator.h"
#include "pagespeed/kernel/util/nonce_generator.h"
#include "pagespeed/kernel/util/platform.h"
#include "pagespeed/kernel/util/threadsafe_lock_manager.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
+#include "test/net/instaweb/rewriter/test_url_namer.h"
#include "test/pagespeed/kernel/base/mem_file_system.h"
#include "test/pagespeed/kernel/base/mock_hasher.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
#include "test/pagespeed/kernel/cache/mock_time_cache.h"
#include "test/pagespeed/kernel/thread/mock_scheduler.h"
+#include "test/pagespeed/kernel/util/mock_nonce_generator.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/public/test_rewrite_driver_factory.h b/test/net/instaweb/rewriter/test_rewrite_driver_factory.h
similarity index 100%
rename from net/instaweb/rewriter/public/test_rewrite_driver_factory.h
rename to test/net/instaweb/rewriter/test_rewrite_driver_factory.h
diff --git a/net/instaweb/rewriter/test_url_namer.cc b/test/net/instaweb/rewriter/test_url_namer.cc
similarity index 98%
rename from net/instaweb/rewriter/test_url_namer.cc
rename to test/net/instaweb/rewriter/test_url_namer.cc
index d67ace6..85268bf 100644
--- a/net/instaweb/rewriter/test_url_namer.cc
+++ b/test/net/instaweb/rewriter/test_url_namer.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "net/instaweb/rewriter/public/test_url_namer.h"
+#include "test/net/instaweb/rewriter/test_url_namer.h"
#include <cstddef> // for size_t
diff --git a/net/instaweb/rewriter/public/test_url_namer.h b/test/net/instaweb/rewriter/test_url_namer.h
similarity index 100%
rename from net/instaweb/rewriter/public/test_url_namer.h
rename to test/net/instaweb/rewriter/test_url_namer.h
diff --git a/net/instaweb/rewriter/testdata/AppSegments.jpg b/test/net/instaweb/rewriter/testdata/AppSegments.jpg
similarity index 100%
rename from net/instaweb/rewriter/testdata/AppSegments.jpg
rename to test/net/instaweb/rewriter/testdata/AppSegments.jpg
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/BikeCrashIcn.png b/test/net/instaweb/rewriter/testdata/BikeCrashIcn.png
similarity index 100%
rename from net/instaweb/rewriter/testdata/BikeCrashIcn.png
rename to test/net/instaweb/rewriter/testdata/BikeCrashIcn.png
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/CradleAnimation.gif b/test/net/instaweb/rewriter/testdata/CradleAnimation.gif
similarity index 100%
rename from net/instaweb/rewriter/testdata/CradleAnimation.gif
rename to test/net/instaweb/rewriter/testdata/CradleAnimation.gif
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/Cuppa.png b/test/net/instaweb/rewriter/testdata/Cuppa.png
similarity index 100%
rename from net/instaweb/rewriter/testdata/Cuppa.png
rename to test/net/instaweb/rewriter/testdata/Cuppa.png
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/CuppaO.png b/test/net/instaweb/rewriter/testdata/CuppaO.png
similarity index 100%
rename from net/instaweb/rewriter/testdata/CuppaO.png
rename to test/net/instaweb/rewriter/testdata/CuppaO.png
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/CuppaT-26x28.png b/test/net/instaweb/rewriter/testdata/CuppaT-26x28.png
similarity index 100%
rename from net/instaweb/rewriter/testdata/CuppaT-26x28.png
rename to test/net/instaweb/rewriter/testdata/CuppaT-26x28.png
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/CuppaT.png b/test/net/instaweb/rewriter/testdata/CuppaT.png
similarity index 100%
rename from net/instaweb/rewriter/testdata/CuppaT.png
rename to test/net/instaweb/rewriter/testdata/CuppaT.png
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/ExplosiveEgress.png b/test/net/instaweb/rewriter/testdata/ExplosiveEgress.png
similarity index 100%
rename from net/instaweb/rewriter/testdata/ExplosiveEgress.png
rename to test/net/instaweb/rewriter/testdata/ExplosiveEgress.png
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/IronChef2.gif b/test/net/instaweb/rewriter/testdata/IronChef2.gif
similarity index 100%
rename from net/instaweb/rewriter/testdata/IronChef2.gif
rename to test/net/instaweb/rewriter/testdata/IronChef2.gif
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/Large.png b/test/net/instaweb/rewriter/testdata/Large.png
similarity index 100%
rename from net/instaweb/rewriter/testdata/Large.png
rename to test/net/instaweb/rewriter/testdata/Large.png
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/PageSpeedAnimationSmall.gif b/test/net/instaweb/rewriter/testdata/PageSpeedAnimationSmall.gif
similarity index 100%
rename from net/instaweb/rewriter/testdata/PageSpeedAnimationSmall.gif
rename to test/net/instaweb/rewriter/testdata/PageSpeedAnimationSmall.gif
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/Puzzle.jpg b/test/net/instaweb/rewriter/testdata/Puzzle.jpg
similarity index 100%
rename from net/instaweb/rewriter/testdata/Puzzle.jpg
rename to test/net/instaweb/rewriter/testdata/Puzzle.jpg
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/RedbrushAlpha-0.5.png b/test/net/instaweb/rewriter/testdata/RedbrushAlpha-0.5.png
similarity index 100%
rename from net/instaweb/rewriter/testdata/RedbrushAlpha-0.5.png
rename to test/net/instaweb/rewriter/testdata/RedbrushAlpha-0.5.png
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/ResolutionLimit.jpg b/test/net/instaweb/rewriter/testdata/ResolutionLimit.jpg
similarity index 100%
rename from net/instaweb/rewriter/testdata/ResolutionLimit.jpg
rename to test/net/instaweb/rewriter/testdata/ResolutionLimit.jpg
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/ResolutionLimit.png b/test/net/instaweb/rewriter/testdata/ResolutionLimit.png
similarity index 100%
rename from net/instaweb/rewriter/testdata/ResolutionLimit.png
rename to test/net/instaweb/rewriter/testdata/ResolutionLimit.png
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/Sample.jpg b/test/net/instaweb/rewriter/testdata/Sample.jpg
similarity index 100%
rename from net/instaweb/rewriter/testdata/Sample.jpg
rename to test/net/instaweb/rewriter/testdata/Sample.jpg
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/Sample_webp.webp b/test/net/instaweb/rewriter/testdata/Sample_webp.webp
similarity index 100%
rename from net/instaweb/rewriter/testdata/Sample_webp.webp
rename to test/net/instaweb/rewriter/testdata/Sample_webp.webp
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/Scenery.webp b/test/net/instaweb/rewriter/testdata/Scenery.webp
similarity index 100%
rename from net/instaweb/rewriter/testdata/Scenery.webp
rename to test/net/instaweb/rewriter/testdata/Scenery.webp
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/agencyrep_bbc_usa_homepage b/test/net/instaweb/rewriter/testdata/agencyrep_bbc_usa_homepage
similarity index 100%
rename from net/instaweb/rewriter/testdata/agencyrep_bbc_usa_homepage
rename to test/net/instaweb/rewriter/testdata/agencyrep_bbc_usa_homepage
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/another-blank.gif b/test/net/instaweb/rewriter/testdata/another-blank.gif
similarity index 100%
rename from net/instaweb/rewriter/testdata/another-blank.gif
rename to test/net/instaweb/rewriter/testdata/another-blank.gif
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/b2 b/test/net/instaweb/rewriter/testdata/b2
similarity index 100%
rename from net/instaweb/rewriter/testdata/b2
rename to test/net/instaweb/rewriter/testdata/b2
diff --git a/net/instaweb/rewriter/testdata/chromium-24.webp b/test/net/instaweb/rewriter/testdata/chromium-24.webp
similarity index 100%
rename from net/instaweb/rewriter/testdata/chromium-24.webp
rename to test/net/instaweb/rewriter/testdata/chromium-24.webp
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/combine0.css.gold b/test/net/instaweb/rewriter/testdata/combine0.css.gold
similarity index 100%
rename from net/instaweb/rewriter/testdata/combine0.css.gold
rename to test/net/instaweb/rewriter/testdata/combine0.css.gold
diff --git a/net/instaweb/rewriter/testdata/concat_css.html b/test/net/instaweb/rewriter/testdata/concat_css.html
similarity index 100%
rename from net/instaweb/rewriter/testdata/concat_css.html
rename to test/net/instaweb/rewriter/testdata/concat_css.html
diff --git a/net/instaweb/rewriter/testdata/concat_css.html.gold b/test/net/instaweb/rewriter/testdata/concat_css.html.gold
similarity index 100%
rename from net/instaweb/rewriter/testdata/concat_css.html.gold
rename to test/net/instaweb/rewriter/testdata/concat_css.html.gold
diff --git a/net/instaweb/rewriter/testdata/concat_css_missing_css.html b/test/net/instaweb/rewriter/testdata/concat_css_missing_css.html
similarity index 100%
rename from net/instaweb/rewriter/testdata/concat_css_missing_css.html
rename to test/net/instaweb/rewriter/testdata/concat_css_missing_css.html
diff --git a/net/instaweb/rewriter/testdata/extScript.gold.js.http b/test/net/instaweb/rewriter/testdata/extScript.gold.js.http
similarity index 100%
rename from net/instaweb/rewriter/testdata/extScript.gold.js.http
rename to test/net/instaweb/rewriter/testdata/extScript.gold.js.http
diff --git a/net/instaweb/rewriter/testdata/extScript.js b/test/net/instaweb/rewriter/testdata/extScript.js
similarity index 100%
rename from net/instaweb/rewriter/testdata/extScript.js
rename to test/net/instaweb/rewriter/testdata/extScript.js
diff --git a/net/instaweb/rewriter/testdata/extensionless_gif b/test/net/instaweb/rewriter/testdata/extensionless_gif
similarity index 100%
rename from net/instaweb/rewriter/testdata/extensionless_gif
rename to test/net/instaweb/rewriter/testdata/extensionless_gif
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/img_tag_identification.html b/test/net/instaweb/rewriter/testdata/img_tag_identification.html
similarity index 100%
rename from net/instaweb/rewriter/testdata/img_tag_identification.html
rename to test/net/instaweb/rewriter/testdata/img_tag_identification.html
diff --git a/net/instaweb/rewriter/testdata/img_tag_identification.html.gold b/test/net/instaweb/rewriter/testdata/img_tag_identification.html.gold
similarity index 100%
rename from net/instaweb/rewriter/testdata/img_tag_identification.html.gold
rename to test/net/instaweb/rewriter/testdata/img_tag_identification.html.gold
diff --git a/net/instaweb/rewriter/testdata/img_tag_identification.log.gold b/test/net/instaweb/rewriter/testdata/img_tag_identification.log.gold
similarity index 100%
rename from net/instaweb/rewriter/testdata/img_tag_identification.log.gold
rename to test/net/instaweb/rewriter/testdata/img_tag_identification.log.gold
diff --git a/net/instaweb/rewriter/testdata/javascript_test.gold.html b/test/net/instaweb/rewriter/testdata/javascript_test.gold.html
similarity index 100%
rename from net/instaweb/rewriter/testdata/javascript_test.gold.html
rename to test/net/instaweb/rewriter/testdata/javascript_test.gold.html
diff --git a/net/instaweb/rewriter/testdata/javascript_test.html b/test/net/instaweb/rewriter/testdata/javascript_test.html
similarity index 100%
rename from net/instaweb/rewriter/testdata/javascript_test.html
rename to test/net/instaweb/rewriter/testdata/javascript_test.html
diff --git a/net/instaweb/rewriter/testdata/javascript_test.log.gold b/test/net/instaweb/rewriter/testdata/javascript_test.log.gold
similarity index 100%
rename from net/instaweb/rewriter/testdata/javascript_test.log.gold
rename to test/net/instaweb/rewriter/testdata/javascript_test.log.gold
diff --git a/net/instaweb/rewriter/testdata/o.gif b/test/net/instaweb/rewriter/testdata/o.gif
similarity index 100%
rename from net/instaweb/rewriter/testdata/o.gif
rename to test/net/instaweb/rewriter/testdata/o.gif
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/p-ccrmZLtMqYB8w.gif b/test/net/instaweb/rewriter/testdata/p-ccrmZLtMqYB8w.gif
similarity index 100%
rename from net/instaweb/rewriter/testdata/p-ccrmZLtMqYB8w.gif
rename to test/net/instaweb/rewriter/testdata/p-ccrmZLtMqYB8w.gif
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/red_empty_screen.gif b/test/net/instaweb/rewriter/testdata/red_empty_screen.gif
similarity index 100%
rename from net/instaweb/rewriter/testdata/red_empty_screen.gif
rename to test/net/instaweb/rewriter/testdata/red_empty_screen.gif
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/small-data.png b/test/net/instaweb/rewriter/testdata/small-data.png
similarity index 100%
rename from net/instaweb/rewriter/testdata/small-data.png
rename to test/net/instaweb/rewriter/testdata/small-data.png
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/small_16x16.png b/test/net/instaweb/rewriter/testdata/small_16x16.png
similarity index 100%
rename from net/instaweb/rewriter/testdata/small_16x16.png
rename to test/net/instaweb/rewriter/testdata/small_16x16.png
Binary files differ
diff --git a/net/instaweb/rewriter/testdata/third_party.js b/test/net/instaweb/rewriter/testdata/third_party.js
similarity index 100%
rename from net/instaweb/rewriter/testdata/third_party.js
rename to test/net/instaweb/rewriter/testdata/third_party.js
diff --git a/net/instaweb/rewriter/testdata/transparent.gif b/test/net/instaweb/rewriter/testdata/transparent.gif
similarity index 100%
rename from net/instaweb/rewriter/testdata/transparent.gif
rename to test/net/instaweb/rewriter/testdata/transparent.gif
Binary files differ
diff --git a/net/instaweb/rewriter/two_level_cache_test.cc b/test/net/instaweb/rewriter/two_level_cache_test.cc
similarity index 98%
rename from net/instaweb/rewriter/two_level_cache_test.cc
rename to test/net/instaweb/rewriter/two_level_cache_test.cc
index e3122f8..935d217 100644
--- a/net/instaweb/rewriter/two_level_cache_test.cc
+++ b/test/net/instaweb/rewriter/two_level_cache_test.cc
@@ -24,15 +24,11 @@
#include "net/instaweb/http/public/counting_url_async_fetcher.h"
#include "net/instaweb/http/public/http_cache.h"
#include "net/instaweb/http/public/logging_proto_impl.h"
-#include "net/instaweb/http/public/mock_url_fetcher.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/rewriter/public/output_resource_kind.h"
-#include "net/instaweb/rewriter/public/rewrite_context_test_base.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/cache_interface.h"
#include "pagespeed/kernel/base/ref_counted_ptr.h"
@@ -42,6 +38,10 @@
#include "pagespeed/kernel/cache/lru_cache.h"
#include "pagespeed/kernel/cache/write_through_cache.h"
#include "pagespeed/opt/logging/log_record.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
+#include "test/net/instaweb/rewriter/rewrite_context_test_base.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/url_input_resource_test.cc b/test/net/instaweb/rewriter/url_input_resource_test.cc
similarity index 98%
rename from net/instaweb/rewriter/url_input_resource_test.cc
rename to test/net/instaweb/rewriter/url_input_resource_test.cc
index 0181dc9..2a09a65 100644
--- a/net/instaweb/rewriter/url_input_resource_test.cc
+++ b/test/net/instaweb/rewriter/url_input_resource_test.cc
@@ -19,13 +19,9 @@
#include "net/instaweb/rewriter/public/url_input_resource.h"
-#include "net/instaweb/http/public/mock_url_fetcher.h"
#include "net/instaweb/http/public/request_context.h"
-#include "net/instaweb/rewriter/public/mock_resource_callback.h"
#include "net/instaweb/rewriter/public/resource.h" // for Resource, etc
#include "net/instaweb/rewriter/public/rewrite_driver.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "pagespeed/kernel/base/basictypes.h" // for arraysize
#include "pagespeed/kernel/base/ref_counted_ptr.h"
#include "pagespeed/kernel/base/string.h" // for GoogleString
@@ -35,6 +31,10 @@
#include "pagespeed/kernel/http/http_names.h"
#include "pagespeed/kernel/http/request_headers.h"
#include "pagespeed/kernel/http/response_headers.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
+#include "test/net/instaweb/rewriter/mock_resource_callback.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
diff --git a/net/instaweb/rewriter/url_left_trim_filter_test.cc b/test/net/instaweb/rewriter/url_left_trim_filter_test.cc
similarity index 99%
rename from net/instaweb/rewriter/url_left_trim_filter_test.cc
rename to test/net/instaweb/rewriter/url_left_trim_filter_test.cc
index 39e33f3..a0858a8 100644
--- a/net/instaweb/rewriter/url_left_trim_filter_test.cc
+++ b/test/net/instaweb/rewriter/url_left_trim_filter_test.cc
@@ -23,11 +23,11 @@
#include "base/logging.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/http/google_url.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/net/instaweb/rewriter/url_namer_test.cc b/test/net/instaweb/rewriter/url_namer_test.cc
similarity index 97%
rename from net/instaweb/rewriter/url_namer_test.cc
rename to test/net/instaweb/rewriter/url_namer_test.cc
index a5f2b2d..f559419 100644
--- a/net/instaweb/rewriter/url_namer_test.cc
+++ b/test/net/instaweb/rewriter/url_namer_test.cc
@@ -24,11 +24,11 @@
#include "net/instaweb/rewriter/public/domain_lawyer.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/http/google_url.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
diff --git a/net/instaweb/rewriter/url_partnership_test.cc b/test/net/instaweb/rewriter/url_partnership_test.cc
similarity index 99%
rename from net/instaweb/rewriter/url_partnership_test.cc
rename to test/net/instaweb/rewriter/url_partnership_test.cc
index e727299..edc9947 100644
--- a/net/instaweb/rewriter/url_partnership_test.cc
+++ b/test/net/instaweb/rewriter/url_partnership_test.cc
@@ -23,12 +23,12 @@
#include "net/instaweb/rewriter/public/domain_lawyer.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "pagespeed/kernel/base/google_message_handler.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/http/google_url.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace {
diff --git a/net/instaweb/rewriter/webp_optimizer_test.cc b/test/net/instaweb/rewriter/webp_optimizer_test.cc
similarity index 94%
rename from net/instaweb/rewriter/webp_optimizer_test.cc
rename to test/net/instaweb/rewriter/webp_optimizer_test.cc
index 1bd3025..7743c91 100644
--- a/net/instaweb/rewriter/webp_optimizer_test.cc
+++ b/test/net/instaweb/rewriter/webp_optimizer_test.cc
@@ -24,8 +24,8 @@
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h" // for StrCat
-#include "pagespeed/kernel/image/test_utils.h"
#include "test/pagespeed/kernel/base/gtest.h"
+#include "test/pagespeed/kernel/image/test_utils.h"
#ifdef USE_SYSTEM_LIBWEBP
#include "webp/decode.h"
@@ -38,7 +38,7 @@
using pagespeed::image_compression::ReadFile;
-const char kTestData[] = "/net/instaweb/rewriter/testdata/";
+const char kTestData[] = "/test/net/instaweb/rewriter/testdata/";
const char kTransparentWebP[] = "chromium-24.webp";
TEST(WebpOptimizerTest, ReduceWebpImageQualityPreservesAlpha) {
diff --git a/test/net/instaweb/spriter/BUILD b/test/net/instaweb/spriter/BUILD
new file mode 100644
index 0000000..51ce5d6
--- /dev/null
+++ b/test/net/instaweb/spriter/BUILD
@@ -0,0 +1,20 @@
+load(
+ "//bazel:pagespeed_test.bzl",
+ "pagespeed_cc_test",
+ "pagespeed_cc_test_library",
+)
+
+licenses(["notice"]) # Apache 2
+
+pagespeed_cc_test_library(
+ name = "test_base",
+ srcs = ["mock_image_library_interface.h"],
+ deps = ["//net/instaweb/spriter"],
+)
+
+pagespeed_cc_test(
+ name = "spriter",
+ srcs = glob(["*_test.cc"]),
+ data = ["//test/net/instaweb/rewriter:testdata"],
+ deps = ["//test/net/instaweb/spriter:test_base"],
+)
diff --git a/net/instaweb/spriter/image_spriter_test.cc b/test/net/instaweb/spriter/image_spriter_test.cc
similarity index 98%
rename from net/instaweb/spriter/image_spriter_test.cc
rename to test/net/instaweb/spriter/image_spriter_test.cc
index 3178ad6..69330d2 100644
--- a/net/instaweb/spriter/image_spriter_test.cc
+++ b/test/net/instaweb/spriter/image_spriter_test.cc
@@ -20,9 +20,9 @@
#include "net/instaweb/spriter/public/image_spriter.h"
#include "net/instaweb/spriter/image_library_interface.h"
-#include "net/instaweb/spriter/mock_image_library_interface.h"
#include "net/instaweb/spriter/public/image_spriter.pb.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
+#include "test/net/instaweb/spriter/mock_image_library_interface.h"
#include "test/pagespeed/kernel/base/gmock.h"
#include "test/pagespeed/kernel/base/gtest.h"
diff --git a/net/instaweb/spriter/libpng_image_library_test.cc b/test/net/instaweb/spriter/libpng_image_library_test.cc
similarity index 97%
rename from net/instaweb/spriter/libpng_image_library_test.cc
rename to test/net/instaweb/spriter/libpng_image_library_test.cc
index 67c57a2..46ef4a3 100644
--- a/net/instaweb/spriter/libpng_image_library_test.cc
+++ b/test/net/instaweb/spriter/libpng_image_library_test.cc
@@ -27,7 +27,7 @@
namespace {
-const char kTestData[] = "/net/instaweb/rewriter/testdata/";
+const char kTestData[] = "/test/net/instaweb/rewriter/testdata/";
const char kCuppa[] = "Cuppa.png";
const char kBikeCrash[] = "BikeCrashIcn.png";
diff --git a/net/instaweb/spriter/mock_image_library_interface.h b/test/net/instaweb/spriter/mock_image_library_interface.h
similarity index 100%
rename from net/instaweb/spriter/mock_image_library_interface.h
rename to test/net/instaweb/spriter/mock_image_library_interface.h
diff --git a/test/pagespeed/apache/BUILD b/test/pagespeed/apache/BUILD
new file mode 100644
index 0000000..22824cc
--- /dev/null
+++ b/test/pagespeed/apache/BUILD
@@ -0,0 +1,60 @@
+load(
+ "//bazel:pagespeed_test.bzl",
+ "pagespeed_cc_test",
+ "pagespeed_cc_test_library",
+)
+
+licenses(["notice"]) # Apache 2
+
+pagespeed_cc_test_library(
+ name = "test_base",
+ srcs = ["mock_apache.cc"],
+ hdrs = ["mock_apache.h"],
+ copts = [
+ "-I/usr/include/apache2/",
+ "-Iexternal/aprutil/include/",
+ "-Iexternal/aprutil/include/arch/unix/",
+ "-Iexternal/aprutil/",
+ "-Ithird_party/aprutil/gen/arch/linux/x64/include/",
+ "-Ithird_party/apr/gen/arch/linux/x64/include/",
+ "-Iexternal/apr/include/",
+ "-Iexternal/apr/include/arch/unix/",
+ "-Iexternal/apr/",
+ "-Iexternal/serf/include/",
+ "-Iexternal/serf/",
+ ],
+ deps = [
+ "//pagespeed/apache",
+ "//test/net/instaweb/rewriter:test_base",
+ "//test/pagespeed/kernel/base:kernel_test_util",
+ "//test/pagespeed/kernel/util:util_test_base",
+ ],
+)
+
+pagespeed_cc_test(
+ name = "apache",
+ srcs = [
+ "apache_config_test.cc",
+ "apache_fetch_test.cc",
+ "apache_writer_test.cc",
+ "header_util_test.cc",
+ "simple_buffered_apache_fetch_test.cc",
+ ],
+ copts = [
+ "-I/usr/include/apache2/",
+ "-Iexternal/aprutil/include/",
+ "-Iexternal/aprutil/include/arch/unix/",
+ "-Iexternal/aprutil/",
+ "-Ithird_party/aprutil/gen/arch/linux/x64/include/",
+ "-Ithird_party/apr/gen/arch/linux/x64/include/",
+ "-Iexternal/apr/include/",
+ "-Iexternal/apr/include/arch/unix/",
+ "-Iexternal/apr/",
+ "-Iexternal/serf/include/",
+ "-Iexternal/serf/",
+ ],
+ data = ["//test/net/instaweb/rewriter:testdata"],
+ deps = [
+ "//test/pagespeed/apache:test_base",
+ ],
+)
diff --git a/pagespeed/apache/apache_config_test.cc b/test/pagespeed/apache/apache_config_test.cc
similarity index 96%
rename from pagespeed/apache/apache_config_test.cc
rename to test/pagespeed/apache/apache_config_test.cc
index 1729d80..46cbbdf 100644
--- a/pagespeed/apache/apache_config_test.cc
+++ b/test/pagespeed/apache/apache_config_test.cc
@@ -19,7 +19,7 @@
#include "pagespeed/apache/apache_config.h"
-#include "net/instaweb/rewriter/public/rewrite_options_test_base.h"
+#include "test/net/instaweb/rewriter/rewrite_options_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/null_thread_system.h"
diff --git a/pagespeed/apache/apache_fetch_test.cc b/test/pagespeed/apache/apache_fetch_test.cc
similarity index 99%
rename from pagespeed/apache/apache_fetch_test.cc
rename to test/pagespeed/apache/apache_fetch_test.cc
index 8181f84..eb7d212 100644
--- a/pagespeed/apache/apache_fetch_test.cc
+++ b/test/pagespeed/apache/apache_fetch_test.cc
@@ -22,11 +22,9 @@
#include <memory>
#include "net/instaweb/http/public/http_cache.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/apache/apache_httpd_includes.h"
#include "pagespeed/apache/header_util.h"
-#include "pagespeed/apache/mock_apache.h"
#include "pagespeed/kernel/base/function.h"
#include "pagespeed/kernel/base/timer.h"
#include "pagespeed/kernel/cache/delay_cache.h"
@@ -35,6 +33,8 @@
#include "pagespeed/kernel/http/http_names.h"
#include "pagespeed/kernel/http/request_headers.h"
#include "pagespeed/kernel/http/response_headers.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/pagespeed/apache/mock_apache.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
diff --git a/pagespeed/apache/apache_writer_test.cc b/test/pagespeed/apache/apache_writer_test.cc
similarity index 98%
rename from pagespeed/apache/apache_writer_test.cc
rename to test/pagespeed/apache/apache_writer_test.cc
index 7734a4c..d2b6c80 100644
--- a/pagespeed/apache/apache_writer_test.cc
+++ b/test/pagespeed/apache/apache_writer_test.cc
@@ -23,11 +23,11 @@
#include "pagespeed/apache/apache_httpd_includes.h"
#include "pagespeed/apache/header_util.h"
-#include "pagespeed/apache/mock_apache.h"
#include "pagespeed/kernel/base/null_message_handler.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/http/response_headers.h"
+#include "test/pagespeed/apache/mock_apache.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/null_thread_system.h"
diff --git a/pagespeed/apache/header_util_test.cc b/test/pagespeed/apache/header_util_test.cc
similarity index 98%
rename from pagespeed/apache/header_util_test.cc
rename to test/pagespeed/apache/header_util_test.cc
index acbc543..0c8d6be 100644
--- a/pagespeed/apache/header_util_test.cc
+++ b/test/pagespeed/apache/header_util_test.cc
@@ -20,10 +20,10 @@
#include "pagespeed/apache/header_util.h"
#include "http_request.h" // NOLINT
-#include "pagespeed/apache/mock_apache.h"
#include "pagespeed/kernel/base/callback.h"
#include "pagespeed/kernel/http/http_names.h"
#include "pagespeed/kernel/http/request_headers.h"
+#include "test/pagespeed/apache/mock_apache.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/pagespeed/apache/mock_apache.cc b/test/pagespeed/apache/mock_apache.cc
similarity index 98%
rename from pagespeed/apache/mock_apache.cc
rename to test/pagespeed/apache/mock_apache.cc
index 4b96c65..4512bce 100644
--- a/pagespeed/apache/mock_apache.cc
+++ b/test/pagespeed/apache/mock_apache.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "pagespeed/apache/mock_apache.h"
+#include "test/pagespeed/apache/mock_apache.h"
#include <cstdlib>
#include <vector>
diff --git a/pagespeed/apache/mock_apache.h b/test/pagespeed/apache/mock_apache.h
similarity index 100%
rename from pagespeed/apache/mock_apache.h
rename to test/pagespeed/apache/mock_apache.h
diff --git a/pagespeed/apache/simple_buffered_apache_fetch_test.cc b/test/pagespeed/apache/simple_buffered_apache_fetch_test.cc
similarity index 98%
rename from pagespeed/apache/simple_buffered_apache_fetch_test.cc
rename to test/pagespeed/apache/simple_buffered_apache_fetch_test.cc
index 4824922..2f4fe19 100644
--- a/pagespeed/apache/simple_buffered_apache_fetch_test.cc
+++ b/test/pagespeed/apache/simple_buffered_apache_fetch_test.cc
@@ -25,11 +25,9 @@
#include "net/instaweb/http/public/http_cache.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/apache/apache_httpd_includes.h"
#include "pagespeed/apache/header_util.h"
-#include "pagespeed/apache/mock_apache.h"
#include "pagespeed/kernel/base/thread.h"
#include "pagespeed/kernel/cache/delay_cache.h"
#include "pagespeed/kernel/http/content_type.h"
@@ -37,6 +35,8 @@
#include "pagespeed/kernel/http/http_names.h"
#include "pagespeed/kernel/http/request_headers.h"
#include "pagespeed/kernel/http/response_headers.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/pagespeed/apache/mock_apache.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
diff --git a/test/pagespeed/automatic/BUILD b/test/pagespeed/automatic/BUILD
new file mode 100644
index 0000000..5704214
--- /dev/null
+++ b/test/pagespeed/automatic/BUILD
@@ -0,0 +1,28 @@
+load(
+ "//bazel:pagespeed_test.bzl",
+ "pagespeed_cc_test",
+ "pagespeed_cc_test_library",
+)
+
+licenses(["notice"]) # Apache 2
+
+pagespeed_cc_test_library(
+ name = "test_base",
+ srcs = ["proxy_interface_test_base.cc"],
+ hdrs = ["proxy_interface_test_base.h"],
+ deps = [
+ "//pagespeed/automatic",
+ "//test/net/instaweb/rewriter:test_base",
+ "//test/pagespeed/kernel/base:kernel_test_util",
+ "//test/pagespeed/kernel/util:util_test_base",
+ ],
+)
+
+pagespeed_cc_test(
+ name = "automatic",
+ srcs = glob(["*_test.cc"]),
+ data = ["//test/net/instaweb/rewriter:testdata"],
+ deps = [
+ "//test/pagespeed/automatic:test_base",
+ ],
+)
diff --git a/pagespeed/automatic/html_detector_test.cc b/test/pagespeed/automatic/html_detector_test.cc
similarity index 100%
rename from pagespeed/automatic/html_detector_test.cc
rename to test/pagespeed/automatic/html_detector_test.cc
diff --git a/pagespeed/automatic/proxy_fetch_test.cc b/test/pagespeed/automatic/proxy_fetch_test.cc
similarity index 99%
rename from pagespeed/automatic/proxy_fetch_test.cc
rename to test/pagespeed/automatic/proxy_fetch_test.cc
index cf10389..4117817 100644
--- a/pagespeed/automatic/proxy_fetch_test.cc
+++ b/test/pagespeed/automatic/proxy_fetch_test.cc
@@ -25,11 +25,9 @@
#include "base/logging.h"
#include "net/instaweb/http/public/logging_proto_impl.h"
-#include "net/instaweb/http/public/mock_callback.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/kernel/base/abstract_mutex.h"
#include "pagespeed/kernel/base/function.h"
@@ -43,6 +41,8 @@
#include "pagespeed/kernel/thread/thread_synchronizer.h"
#include "pagespeed/kernel/util/platform.h"
#include "pagespeed/opt/logging/log_record.h"
+#include "test/net/instaweb/http/mock_callback.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/html/html_parse_test_base.h"
#include "test/pagespeed/kernel/thread/mock_scheduler.h"
diff --git a/pagespeed/automatic/proxy_interface_test.cc b/test/pagespeed/automatic/proxy_interface_test.cc
similarity index 99%
rename from pagespeed/automatic/proxy_interface_test.cc
rename to test/pagespeed/automatic/proxy_interface_test.cc
index 2281560..aedfef9 100644
--- a/pagespeed/automatic/proxy_interface_test.cc
+++ b/test/pagespeed/automatic/proxy_interface_test.cc
@@ -26,24 +26,17 @@
#include "net/instaweb/http/public/async_fetch.h"
#include "net/instaweb/http/public/http_cache.h"
#include "net/instaweb/http/public/logging_proto_impl.h"
-#include "net/instaweb/http/public/mock_callback.h"
-#include "net/instaweb/http/public/mock_url_fetcher.h"
-#include "net/instaweb/http/public/reflecting_test_fetcher.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/http/public/request_timing_info.h"
#include "net/instaweb/rewriter/public/domain_lawyer.h"
#include "net/instaweb/rewriter/public/experiment_util.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/util/public/fallback_property_page.h"
#include "net/instaweb/util/public/mock_property_page.h"
#include "net/instaweb/util/public/property_cache.h"
-//#include "strings/stringpiece_utils.h"
#include "pagespeed/automatic/proxy_fetch.h"
-#include "pagespeed/automatic/proxy_interface_test_base.h"
#include "pagespeed/kernel/base/abstract_mutex.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/function.h"
@@ -69,6 +62,12 @@
#include "pagespeed/kernel/http/user_agent_matcher.h"
#include "pagespeed/kernel/thread/queued_worker_pool.h"
#include "pagespeed/kernel/thread/thread_synchronizer.h"
+#include "test/net/instaweb/http/mock_callback.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
+#include "test/net/instaweb/http/reflecting_test_fetcher.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
+#include "test/pagespeed/automatic/proxy_interface_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
diff --git a/pagespeed/automatic/proxy_interface_test_base.cc b/test/pagespeed/automatic/proxy_interface_test_base.cc
similarity index 97%
rename from pagespeed/automatic/proxy_interface_test_base.cc
rename to test/pagespeed/automatic/proxy_interface_test_base.cc
index 459927f..4784d10 100644
--- a/pagespeed/automatic/proxy_interface_test_base.cc
+++ b/test/pagespeed/automatic/proxy_interface_test_base.cc
@@ -17,20 +17,15 @@
* under the License.
*/
-#include "pagespeed/automatic/proxy_interface_test_base.h"
+#include "test/pagespeed/automatic/proxy_interface_test_base.h"
#include <cstddef>
#include <memory>
#include "base/logging.h"
#include "net/instaweb/http/public/async_fetch.h"
-#include "net/instaweb/http/public/mock_callback.h"
-#include "net/instaweb/http/public/mock_url_fetcher.h"
-#include "net/instaweb/rewriter/public/mock_critical_images_finder.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/util/public/cache_property_store.h"
#include "pagespeed/automatic/proxy_fetch.h"
#include "pagespeed/automatic/proxy_interface.h"
@@ -50,6 +45,11 @@
#include "pagespeed/kernel/thread/queued_worker_pool.h"
#include "pagespeed/kernel/thread/thread_synchronizer.h"
#include "pagespeed/opt/logging/request_timing_info.h"
+#include "test/net/instaweb/http/mock_callback.h"
+#include "test/net/instaweb/http/mock_url_fetcher.h"
+#include "test/net/instaweb/rewriter/mock_critical_images_finder.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/thread/mock_scheduler.h"
diff --git a/pagespeed/automatic/proxy_interface_test_base.h b/test/pagespeed/automatic/proxy_interface_test_base.h
similarity index 98%
rename from pagespeed/automatic/proxy_interface_test_base.h
rename to test/pagespeed/automatic/proxy_interface_test_base.h
index 9f864ef..871b575 100644
--- a/pagespeed/automatic/proxy_interface_test_base.h
+++ b/test/pagespeed/automatic/proxy_interface_test_base.h
@@ -24,8 +24,6 @@
#include "net/instaweb/http/public/url_async_fetcher.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/rewriter/public/url_namer.h"
#include "pagespeed/automatic/proxy_interface.h"
#include "pagespeed/kernel/base/basictypes.h"
@@ -41,6 +39,8 @@
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/opt/http/property_cache.h"
#include "pagespeed/opt/http/request_context.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/thread/worker_test_base.h"
namespace net_instaweb {
diff --git a/test/pagespeed/controller/BUILD b/test/pagespeed/controller/BUILD
new file mode 100644
index 0000000..fa1d429
--- /dev/null
+++ b/test/pagespeed/controller/BUILD
@@ -0,0 +1,76 @@
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_cc//cc:defs.bzl", "cc_proto_library")
+load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
+load(
+ "//bazel:pagespeed_test.bzl",
+ "pagespeed_cc_test",
+ "pagespeed_cc_test_library",
+)
+
+licenses(["notice"]) # Apache 2
+
+
+pagespeed_cc_test_library(
+ name = "controller_test_base",
+ srcs = [
+ "grpc_server_test.cc",
+ ],
+ hdrs = [
+ "controller_grpc_mocks.h",
+ "grpc_server_test.h",
+ ],
+ deps = [
+ "//pagespeed/controller",
+ "//test/pagespeed/kernel/thread:thread_test_base",
+ "//pagespeed/kernel/util",
+ ],
+)
+
+proto_library(
+ name = "grpc_test_proto",
+ srcs = ["grpc_test.proto"],
+)
+
+cc_proto_library(
+ name = "grpc_test_proto_cc",
+ deps = [":grpc_test_proto"],
+)
+
+cc_grpc_library(
+ name = "grpc_test_proto_grpc",
+ srcs = [
+ ":grpc_test_proto",
+ ],
+ grpc_only = True,
+ proto_only = False,
+ use_external = False,
+ visibility = ["//visibility:public"],
+ well_known_protos = True,
+ deps = [
+ ":grpc_test_proto_cc",
+ ],
+)
+
+pagespeed_cc_test(
+ name = "controller_test",
+ srcs = [
+ "central_controller_callback_test.cc",
+ "context_registry_test.cc",
+ "expensive_operation_rpc_context_test.cc",
+ "expensive_operation_rpc_handler_test.cc",
+ "named_lock_schedule_rewrite_controller_test.cc",
+ "popularity_contest_schedule_rewrite_controller_test.cc",
+ "priority_queue_test.cc",
+ "queued_expensive_operation_controller_test.cc",
+ "rpc_handler_test.cc",
+ "schedule_rewrite_rpc_context_test.cc",
+ "schedule_rewrite_rpc_handler_test.cc",
+ "work_bound_expensive_operation_controller_test.cc",
+ ],
+ shard_count = 1,
+ deps = [
+ ":controller_test_base",
+ ":grpc_test_proto_grpc",
+ "//pagespeed/kernel/base:pagespeed_base",
+ ],
+)
diff --git a/pagespeed/controller/central_controller_callback_test.cc b/test/pagespeed/controller/central_controller_callback_test.cc
similarity index 100%
rename from pagespeed/controller/central_controller_callback_test.cc
rename to test/pagespeed/controller/central_controller_callback_test.cc
diff --git a/pagespeed/controller/context_registry_test.cc b/test/pagespeed/controller/context_registry_test.cc
similarity index 100%
rename from pagespeed/controller/context_registry_test.cc
rename to test/pagespeed/controller/context_registry_test.cc
diff --git a/pagespeed/controller/controller_grpc_mocks.h b/test/pagespeed/controller/controller_grpc_mocks.h
similarity index 100%
rename from pagespeed/controller/controller_grpc_mocks.h
rename to test/pagespeed/controller/controller_grpc_mocks.h
diff --git a/pagespeed/controller/expensive_operation_rpc_context_test.cc b/test/pagespeed/controller/expensive_operation_rpc_context_test.cc
similarity index 99%
rename from pagespeed/controller/expensive_operation_rpc_context_test.cc
rename to test/pagespeed/controller/expensive_operation_rpc_context_test.cc
index ae92629..a59cf14 100644
--- a/pagespeed/controller/expensive_operation_rpc_context_test.cc
+++ b/test/pagespeed/controller/expensive_operation_rpc_context_test.cc
@@ -23,7 +23,6 @@
#include "base/logging.h"
#include "pagespeed/controller/controller.pb.h"
-#include "pagespeed/controller/controller_grpc_mocks.h"
#include "pagespeed/kernel/base/function.h"
#include "pagespeed/kernel/base/proto_matcher.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
@@ -33,6 +32,7 @@
#include "pagespeed/kernel/thread/sequence.h"
#include "pagespeed/kernel/util/grpc.h"
#include "pagespeed/kernel/util/platform.h"
+#include "test/pagespeed/controller/controller_grpc_mocks.h"
#include "test/pagespeed/kernel/base/gmock.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/message_handler_test_base.h"
diff --git a/pagespeed/controller/expensive_operation_rpc_handler_test.cc b/test/pagespeed/controller/expensive_operation_rpc_handler_test.cc
similarity index 99%
rename from pagespeed/controller/expensive_operation_rpc_handler_test.cc
rename to test/pagespeed/controller/expensive_operation_rpc_handler_test.cc
index c9d42df..78c6d3f 100644
--- a/pagespeed/controller/expensive_operation_rpc_handler_test.cc
+++ b/test/pagespeed/controller/expensive_operation_rpc_handler_test.cc
@@ -23,10 +23,10 @@
#include "pagespeed/controller/controller.grpc.pb.h"
#include "pagespeed/controller/controller.pb.h"
-#include "pagespeed/controller/grpc_server_test.h"
#include "pagespeed/kernel/base/function.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/util/grpc.h"
+#include "test/pagespeed/controller/grpc_server_test.h"
#include "test/pagespeed/kernel/base/gmock.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/thread/worker_test_base.h"
diff --git a/pagespeed/controller/grpc_server_test.cc b/test/pagespeed/controller/grpc_server_test.cc
similarity index 98%
rename from pagespeed/controller/grpc_server_test.cc
rename to test/pagespeed/controller/grpc_server_test.cc
index 77ce7c8..314c8f6 100644
--- a/pagespeed/controller/grpc_server_test.cc
+++ b/test/pagespeed/controller/grpc_server_test.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "pagespeed/controller/grpc_server_test.h"
+#include "test/pagespeed/controller/grpc_server_test.h"
#include <grpc++/alarm.h>
#include <sys/stat.h>
diff --git a/pagespeed/controller/grpc_server_test.h b/test/pagespeed/controller/grpc_server_test.h
similarity index 100%
rename from pagespeed/controller/grpc_server_test.h
rename to test/pagespeed/controller/grpc_server_test.h
diff --git a/pagespeed/controller/grpc_test.proto b/test/pagespeed/controller/grpc_test.proto
similarity index 100%
rename from pagespeed/controller/grpc_test.proto
rename to test/pagespeed/controller/grpc_test.proto
diff --git a/pagespeed/controller/named_lock_schedule_rewrite_controller_test.cc b/test/pagespeed/controller/named_lock_schedule_rewrite_controller_test.cc
similarity index 100%
rename from pagespeed/controller/named_lock_schedule_rewrite_controller_test.cc
rename to test/pagespeed/controller/named_lock_schedule_rewrite_controller_test.cc
diff --git a/pagespeed/controller/popularity_contest_schedule_rewrite_controller_test.cc b/test/pagespeed/controller/popularity_contest_schedule_rewrite_controller_test.cc
similarity index 100%
rename from pagespeed/controller/popularity_contest_schedule_rewrite_controller_test.cc
rename to test/pagespeed/controller/popularity_contest_schedule_rewrite_controller_test.cc
diff --git a/pagespeed/controller/priority_queue_test.cc b/test/pagespeed/controller/priority_queue_test.cc
similarity index 100%
rename from pagespeed/controller/priority_queue_test.cc
rename to test/pagespeed/controller/priority_queue_test.cc
diff --git a/pagespeed/controller/queued_expensive_operation_controller_test.cc b/test/pagespeed/controller/queued_expensive_operation_controller_test.cc
similarity index 100%
rename from pagespeed/controller/queued_expensive_operation_controller_test.cc
rename to test/pagespeed/controller/queued_expensive_operation_controller_test.cc
diff --git a/pagespeed/controller/rpc_handler_test.cc b/test/pagespeed/controller/rpc_handler_test.cc
similarity index 98%
rename from pagespeed/controller/rpc_handler_test.cc
rename to test/pagespeed/controller/rpc_handler_test.cc
index 58a380f..054270c 100644
--- a/pagespeed/controller/rpc_handler_test.cc
+++ b/test/pagespeed/controller/rpc_handler_test.cc
@@ -19,9 +19,9 @@
#include <memory>
-#include "pagespeed/controller/grpc_server_test.h"
-#include "pagespeed/controller/grpc_test.grpc.pb.h"
-#include "pagespeed/controller/grpc_test.pb.h"
+#include "test/pagespeed/controller/grpc_server_test.h"
+#include "test/pagespeed/controller/grpc_test.grpc.pb.h"
+#include "test/pagespeed/controller/grpc_test.pb.h"
// clang-format off
#include "pagespeed/controller/rpc_handler.h"
// clang-format on
diff --git a/pagespeed/controller/schedule_rewrite_rpc_context_test.cc b/test/pagespeed/controller/schedule_rewrite_rpc_context_test.cc
similarity index 99%
rename from pagespeed/controller/schedule_rewrite_rpc_context_test.cc
rename to test/pagespeed/controller/schedule_rewrite_rpc_context_test.cc
index ae2282f..92eb31f 100644
--- a/pagespeed/controller/schedule_rewrite_rpc_context_test.cc
+++ b/test/pagespeed/controller/schedule_rewrite_rpc_context_test.cc
@@ -23,7 +23,6 @@
#include "base/logging.h"
#include "pagespeed/controller/controller.pb.h"
-#include "pagespeed/controller/controller_grpc_mocks.h"
#include "pagespeed/kernel/base/function.h"
#include "pagespeed/kernel/base/proto_matcher.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
@@ -33,6 +32,7 @@
#include "pagespeed/kernel/thread/sequence.h"
#include "pagespeed/kernel/util/grpc.h"
#include "pagespeed/kernel/util/platform.h"
+#include "test/pagespeed/controller/controller_grpc_mocks.h"
#include "test/pagespeed/kernel/base/gmock.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/message_handler_test_base.h"
diff --git a/pagespeed/controller/schedule_rewrite_rpc_handler_test.cc b/test/pagespeed/controller/schedule_rewrite_rpc_handler_test.cc
similarity index 99%
rename from pagespeed/controller/schedule_rewrite_rpc_handler_test.cc
rename to test/pagespeed/controller/schedule_rewrite_rpc_handler_test.cc
index 4323e08..524e5cd 100644
--- a/pagespeed/controller/schedule_rewrite_rpc_handler_test.cc
+++ b/test/pagespeed/controller/schedule_rewrite_rpc_handler_test.cc
@@ -23,10 +23,10 @@
#include "pagespeed/controller/controller.grpc.pb.h"
#include "pagespeed/controller/controller.pb.h"
-#include "pagespeed/controller/grpc_server_test.h"
#include "pagespeed/kernel/base/function.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/util/grpc.h"
+#include "test/pagespeed/controller/grpc_server_test.h"
#include "test/pagespeed/kernel/base/gmock.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/thread/worker_test_base.h"
diff --git a/pagespeed/controller/work_bound_expensive_operation_controller_test.cc b/test/pagespeed/controller/work_bound_expensive_operation_controller_test.cc
similarity index 100%
rename from pagespeed/controller/work_bound_expensive_operation_controller_test.cc
rename to test/pagespeed/controller/work_bound_expensive_operation_controller_test.cc
diff --git a/test/pagespeed/kernel/base/BUILD b/test/pagespeed/kernel/base/BUILD
index b6c2194..72dca53 100644
--- a/test/pagespeed/kernel/base/BUILD
+++ b/test/pagespeed/kernel/base/BUILD
@@ -69,6 +69,6 @@
shard_count = 1,
deps = [
":kernel_test_util",
- "//pagespeed/kernel/sharedmem:shared_mem",
+ "//pagespeed/kernel/sharedmem",
],
)
diff --git a/test/pagespeed/kernel/http/BUILD b/test/pagespeed/kernel/http/BUILD
new file mode 100644
index 0000000..1aca109
--- /dev/null
+++ b/test/pagespeed/kernel/http/BUILD
@@ -0,0 +1,30 @@
+load(
+ "//bazel:pagespeed_test.bzl",
+ "pagespeed_cc_test",
+ "pagespeed_cc_test_library",
+)
+
+licenses(["notice"]) # Apache 2
+
+pagespeed_cc_test_library(
+ name = "http_test_base",
+ srcs = [
+ "user_agent_matcher_test_base.cc",
+ ],
+ hdrs = [
+ "user_agent_matcher_test_base.h",
+ ],
+ deps = [
+ "//pagespeed/kernel/http",
+ "//test/pagespeed/kernel/base:kernel_test_util",
+ "//test/pagespeed/kernel/util:util_test_base",
+ ],
+)
+
+pagespeed_cc_test(
+ name = "http",
+ srcs = glob(["*_test.cc"]),
+ deps = [
+ "//test/pagespeed/kernel/http:http_test_base",
+ ],
+)
diff --git a/pagespeed/kernel/http/bot_checker_test.cc b/test/pagespeed/kernel/http/bot_checker_test.cc
similarity index 100%
rename from pagespeed/kernel/http/bot_checker_test.cc
rename to test/pagespeed/kernel/http/bot_checker_test.cc
diff --git a/pagespeed/kernel/http/caching_headers_test.cc b/test/pagespeed/kernel/http/caching_headers_test.cc
similarity index 100%
rename from pagespeed/kernel/http/caching_headers_test.cc
rename to test/pagespeed/kernel/http/caching_headers_test.cc
diff --git a/pagespeed/kernel/http/content_type_test.cc b/test/pagespeed/kernel/http/content_type_test.cc
similarity index 100%
rename from pagespeed/kernel/http/content_type_test.cc
rename to test/pagespeed/kernel/http/content_type_test.cc
diff --git a/pagespeed/kernel/http/data_url_test.cc b/test/pagespeed/kernel/http/data_url_test.cc
similarity index 100%
rename from pagespeed/kernel/http/data_url_test.cc
rename to test/pagespeed/kernel/http/data_url_test.cc
diff --git a/pagespeed/kernel/http/domain_registry_test.cc b/test/pagespeed/kernel/http/domain_registry_test.cc
similarity index 100%
rename from pagespeed/kernel/http/domain_registry_test.cc
rename to test/pagespeed/kernel/http/domain_registry_test.cc
diff --git a/pagespeed/kernel/http/google_url_test.cc b/test/pagespeed/kernel/http/google_url_test.cc
similarity index 100%
rename from pagespeed/kernel/http/google_url_test.cc
rename to test/pagespeed/kernel/http/google_url_test.cc
diff --git a/pagespeed/kernel/http/query_params_test.cc b/test/pagespeed/kernel/http/query_params_test.cc
similarity index 100%
rename from pagespeed/kernel/http/query_params_test.cc
rename to test/pagespeed/kernel/http/query_params_test.cc
diff --git a/pagespeed/kernel/http/request_headers_test.cc b/test/pagespeed/kernel/http/request_headers_test.cc
similarity index 100%
rename from pagespeed/kernel/http/request_headers_test.cc
rename to test/pagespeed/kernel/http/request_headers_test.cc
diff --git a/pagespeed/kernel/http/response_headers_test.cc b/test/pagespeed/kernel/http/response_headers_test.cc
similarity index 100%
rename from pagespeed/kernel/http/response_headers_test.cc
rename to test/pagespeed/kernel/http/response_headers_test.cc
diff --git a/pagespeed/kernel/http/semantic_type_test.cc b/test/pagespeed/kernel/http/semantic_type_test.cc
similarity index 100%
rename from pagespeed/kernel/http/semantic_type_test.cc
rename to test/pagespeed/kernel/http/semantic_type_test.cc
diff --git a/pagespeed/kernel/http/user_agent_matcher_test.cc b/test/pagespeed/kernel/http/user_agent_matcher_test.cc
similarity index 99%
rename from pagespeed/kernel/http/user_agent_matcher_test.cc
rename to test/pagespeed/kernel/http/user_agent_matcher_test.cc
index ff3c3f7..958fbac 100644
--- a/pagespeed/kernel/http/user_agent_matcher_test.cc
+++ b/test/pagespeed/kernel/http/user_agent_matcher_test.cc
@@ -21,8 +21,8 @@
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/http/request_headers.h"
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
namespace net_instaweb {
diff --git a/pagespeed/kernel/http/user_agent_matcher_test_base.cc b/test/pagespeed/kernel/http/user_agent_matcher_test_base.cc
similarity index 99%
rename from pagespeed/kernel/http/user_agent_matcher_test_base.cc
rename to test/pagespeed/kernel/http/user_agent_matcher_test_base.cc
index 26f73b1..85aae52 100644
--- a/pagespeed/kernel/http/user_agent_matcher_test_base.cc
+++ b/test/pagespeed/kernel/http/user_agent_matcher_test_base.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "pagespeed/kernel/http/user_agent_matcher_test_base.h"
+#include "test/pagespeed/kernel/http/user_agent_matcher_test_base.h"
#include <memory>
diff --git a/pagespeed/kernel/http/user_agent_matcher_test_base.h b/test/pagespeed/kernel/http/user_agent_matcher_test_base.h
similarity index 100%
rename from pagespeed/kernel/http/user_agent_matcher_test_base.h
rename to test/pagespeed/kernel/http/user_agent_matcher_test_base.h
diff --git a/pagespeed/kernel/http/user_agent_normalizer_test.cc b/test/pagespeed/kernel/http/user_agent_normalizer_test.cc
similarity index 100%
rename from pagespeed/kernel/http/user_agent_normalizer_test.cc
rename to test/pagespeed/kernel/http/user_agent_normalizer_test.cc
diff --git a/test/pagespeed/kernel/image/BUILD b/test/pagespeed/kernel/image/BUILD
new file mode 100644
index 0000000..4f09ac4
--- /dev/null
+++ b/test/pagespeed/kernel/image/BUILD
@@ -0,0 +1,40 @@
+load(
+ "//bazel:pagespeed_test.bzl",
+ "pagespeed_cc_test",
+ "pagespeed_cc_test_library",
+)
+
+licenses(["notice"]) # Apache 2
+
+pagespeed_cc_test_library(
+ name = "image_test_base",
+ srcs = [
+ "jpeg_optimizer_test_helper.cc",
+ "test_utils.cc",
+ ],
+ hdrs = [
+ "jpeg_optimizer_test_helper.h",
+ "test_utils.h",
+ ],
+ deps = [
+ "//pagespeed/kernel/image",
+ "//test/pagespeed/kernel/base:kernel_test_util",
+ ],
+)
+
+pagespeed_cc_test(
+ name = "image",
+ srcs = glob(["*_test.cc"]),
+ data = glob([
+ "testdata/gif/*",
+ "testdata/jpeg/*",
+ "testdata/png/*",
+ "testdata/pngsuite/*",
+ "testdata/pngsuite/gif/*",
+ "testdata/resized/*",
+ "testdata/webp/*",
+ ]),
+ deps = [
+ ":image_test_base",
+ ],
+)
diff --git a/pagespeed/kernel/image/frame_interface_integration_test.cc b/test/pagespeed/kernel/image/frame_interface_integration_test.cc
similarity index 98%
rename from pagespeed/kernel/image/frame_interface_integration_test.cc
rename to test/pagespeed/kernel/image/frame_interface_integration_test.cc
index 8420526..89bf633 100644
--- a/pagespeed/kernel/image/frame_interface_integration_test.cc
+++ b/test/pagespeed/kernel/image/frame_interface_integration_test.cc
@@ -31,9 +31,9 @@
#include "pagespeed/kernel/image/scanline_interface.h"
#include "pagespeed/kernel/image/scanline_interface_frame_adapter.h"
#include "pagespeed/kernel/image/scanline_status.h"
-#include "pagespeed/kernel/image/test_utils.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
+#include "test/pagespeed/kernel/image/test_utils.h"
namespace pagespeed {
diff --git a/pagespeed/kernel/image/frame_interface_optimizer_test.cc b/test/pagespeed/kernel/image/frame_interface_optimizer_test.cc
similarity index 99%
rename from pagespeed/kernel/image/frame_interface_optimizer_test.cc
rename to test/pagespeed/kernel/image/frame_interface_optimizer_test.cc
index 3ed014c..fd9be5a 100644
--- a/pagespeed/kernel/image/frame_interface_optimizer_test.cc
+++ b/test/pagespeed/kernel/image/frame_interface_optimizer_test.cc
@@ -28,9 +28,9 @@
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/image/image_frame_interface.h"
#include "pagespeed/kernel/image/image_util.h"
-#include "pagespeed/kernel/image/test_utils.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
+#include "test/pagespeed/kernel/image/test_utils.h"
namespace {
using net_instaweb::MessageHandler;
diff --git a/pagespeed/kernel/image/gif_reader_test.cc b/test/pagespeed/kernel/image/gif_reader_test.cc
similarity index 99%
rename from pagespeed/kernel/image/gif_reader_test.cc
rename to test/pagespeed/kernel/image/gif_reader_test.cc
index bafdc63..b018596 100644
--- a/pagespeed/kernel/image/gif_reader_test.cc
+++ b/test/pagespeed/kernel/image/gif_reader_test.cc
@@ -36,9 +36,9 @@
#include "pagespeed/kernel/image/png_optimizer.h"
#include "pagespeed/kernel/image/scanline_interface_frame_adapter.h"
#include "pagespeed/kernel/image/scanline_utils.h"
-#include "pagespeed/kernel/image/test_utils.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
+#include "test/pagespeed/kernel/image/test_utils.h"
namespace pagespeed {
diff --git a/pagespeed/kernel/image/image_analysis_test.cc b/test/pagespeed/kernel/image/image_analysis_test.cc
similarity index 99%
rename from pagespeed/kernel/image/image_analysis_test.cc
rename to test/pagespeed/kernel/image/image_analysis_test.cc
index 5f9f3db..e5478aa 100644
--- a/pagespeed/kernel/image/image_analysis_test.cc
+++ b/test/pagespeed/kernel/image/image_analysis_test.cc
@@ -31,9 +31,9 @@
#include "pagespeed/kernel/image/read_image.h"
#include "pagespeed/kernel/image/scanline_interface.h"
#include "pagespeed/kernel/image/scanline_utils.h"
-#include "pagespeed/kernel/image/test_utils.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
+#include "test/pagespeed/kernel/image/test_utils.h"
namespace {
diff --git a/pagespeed/kernel/image/image_converter_test.cc b/test/pagespeed/kernel/image/image_converter_test.cc
similarity index 99%
rename from pagespeed/kernel/image/image_converter_test.cc
rename to test/pagespeed/kernel/image/image_converter_test.cc
index 6ea563d..c2eb127 100644
--- a/pagespeed/kernel/image/image_converter_test.cc
+++ b/test/pagespeed/kernel/image/image_converter_test.cc
@@ -30,9 +30,9 @@
#include "pagespeed/kernel/image/png_optimizer.h"
#include "pagespeed/kernel/image/read_image.h"
#include "pagespeed/kernel/image/scanline_interface.h"
-#include "pagespeed/kernel/image/test_utils.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
+#include "test/pagespeed/kernel/image/test_utils.h"
namespace {
diff --git a/pagespeed/kernel/image/image_optimizer_test.cc b/test/pagespeed/kernel/image/image_optimizer_test.cc
similarity index 99%
rename from pagespeed/kernel/image/image_optimizer_test.cc
rename to test/pagespeed/kernel/image/image_optimizer_test.cc
index 48eca02..f2885ff 100644
--- a/pagespeed/kernel/image/image_optimizer_test.cc
+++ b/test/pagespeed/kernel/image/image_optimizer_test.cc
@@ -28,9 +28,9 @@
#include "pagespeed/kernel/image/gif_reader.h"
#include "pagespeed/kernel/image/image_analysis.h"
#include "pagespeed/kernel/image/image_util.h"
-#include "pagespeed/kernel/image/test_utils.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
+#include "test/pagespeed/kernel/image/test_utils.h"
namespace {
diff --git a/pagespeed/kernel/image/image_resizer_test.cc b/test/pagespeed/kernel/image/image_resizer_test.cc
similarity index 99%
rename from pagespeed/kernel/image/image_resizer_test.cc
rename to test/pagespeed/kernel/image/image_resizer_test.cc
index d3d131e..ba3c78a 100644
--- a/pagespeed/kernel/image/image_resizer_test.cc
+++ b/test/pagespeed/kernel/image/image_resizer_test.cc
@@ -27,10 +27,10 @@
#include "pagespeed/kernel/image/jpeg_optimizer.h"
#include "pagespeed/kernel/image/png_optimizer.h"
#include "pagespeed/kernel/image/read_image.h"
-#include "pagespeed/kernel/image/test_utils.h"
#include "pagespeed/kernel/image/webp_optimizer.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
+#include "test/pagespeed/kernel/image/test_utils.h"
namespace {
diff --git a/pagespeed/kernel/image/image_util_test.cc b/test/pagespeed/kernel/image/image_util_test.cc
similarity index 98%
rename from pagespeed/kernel/image/image_util_test.cc
rename to test/pagespeed/kernel/image/image_util_test.cc
index c19310f..8e358cd 100644
--- a/pagespeed/kernel/image/image_util_test.cc
+++ b/test/pagespeed/kernel/image/image_util_test.cc
@@ -20,8 +20,8 @@
#include "pagespeed/kernel/image/image_util.h"
#include "pagespeed/kernel/base/string.h"
-#include "pagespeed/kernel/image/test_utils.h"
#include "test/pagespeed/kernel/base/gtest.h"
+#include "test/pagespeed/kernel/image/test_utils.h"
namespace {
diff --git a/pagespeed/kernel/image/jpeg_optimizer_test.cc b/test/pagespeed/kernel/image/jpeg_optimizer_test.cc
similarity index 98%
rename from pagespeed/kernel/image/jpeg_optimizer_test.cc
rename to test/pagespeed/kernel/image/jpeg_optimizer_test.cc
index 82f2832..f0a5dcf 100644
--- a/pagespeed/kernel/image/jpeg_optimizer_test.cc
+++ b/test/pagespeed/kernel/image/jpeg_optimizer_test.cc
@@ -23,10 +23,10 @@
#include "pagespeed/kernel/base/null_mutex.h"
#include "pagespeed/kernel/base/string.h"
-#include "pagespeed/kernel/image/jpeg_optimizer_test_helper.h"
-#include "pagespeed/kernel/image/test_utils.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
+#include "test/pagespeed/kernel/image/jpeg_optimizer_test_helper.h"
+#include "test/pagespeed/kernel/image/test_utils.h"
// DO NOT INCLUDE LIBJPEG HEADERS HERE. Doing so causes build errors
// on Windows. If you need to call out to libjpeg, please add helper
diff --git a/pagespeed/kernel/image/jpeg_optimizer_test_helper.cc b/test/pagespeed/kernel/image/jpeg_optimizer_test_helper.cc
similarity index 98%
rename from pagespeed/kernel/image/jpeg_optimizer_test_helper.cc
rename to test/pagespeed/kernel/image/jpeg_optimizer_test_helper.cc
index de17849..d1f1152 100644
--- a/pagespeed/kernel/image/jpeg_optimizer_test_helper.cc
+++ b/test/pagespeed/kernel/image/jpeg_optimizer_test_helper.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "pagespeed/kernel/image/jpeg_optimizer_test_helper.h"
+#include "test/pagespeed/kernel/image/jpeg_optimizer_test_helper.h"
#include <csetjmp>
diff --git a/pagespeed/kernel/image/jpeg_optimizer_test_helper.h b/test/pagespeed/kernel/image/jpeg_optimizer_test_helper.h
similarity index 100%
rename from pagespeed/kernel/image/jpeg_optimizer_test_helper.h
rename to test/pagespeed/kernel/image/jpeg_optimizer_test_helper.h
diff --git a/pagespeed/kernel/image/jpeg_reader_test.cc b/test/pagespeed/kernel/image/jpeg_reader_test.cc
similarity index 98%
rename from pagespeed/kernel/image/jpeg_reader_test.cc
rename to test/pagespeed/kernel/image/jpeg_reader_test.cc
index 5cae0be..970c290 100644
--- a/pagespeed/kernel/image/jpeg_reader_test.cc
+++ b/test/pagespeed/kernel/image/jpeg_reader_test.cc
@@ -22,9 +22,9 @@
#include "pagespeed/kernel/base/null_mutex.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/image/read_image.h"
-#include "pagespeed/kernel/image/test_utils.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
+#include "test/pagespeed/kernel/image/test_utils.h"
// DO NOT INCLUDE LIBJPEG HEADERS HERE. Doing so causes build errors
// on Windows. If you need to call out to libjpeg, please add helper
diff --git a/pagespeed/kernel/image/jpeg_utils_test.cc b/test/pagespeed/kernel/image/jpeg_utils_test.cc
similarity index 97%
rename from pagespeed/kernel/image/jpeg_utils_test.cc
rename to test/pagespeed/kernel/image/jpeg_utils_test.cc
index bebfffa..76e984f 100644
--- a/pagespeed/kernel/image/jpeg_utils_test.cc
+++ b/test/pagespeed/kernel/image/jpeg_utils_test.cc
@@ -21,9 +21,9 @@
#include "pagespeed/kernel/base/null_mutex.h"
#include "pagespeed/kernel/base/string.h"
-#include "pagespeed/kernel/image/test_utils.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
+#include "test/pagespeed/kernel/image/test_utils.h"
// DO NOT INCLUDE LIBJPEG HEADERS HERE. Doing so causes build errors
// on Windows. If you need to call out to libjpeg, please add helper
diff --git a/pagespeed/kernel/image/pixel_format_optimizer_test.cc b/test/pagespeed/kernel/image/pixel_format_optimizer_test.cc
similarity index 98%
rename from pagespeed/kernel/image/pixel_format_optimizer_test.cc
rename to test/pagespeed/kernel/image/pixel_format_optimizer_test.cc
index 78adbdf..36ac7dc 100644
--- a/pagespeed/kernel/image/pixel_format_optimizer_test.cc
+++ b/test/pagespeed/kernel/image/pixel_format_optimizer_test.cc
@@ -24,9 +24,9 @@
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/image/png_optimizer.h"
-#include "pagespeed/kernel/image/test_utils.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
+#include "test/pagespeed/kernel/image/test_utils.h"
namespace {
diff --git a/pagespeed/kernel/image/png_optimizer_test.cc b/test/pagespeed/kernel/image/png_optimizer_test.cc
similarity index 99%
rename from pagespeed/kernel/image/png_optimizer_test.cc
rename to test/pagespeed/kernel/image/png_optimizer_test.cc
index d976df5..b88647b 100644
--- a/pagespeed/kernel/image/png_optimizer_test.cc
+++ b/test/pagespeed/kernel/image/png_optimizer_test.cc
@@ -29,9 +29,9 @@
#include "pagespeed/kernel/image/gif_reader.h"
#include "pagespeed/kernel/image/read_image.h"
#include "pagespeed/kernel/image/scanline_utils.h"
-#include "pagespeed/kernel/image/test_utils.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
+#include "test/pagespeed/kernel/image/test_utils.h"
extern "C" {
#ifdef USE_SYSTEM_LIBPNG
diff --git a/pagespeed/kernel/image/scanline_interface_frame_adapter_test.cc b/test/pagespeed/kernel/image/scanline_interface_frame_adapter_test.cc
similarity index 98%
rename from pagespeed/kernel/image/scanline_interface_frame_adapter_test.cc
rename to test/pagespeed/kernel/image/scanline_interface_frame_adapter_test.cc
index b85c0e1..2110211 100644
--- a/pagespeed/kernel/image/scanline_interface_frame_adapter_test.cc
+++ b/test/pagespeed/kernel/image/scanline_interface_frame_adapter_test.cc
@@ -24,9 +24,9 @@
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/image/read_image.h"
-#include "pagespeed/kernel/image/test_utils.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
+#include "test/pagespeed/kernel/image/test_utils.h"
namespace pagespeed {
namespace image_compression {
diff --git a/pagespeed/kernel/image/scanline_status_test.cc b/test/pagespeed/kernel/image/scanline_status_test.cc
similarity index 100%
rename from pagespeed/kernel/image/scanline_status_test.cc
rename to test/pagespeed/kernel/image/scanline_status_test.cc
diff --git a/pagespeed/kernel/image/test_utils.cc b/test/pagespeed/kernel/image/test_utils.cc
similarity index 99%
rename from pagespeed/kernel/image/test_utils.cc
rename to test/pagespeed/kernel/image/test_utils.cc
index c1c65a0..475266c 100644
--- a/pagespeed/kernel/image/test_utils.cc
+++ b/test/pagespeed/kernel/image/test_utils.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "pagespeed/kernel/image/test_utils.h"
+#include "test/pagespeed/kernel/image/test_utils.h"
#include <cmath>
#include <cstdint>
diff --git a/pagespeed/kernel/image/test_utils.h b/test/pagespeed/kernel/image/test_utils.h
similarity index 99%
rename from pagespeed/kernel/image/test_utils.h
rename to test/pagespeed/kernel/image/test_utils.h
index 1f598eb..5c3daec 100644
--- a/pagespeed/kernel/image/test_utils.h
+++ b/test/pagespeed/kernel/image/test_utils.h
@@ -39,7 +39,7 @@
using net_instaweb::MessageHandler;
-const char kTestRootDir[] = "/pagespeed/kernel/image/testdata/";
+const char kTestRootDir[] = "/test/pagespeed/kernel/image/testdata/";
// Directory for test data.
const char kGifTestDir[] = "gif/";
diff --git a/pagespeed/kernel/image/testdata/gif/animated.gif b/test/pagespeed/kernel/image/testdata/gif/animated.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/gif/animated.gif
rename to test/pagespeed/kernel/image/testdata/gif/animated.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/gif/animated_interlaced.gif b/test/pagespeed/kernel/image/testdata/gif/animated_interlaced.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/gif/animated_interlaced.gif
rename to test/pagespeed/kernel/image/testdata/gif/animated_interlaced.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/gif/bad.gif b/test/pagespeed/kernel/image/testdata/gif/bad.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/gif/bad.gif
rename to test/pagespeed/kernel/image/testdata/gif/bad.gif
diff --git a/pagespeed/kernel/image/testdata/gif/bad_pixel_global_palette.gif b/test/pagespeed/kernel/image/testdata/gif/bad_pixel_global_palette.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/gif/bad_pixel_global_palette.gif
rename to test/pagespeed/kernel/image/testdata/gif/bad_pixel_global_palette.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/gif/bad_pixel_local_palette.gif b/test/pagespeed/kernel/image/testdata/gif/bad_pixel_local_palette.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/gif/bad_pixel_local_palette.gif
rename to test/pagespeed/kernel/image/testdata/gif/bad_pixel_local_palette.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/gif/completely_transparent.gif b/test/pagespeed/kernel/image/testdata/gif/completely_transparent.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/gif/completely_transparent.gif
rename to test/pagespeed/kernel/image/testdata/gif/completely_transparent.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/gif/completely_transparent.png b/test/pagespeed/kernel/image/testdata/gif/completely_transparent.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/gif/completely_transparent.png
rename to test/pagespeed/kernel/image/testdata/gif/completely_transparent.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/gif/frame_smaller_than_screen.gif b/test/pagespeed/kernel/image/testdata/gif/frame_smaller_than_screen.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/gif/frame_smaller_than_screen.gif
rename to test/pagespeed/kernel/image/testdata/gif/frame_smaller_than_screen.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/gif/full2loop.gif b/test/pagespeed/kernel/image/testdata/gif/full2loop.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/gif/full2loop.gif
rename to test/pagespeed/kernel/image/testdata/gif/full2loop.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/gif/interlaced.gif b/test/pagespeed/kernel/image/testdata/gif/interlaced.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/gif/interlaced.gif
rename to test/pagespeed/kernel/image/testdata/gif/interlaced.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/gif/interlaced.png b/test/pagespeed/kernel/image/testdata/gif/interlaced.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/gif/interlaced.png
rename to test/pagespeed/kernel/image/testdata/gif/interlaced.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/gif/o.gif b/test/pagespeed/kernel/image/testdata/gif/o.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/gif/o.gif
rename to test/pagespeed/kernel/image/testdata/gif/o.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/gif/red_conforming.png b/test/pagespeed/kernel/image/testdata/gif/red_conforming.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/gif/red_conforming.png
rename to test/pagespeed/kernel/image/testdata/gif/red_conforming.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/gif/red_empty_screen.gif b/test/pagespeed/kernel/image/testdata/gif/red_empty_screen.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/gif/red_empty_screen.gif
rename to test/pagespeed/kernel/image/testdata/gif/red_empty_screen.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/gif/red_unused_invalid_background.gif b/test/pagespeed/kernel/image/testdata/gif/red_unused_invalid_background.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/gif/red_unused_invalid_background.gif
rename to test/pagespeed/kernel/image/testdata/gif/red_unused_invalid_background.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/gif/square2loop.gif b/test/pagespeed/kernel/image/testdata/gif/square2loop.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/gif/square2loop.gif
rename to test/pagespeed/kernel/image/testdata/gif/square2loop.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/gif/transparent.gif b/test/pagespeed/kernel/image/testdata/gif/transparent.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/gif/transparent.gif
rename to test/pagespeed/kernel/image/testdata/gif/transparent.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/gif/zero_size_animation.gif b/test/pagespeed/kernel/image/testdata/gif/zero_size_animation.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/gif/zero_size_animation.gif
rename to test/pagespeed/kernel/image/testdata/gif/zero_size_animation.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/already_optimized.jpg b/test/pagespeed/kernel/image/testdata/jpeg/already_optimized.jpg
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/already_optimized.jpg
rename to test/pagespeed/kernel/image/testdata/jpeg/already_optimized.jpg
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/app_segments.jpg b/test/pagespeed/kernel/image/testdata/jpeg/app_segments.jpg
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/app_segments.jpg
rename to test/pagespeed/kernel/image/testdata/jpeg/app_segments.jpg
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/corrupt.jpg b/test/pagespeed/kernel/image/testdata/jpeg/corrupt.jpg
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/corrupt.jpg
rename to test/pagespeed/kernel/image/testdata/jpeg/corrupt.jpg
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/emptyfile.jpg b/test/pagespeed/kernel/image/testdata/jpeg/emptyfile.jpg
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/emptyfile.jpg
rename to test/pagespeed/kernel/image/testdata/jpeg/emptyfile.jpg
diff --git a/pagespeed/kernel/image/testdata/jpeg/notajpeg.gif b/test/pagespeed/kernel/image/testdata/jpeg/notajpeg.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/notajpeg.gif
rename to test/pagespeed/kernel/image/testdata/jpeg/notajpeg.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/notajpeg.png b/test/pagespeed/kernel/image/testdata/jpeg/notajpeg.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/notajpeg.png
rename to test/pagespeed/kernel/image/testdata/jpeg/notajpeg.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/progressive.jpg b/test/pagespeed/kernel/image/testdata/jpeg/progressive.jpg
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/progressive.jpg
rename to test/pagespeed/kernel/image/testdata/jpeg/progressive.jpg
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/quality100.jpg b/test/pagespeed/kernel/image/testdata/jpeg/quality100.jpg
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/quality100.jpg
rename to test/pagespeed/kernel/image/testdata/jpeg/quality100.jpg
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/sjpeg1.jpg b/test/pagespeed/kernel/image/testdata/jpeg/sjpeg1.jpg
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/sjpeg1.jpg
rename to test/pagespeed/kernel/image/testdata/jpeg/sjpeg1.jpg
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/sjpeg2.jpg b/test/pagespeed/kernel/image/testdata/jpeg/sjpeg2.jpg
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/sjpeg2.jpg
rename to test/pagespeed/kernel/image/testdata/jpeg/sjpeg2.jpg
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/sjpeg3.jpg b/test/pagespeed/kernel/image/testdata/jpeg/sjpeg3.jpg
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/sjpeg3.jpg
rename to test/pagespeed/kernel/image/testdata/jpeg/sjpeg3.jpg
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/sjpeg4.jpg b/test/pagespeed/kernel/image/testdata/jpeg/sjpeg4.jpg
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/sjpeg4.jpg
rename to test/pagespeed/kernel/image/testdata/jpeg/sjpeg4.jpg
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/sjpeg6.jpg b/test/pagespeed/kernel/image/testdata/jpeg/sjpeg6.jpg
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/sjpeg6.jpg
rename to test/pagespeed/kernel/image/testdata/jpeg/sjpeg6.jpg
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/test411.jpg b/test/pagespeed/kernel/image/testdata/jpeg/test411.jpg
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/test411.jpg
rename to test/pagespeed/kernel/image/testdata/jpeg/test411.jpg
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/test411.png b/test/pagespeed/kernel/image/testdata/jpeg/test411.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/test411.png
rename to test/pagespeed/kernel/image/testdata/jpeg/test411.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/test420.jpg b/test/pagespeed/kernel/image/testdata/jpeg/test420.jpg
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/test420.jpg
rename to test/pagespeed/kernel/image/testdata/jpeg/test420.jpg
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/test420.png b/test/pagespeed/kernel/image/testdata/jpeg/test420.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/test420.png
rename to test/pagespeed/kernel/image/testdata/jpeg/test420.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/test422.jpg b/test/pagespeed/kernel/image/testdata/jpeg/test422.jpg
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/test422.jpg
rename to test/pagespeed/kernel/image/testdata/jpeg/test422.jpg
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/test422.png b/test/pagespeed/kernel/image/testdata/jpeg/test422.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/test422.png
rename to test/pagespeed/kernel/image/testdata/jpeg/test422.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/test444.jpg b/test/pagespeed/kernel/image/testdata/jpeg/test444.jpg
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/test444.jpg
rename to test/pagespeed/kernel/image/testdata/jpeg/test444.jpg
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/test444.png b/test/pagespeed/kernel/image/testdata/jpeg/test444.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/test444.png
rename to test/pagespeed/kernel/image/testdata/jpeg/test444.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/testgray.jpg b/test/pagespeed/kernel/image/testdata/jpeg/testgray.jpg
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/testgray.jpg
rename to test/pagespeed/kernel/image/testdata/jpeg/testgray.jpg
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/jpeg/testgray.png b/test/pagespeed/kernel/image/testdata/jpeg/testgray.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/jpeg/testgray.png
rename to test/pagespeed/kernel/image/testdata/jpeg/testgray.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/png/gray_alpha.png b/test/pagespeed/kernel/image/testdata/png/gray_alpha.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/png/gray_alpha.png
rename to test/pagespeed/kernel/image/testdata/png/gray_alpha.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/png/large.png b/test/pagespeed/kernel/image/testdata/png/large.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/png/large.png
rename to test/pagespeed/kernel/image/testdata/png/large.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/png/pagespeed-128.png b/test/pagespeed/kernel/image/testdata/png/pagespeed-128.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/png/pagespeed-128.png
rename to test/pagespeed/kernel/image/testdata/png/pagespeed-128.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/png/pagespeed-33x34.png b/test/pagespeed/kernel/image/testdata/png/pagespeed-33x34.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/png/pagespeed-33x34.png
rename to test/pagespeed/kernel/image/testdata/png/pagespeed-33x34.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/png/read_from_stream_crash.png b/test/pagespeed/kernel/image/testdata/png/read_from_stream_crash.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/png/read_from_stream_crash.png
rename to test/pagespeed/kernel/image/testdata/png/read_from_stream_crash.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/png/rgb_alpha.png b/test/pagespeed/kernel/image/testdata/png/rgb_alpha.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/png/rgb_alpha.png
rename to test/pagespeed/kernel/image/testdata/png/rgb_alpha.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/png/this_is_a_test.png b/test/pagespeed/kernel/image/testdata/png/this_is_a_test.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/png/this_is_a_test.png
rename to test/pagespeed/kernel/image/testdata/png/this_is_a_test.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/already_optimized.png b/test/pagespeed/kernel/image/testdata/pngsuite/already_optimized.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/already_optimized.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/already_optimized.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basi0g01.png b/test/pagespeed/kernel/image/testdata/pngsuite/basi0g01.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basi0g01.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basi0g01.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basi0g02.png b/test/pagespeed/kernel/image/testdata/pngsuite/basi0g02.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basi0g02.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basi0g02.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basi0g04.png b/test/pagespeed/kernel/image/testdata/pngsuite/basi0g04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basi0g04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basi0g04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basi0g08.png b/test/pagespeed/kernel/image/testdata/pngsuite/basi0g08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basi0g08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basi0g08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basi0g16.png b/test/pagespeed/kernel/image/testdata/pngsuite/basi0g16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basi0g16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basi0g16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basi2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/basi2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basi2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basi2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basi2c16.png b/test/pagespeed/kernel/image/testdata/pngsuite/basi2c16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basi2c16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basi2c16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basi3p01.png b/test/pagespeed/kernel/image/testdata/pngsuite/basi3p01.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basi3p01.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basi3p01.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basi3p02.png b/test/pagespeed/kernel/image/testdata/pngsuite/basi3p02.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basi3p02.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basi3p02.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basi3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/basi3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basi3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basi3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basi3p08.png b/test/pagespeed/kernel/image/testdata/pngsuite/basi3p08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basi3p08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basi3p08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basi4a08.png b/test/pagespeed/kernel/image/testdata/pngsuite/basi4a08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basi4a08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basi4a08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basi4a16.png b/test/pagespeed/kernel/image/testdata/pngsuite/basi4a16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basi4a16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basi4a16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basi6a08.png b/test/pagespeed/kernel/image/testdata/pngsuite/basi6a08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basi6a08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basi6a08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basi6a16.png b/test/pagespeed/kernel/image/testdata/pngsuite/basi6a16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basi6a16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basi6a16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basn0g01.png b/test/pagespeed/kernel/image/testdata/pngsuite/basn0g01.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basn0g01.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basn0g01.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basn0g02.png b/test/pagespeed/kernel/image/testdata/pngsuite/basn0g02.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basn0g02.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basn0g02.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basn0g04.png b/test/pagespeed/kernel/image/testdata/pngsuite/basn0g04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basn0g04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basn0g04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basn0g08.png b/test/pagespeed/kernel/image/testdata/pngsuite/basn0g08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basn0g08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basn0g08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basn0g16.png b/test/pagespeed/kernel/image/testdata/pngsuite/basn0g16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basn0g16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basn0g16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basn2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/basn2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basn2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basn2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basn2c16.png b/test/pagespeed/kernel/image/testdata/pngsuite/basn2c16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basn2c16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basn2c16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basn3p01.png b/test/pagespeed/kernel/image/testdata/pngsuite/basn3p01.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basn3p01.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basn3p01.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basn3p02.png b/test/pagespeed/kernel/image/testdata/pngsuite/basn3p02.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basn3p02.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basn3p02.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basn3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/basn3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basn3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basn3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basn3p08.png b/test/pagespeed/kernel/image/testdata/pngsuite/basn3p08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basn3p08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basn3p08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basn4a08.png b/test/pagespeed/kernel/image/testdata/pngsuite/basn4a08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basn4a08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basn4a08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basn4a16.png b/test/pagespeed/kernel/image/testdata/pngsuite/basn4a16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basn4a16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basn4a16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basn6a08.png b/test/pagespeed/kernel/image/testdata/pngsuite/basn6a08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basn6a08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basn6a08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/basn6a16.png b/test/pagespeed/kernel/image/testdata/pngsuite/basn6a16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/basn6a16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/basn6a16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/bgai4a08.png b/test/pagespeed/kernel/image/testdata/pngsuite/bgai4a08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/bgai4a08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/bgai4a08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/bgai4a16.png b/test/pagespeed/kernel/image/testdata/pngsuite/bgai4a16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/bgai4a16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/bgai4a16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/bgan6a08.png b/test/pagespeed/kernel/image/testdata/pngsuite/bgan6a08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/bgan6a08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/bgan6a08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/bgan6a16.png b/test/pagespeed/kernel/image/testdata/pngsuite/bgan6a16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/bgan6a16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/bgan6a16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/bgbn4a08.png b/test/pagespeed/kernel/image/testdata/pngsuite/bgbn4a08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/bgbn4a08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/bgbn4a08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/bggn4a16.png b/test/pagespeed/kernel/image/testdata/pngsuite/bggn4a16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/bggn4a16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/bggn4a16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/bgwn6a08.png b/test/pagespeed/kernel/image/testdata/pngsuite/bgwn6a08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/bgwn6a08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/bgwn6a08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/bgyn6a16.png b/test/pagespeed/kernel/image/testdata/pngsuite/bgyn6a16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/bgyn6a16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/bgyn6a16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/ccwn2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/ccwn2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/ccwn2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/ccwn2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/ccwn3p08.png b/test/pagespeed/kernel/image/testdata/pngsuite/ccwn3p08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/ccwn3p08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/ccwn3p08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/cdfn2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/cdfn2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/cdfn2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/cdfn2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/cdhn2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/cdhn2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/cdhn2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/cdhn2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/cdsn2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/cdsn2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/cdsn2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/cdsn2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/cdun2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/cdun2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/cdun2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/cdun2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/ch1n3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/ch1n3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/ch1n3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/ch1n3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/ch2n3p08.png b/test/pagespeed/kernel/image/testdata/pngsuite/ch2n3p08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/ch2n3p08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/ch2n3p08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/cm0n0g04.png b/test/pagespeed/kernel/image/testdata/pngsuite/cm0n0g04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/cm0n0g04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/cm0n0g04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/cm7n0g04.png b/test/pagespeed/kernel/image/testdata/pngsuite/cm7n0g04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/cm7n0g04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/cm7n0g04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/cm9n0g04.png b/test/pagespeed/kernel/image/testdata/pngsuite/cm9n0g04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/cm9n0g04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/cm9n0g04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/cs3n2c16.png b/test/pagespeed/kernel/image/testdata/pngsuite/cs3n2c16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/cs3n2c16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/cs3n2c16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/cs3n3p08.png b/test/pagespeed/kernel/image/testdata/pngsuite/cs3n3p08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/cs3n3p08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/cs3n3p08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/cs5n2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/cs5n2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/cs5n2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/cs5n2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/cs5n3p08.png b/test/pagespeed/kernel/image/testdata/pngsuite/cs5n3p08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/cs5n3p08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/cs5n3p08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/cs8n2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/cs8n2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/cs8n2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/cs8n2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/cs8n3p08.png b/test/pagespeed/kernel/image/testdata/pngsuite/cs8n3p08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/cs8n3p08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/cs8n3p08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/ct0n0g04.png b/test/pagespeed/kernel/image/testdata/pngsuite/ct0n0g04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/ct0n0g04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/ct0n0g04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/ct1n0g04.png b/test/pagespeed/kernel/image/testdata/pngsuite/ct1n0g04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/ct1n0g04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/ct1n0g04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/ctzn0g04.png b/test/pagespeed/kernel/image/testdata/pngsuite/ctzn0g04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/ctzn0g04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/ctzn0g04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/emptyfile.png b/test/pagespeed/kernel/image/testdata/pngsuite/emptyfile.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/emptyfile.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/emptyfile.png
diff --git a/pagespeed/kernel/image/testdata/pngsuite/f00n0g08.png b/test/pagespeed/kernel/image/testdata/pngsuite/f00n0g08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/f00n0g08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/f00n0g08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/f00n2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/f00n2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/f00n2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/f00n2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/f01n0g08.png b/test/pagespeed/kernel/image/testdata/pngsuite/f01n0g08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/f01n0g08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/f01n0g08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/f01n2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/f01n2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/f01n2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/f01n2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/f02n0g08.png b/test/pagespeed/kernel/image/testdata/pngsuite/f02n0g08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/f02n0g08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/f02n0g08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/f02n2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/f02n2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/f02n2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/f02n2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/f03n0g08.png b/test/pagespeed/kernel/image/testdata/pngsuite/f03n0g08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/f03n0g08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/f03n0g08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/f03n2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/f03n2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/f03n2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/f03n2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/f04n0g08.png b/test/pagespeed/kernel/image/testdata/pngsuite/f04n0g08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/f04n0g08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/f04n0g08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/f04n2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/f04n2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/f04n2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/f04n2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/g03n0g16.png b/test/pagespeed/kernel/image/testdata/pngsuite/g03n0g16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/g03n0g16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/g03n0g16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/g03n2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/g03n2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/g03n2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/g03n2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/g03n3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/g03n3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/g03n3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/g03n3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/g04n0g16.png b/test/pagespeed/kernel/image/testdata/pngsuite/g04n0g16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/g04n0g16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/g04n0g16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/g04n2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/g04n2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/g04n2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/g04n2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/g04n3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/g04n3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/g04n3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/g04n3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/g05n0g16.png b/test/pagespeed/kernel/image/testdata/pngsuite/g05n0g16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/g05n0g16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/g05n0g16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/g05n2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/g05n2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/g05n2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/g05n2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/g05n3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/g05n3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/g05n3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/g05n3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/g07n0g16.png b/test/pagespeed/kernel/image/testdata/pngsuite/g07n0g16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/g07n0g16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/g07n0g16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/g07n2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/g07n2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/g07n2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/g07n2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/g07n3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/g07n3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/g07n3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/g07n3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/g10n0g16.png b/test/pagespeed/kernel/image/testdata/pngsuite/g10n0g16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/g10n0g16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/g10n0g16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/g10n2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/g10n2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/g10n2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/g10n2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/g10n3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/g10n3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/g10n3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/g10n3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/g25n0g16.png b/test/pagespeed/kernel/image/testdata/pngsuite/g25n0g16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/g25n0g16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/g25n0g16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/g25n2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/g25n2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/g25n2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/g25n2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/g25n3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/g25n3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/g25n3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/g25n3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g01.gif b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g01.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basi0g01.gif
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g01.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g01.gif.rgba b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g01.gif.rgba
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basi0g01.gif.rgba
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g01.gif.rgba
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g02.gif b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g02.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basi0g02.gif
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g02.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g02.gif.rgba b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g02.gif.rgba
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basi0g02.gif.rgba
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g02.gif.rgba
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g04.gif b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g04.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basi0g04.gif
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g04.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g04.gif.rgba b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g04.gif.rgba
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basi0g04.gif.rgba
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g04.gif.rgba
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g08.gif b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g08.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basi0g08.gif
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g08.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g08.gif.rgba b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g08.gif.rgba
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basi0g08.gif.rgba
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basi0g08.gif.rgba
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p01.gif b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p01.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basi3p01.gif
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p01.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p01.gif.rgba b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p01.gif.rgba
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basi3p01.gif.rgba
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p01.gif.rgba
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p02.gif b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p02.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basi3p02.gif
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p02.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p02.gif.rgba b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p02.gif.rgba
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basi3p02.gif.rgba
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p02.gif.rgba
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p04.gif b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p04.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basi3p04.gif
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p04.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p04.gif.rgba b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p04.gif.rgba
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basi3p04.gif.rgba
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p04.gif.rgba
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p08.gif b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p08.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basi3p08.gif
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p08.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p08.gif.rgba b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p08.gif.rgba
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basi3p08.gif.rgba
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basi3p08.gif.rgba
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g01.gif b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g01.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basn0g01.gif
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g01.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g01.gif.rgba b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g01.gif.rgba
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basn0g01.gif.rgba
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g01.gif.rgba
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g02.gif b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g02.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basn0g02.gif
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g02.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g02.gif.rgba b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g02.gif.rgba
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basn0g02.gif.rgba
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g02.gif.rgba
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g04.gif b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g04.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basn0g04.gif
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g04.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g04.gif.rgba b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g04.gif.rgba
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basn0g04.gif.rgba
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g04.gif.rgba
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g08.gif b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g08.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basn0g08.gif
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g08.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g08.gif.rgba b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g08.gif.rgba
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basn0g08.gif.rgba
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basn0g08.gif.rgba
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p01.gif b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p01.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basn3p01.gif
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p01.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p01.gif.rgba b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p01.gif.rgba
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basn3p01.gif.rgba
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p01.gif.rgba
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p02.gif b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p02.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basn3p02.gif
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p02.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p02.gif.rgba b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p02.gif.rgba
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basn3p02.gif.rgba
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p02.gif.rgba
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p04.gif b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p04.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basn3p04.gif
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p04.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p04.gif.rgba b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p04.gif.rgba
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basn3p04.gif.rgba
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p04.gif.rgba
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p08.gif b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p08.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basn3p08.gif
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p08.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p08.gif.rgba b/test/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p08.gif.rgba
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/basn3p08.gif.rgba
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/basn3p08.gif.rgba
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/tr-basi4a08.gif b/test/pagespeed/kernel/image/testdata/pngsuite/gif/tr-basi4a08.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/tr-basi4a08.gif
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/tr-basi4a08.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/tr-basi4a08.gif.rgba b/test/pagespeed/kernel/image/testdata/pngsuite/gif/tr-basi4a08.gif.rgba
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/tr-basi4a08.gif.rgba
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/tr-basi4a08.gif.rgba
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/tr-basn4a08.gif b/test/pagespeed/kernel/image/testdata/pngsuite/gif/tr-basn4a08.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/tr-basn4a08.gif
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/tr-basn4a08.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/gif/tr-basn4a08.gif.rgba b/test/pagespeed/kernel/image/testdata/pngsuite/gif/tr-basn4a08.gif.rgba
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/gif/tr-basn4a08.gif.rgba
rename to test/pagespeed/kernel/image/testdata/pngsuite/gif/tr-basn4a08.gif.rgba
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/grey_alpha_opaque.png b/test/pagespeed/kernel/image/testdata/pngsuite/grey_alpha_opaque.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/grey_alpha_opaque.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/grey_alpha_opaque.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/oi1n0g16.png b/test/pagespeed/kernel/image/testdata/pngsuite/oi1n0g16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/oi1n0g16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/oi1n0g16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/oi1n2c16.png b/test/pagespeed/kernel/image/testdata/pngsuite/oi1n2c16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/oi1n2c16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/oi1n2c16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/oi2n0g16.png b/test/pagespeed/kernel/image/testdata/pngsuite/oi2n0g16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/oi2n0g16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/oi2n0g16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/oi2n2c16.png b/test/pagespeed/kernel/image/testdata/pngsuite/oi2n2c16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/oi2n2c16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/oi2n2c16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/oi4n0g16.png b/test/pagespeed/kernel/image/testdata/pngsuite/oi4n0g16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/oi4n0g16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/oi4n0g16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/oi4n2c16.png b/test/pagespeed/kernel/image/testdata/pngsuite/oi4n2c16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/oi4n2c16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/oi4n2c16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/oi9n0g16.png b/test/pagespeed/kernel/image/testdata/pngsuite/oi9n0g16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/oi9n0g16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/oi9n0g16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/oi9n2c16.png b/test/pagespeed/kernel/image/testdata/pngsuite/oi9n2c16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/oi9n2c16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/oi9n2c16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/pp0n2c16.png b/test/pagespeed/kernel/image/testdata/pngsuite/pp0n2c16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/pp0n2c16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/pp0n2c16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/pp0n6a08.png b/test/pagespeed/kernel/image/testdata/pngsuite/pp0n6a08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/pp0n6a08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/pp0n6a08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/ps1n0g08.png b/test/pagespeed/kernel/image/testdata/pngsuite/ps1n0g08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/ps1n0g08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/ps1n0g08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/ps1n2c16.png b/test/pagespeed/kernel/image/testdata/pngsuite/ps1n2c16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/ps1n2c16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/ps1n2c16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/ps2n0g08.png b/test/pagespeed/kernel/image/testdata/pngsuite/ps2n0g08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/ps2n0g08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/ps2n0g08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/ps2n2c16.png b/test/pagespeed/kernel/image/testdata/pngsuite/ps2n2c16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/ps2n2c16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/ps2n2c16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/rgba_opaque.png b/test/pagespeed/kernel/image/testdata/pngsuite/rgba_opaque.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/rgba_opaque.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/rgba_opaque.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s01i3p01.png b/test/pagespeed/kernel/image/testdata/pngsuite/s01i3p01.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s01i3p01.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s01i3p01.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s01n3p01.png b/test/pagespeed/kernel/image/testdata/pngsuite/s01n3p01.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s01n3p01.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s01n3p01.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s02i3p01.png b/test/pagespeed/kernel/image/testdata/pngsuite/s02i3p01.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s02i3p01.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s02i3p01.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s02n3p01.png b/test/pagespeed/kernel/image/testdata/pngsuite/s02n3p01.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s02n3p01.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s02n3p01.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s03i3p01.png b/test/pagespeed/kernel/image/testdata/pngsuite/s03i3p01.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s03i3p01.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s03i3p01.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s03n3p01.png b/test/pagespeed/kernel/image/testdata/pngsuite/s03n3p01.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s03n3p01.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s03n3p01.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s04i3p01.png b/test/pagespeed/kernel/image/testdata/pngsuite/s04i3p01.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s04i3p01.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s04i3p01.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s04n3p01.png b/test/pagespeed/kernel/image/testdata/pngsuite/s04n3p01.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s04n3p01.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s04n3p01.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s05i3p02.png b/test/pagespeed/kernel/image/testdata/pngsuite/s05i3p02.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s05i3p02.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s05i3p02.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s05n3p02.png b/test/pagespeed/kernel/image/testdata/pngsuite/s05n3p02.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s05n3p02.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s05n3p02.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s06i3p02.png b/test/pagespeed/kernel/image/testdata/pngsuite/s06i3p02.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s06i3p02.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s06i3p02.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s06n3p02.png b/test/pagespeed/kernel/image/testdata/pngsuite/s06n3p02.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s06n3p02.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s06n3p02.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s07i3p02.png b/test/pagespeed/kernel/image/testdata/pngsuite/s07i3p02.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s07i3p02.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s07i3p02.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s07n3p02.png b/test/pagespeed/kernel/image/testdata/pngsuite/s07n3p02.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s07n3p02.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s07n3p02.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s08i3p02.png b/test/pagespeed/kernel/image/testdata/pngsuite/s08i3p02.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s08i3p02.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s08i3p02.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s08n3p02.png b/test/pagespeed/kernel/image/testdata/pngsuite/s08n3p02.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s08n3p02.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s08n3p02.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s09i3p02.png b/test/pagespeed/kernel/image/testdata/pngsuite/s09i3p02.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s09i3p02.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s09i3p02.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s09n3p02.png b/test/pagespeed/kernel/image/testdata/pngsuite/s09n3p02.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s09n3p02.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s09n3p02.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s32i3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/s32i3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s32i3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s32i3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s32n3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/s32n3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s32n3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s32n3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s33i3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/s33i3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s33i3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s33i3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s33n3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/s33n3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s33n3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s33n3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s34i3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/s34i3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s34i3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s34i3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s34n3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/s34n3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s34n3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s34n3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s35i3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/s35i3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s35i3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s35i3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s35n3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/s35n3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s35n3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s35n3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s36i3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/s36i3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s36i3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s36i3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s36n3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/s36n3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s36n3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s36n3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s37i3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/s37i3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s37i3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s37i3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s37n3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/s37n3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s37n3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s37n3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s38i3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/s38i3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s38i3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s38i3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s38n3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/s38n3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s38n3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s38n3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s39i3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/s39i3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s39i3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s39i3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s39n3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/s39n3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s39n3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s39n3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s40i3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/s40i3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s40i3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s40i3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/s40n3p04.png b/test/pagespeed/kernel/image/testdata/pngsuite/s40n3p04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/s40n3p04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/s40n3p04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tbbn1g04.png b/test/pagespeed/kernel/image/testdata/pngsuite/tbbn1g04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tbbn1g04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tbbn1g04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tbbn2c16.png b/test/pagespeed/kernel/image/testdata/pngsuite/tbbn2c16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tbbn2c16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tbbn2c16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tbbn3p08.png b/test/pagespeed/kernel/image/testdata/pngsuite/tbbn3p08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tbbn3p08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tbbn3p08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tbgn2c16.png b/test/pagespeed/kernel/image/testdata/pngsuite/tbgn2c16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tbgn2c16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tbgn2c16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tbgn3p08.png b/test/pagespeed/kernel/image/testdata/pngsuite/tbgn3p08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tbgn3p08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tbgn3p08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tbrn2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/tbrn2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tbrn2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tbrn2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tbwn1g16.png b/test/pagespeed/kernel/image/testdata/pngsuite/tbwn1g16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tbwn1g16.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tbwn1g16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tbwn3p08.png b/test/pagespeed/kernel/image/testdata/pngsuite/tbwn3p08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tbwn3p08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tbwn3p08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tbyn3p08.png b/test/pagespeed/kernel/image/testdata/pngsuite/tbyn3p08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tbyn3p08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tbyn3p08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tp0n1g08.png b/test/pagespeed/kernel/image/testdata/pngsuite/tp0n1g08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tp0n1g08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tp0n1g08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tp0n2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/tp0n2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tp0n2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tp0n2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tp0n3p08.png b/test/pagespeed/kernel/image/testdata/pngsuite/tp0n3p08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tp0n3p08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tp0n3p08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tp1n3p08.png b/test/pagespeed/kernel/image/testdata/pngsuite/tp1n3p08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tp1n3p08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tp1n3p08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tr-basi4a08.png b/test/pagespeed/kernel/image/testdata/pngsuite/tr-basi4a08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tr-basi4a08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tr-basi4a08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tr-basn4a08.png b/test/pagespeed/kernel/image/testdata/pngsuite/tr-basn4a08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tr-basn4a08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tr-basn4a08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tr-t1-8pB.png b/test/pagespeed/kernel/image/testdata/pngsuite/tr-t1-8pB.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tr-t1-8pB.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tr-t1-8pB.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tr-t2-8pb.png b/test/pagespeed/kernel/image/testdata/pngsuite/tr-t2-8pb.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tr-t2-8pb.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tr-t2-8pb.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tr-t3-32pB.png b/test/pagespeed/kernel/image/testdata/pngsuite/tr-t3-32pB.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tr-t3-32pB.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tr-t3-32pB.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tr-t4-32pb.png b/test/pagespeed/kernel/image/testdata/pngsuite/tr-t4-32pb.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tr-t4-32pb.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tr-t4-32pb.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tr-t5-64pB.png b/test/pagespeed/kernel/image/testdata/pngsuite/tr-t5-64pB.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tr-t5-64pB.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tr-t5-64pB.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/tr-t6-64pb.png b/test/pagespeed/kernel/image/testdata/pngsuite/tr-t6-64pb.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/tr-t6-64pb.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/tr-t6-64pb.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/x00n0g01.png b/test/pagespeed/kernel/image/testdata/pngsuite/x00n0g01.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/x00n0g01.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/x00n0g01.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/xcrn0g04.png b/test/pagespeed/kernel/image/testdata/pngsuite/xcrn0g04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/xcrn0g04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/xcrn0g04.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/xlfn0g04.png b/test/pagespeed/kernel/image/testdata/pngsuite/xlfn0g04.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/xlfn0g04.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/xlfn0g04.png
diff --git a/pagespeed/kernel/image/testdata/pngsuite/z00n2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/z00n2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/z00n2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/z00n2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/z03n2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/z03n2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/z03n2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/z03n2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/z06n2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/z06n2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/z06n2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/z06n2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/pngsuite/z09n2c08.png b/test/pagespeed/kernel/image/testdata/pngsuite/z09n2c08.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/pngsuite/z09n2c08.png
rename to test/pagespeed/kernel/image/testdata/pngsuite/z09n2c08.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basi0g04_w16_h16.png b/test/pagespeed/kernel/image/testdata/resized/basi0g04_w16_h16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basi0g04_w16_h16.png
rename to test/pagespeed/kernel/image/testdata/resized/basi0g04_w16_h16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basi0g04_w16_h25.png b/test/pagespeed/kernel/image/testdata/resized/basi0g04_w16_h25.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basi0g04_w16_h25.png
rename to test/pagespeed/kernel/image/testdata/resized/basi0g04_w16_h25.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basi0g04_w31_h31.png b/test/pagespeed/kernel/image/testdata/resized/basi0g04_w31_h31.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basi0g04_w31_h31.png
rename to test/pagespeed/kernel/image/testdata/resized/basi0g04_w31_h31.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basi0g04_w32_h32.png b/test/pagespeed/kernel/image/testdata/resized/basi0g04_w32_h32.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basi0g04_w32_h32.png
rename to test/pagespeed/kernel/image/testdata/resized/basi0g04_w32_h32.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basi0g04_w32_h5.png b/test/pagespeed/kernel/image/testdata/resized/basi0g04_w32_h5.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basi0g04_w32_h5.png
rename to test/pagespeed/kernel/image/testdata/resized/basi0g04_w32_h5.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basi0g04_w3_h3.png b/test/pagespeed/kernel/image/testdata/resized/basi0g04_w3_h3.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basi0g04_w3_h3.png
rename to test/pagespeed/kernel/image/testdata/resized/basi0g04_w3_h3.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basi0g04_w3_h32.png b/test/pagespeed/kernel/image/testdata/resized/basi0g04_w3_h32.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basi0g04_w3_h32.png
rename to test/pagespeed/kernel/image/testdata/resized/basi0g04_w3_h32.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basi0g04_w8_h8.png b/test/pagespeed/kernel/image/testdata/resized/basi0g04_w8_h8.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basi0g04_w8_h8.png
rename to test/pagespeed/kernel/image/testdata/resized/basi0g04_w8_h8.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basi3p02_w16_h16.png b/test/pagespeed/kernel/image/testdata/resized/basi3p02_w16_h16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basi3p02_w16_h16.png
rename to test/pagespeed/kernel/image/testdata/resized/basi3p02_w16_h16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basi3p02_w16_h25.png b/test/pagespeed/kernel/image/testdata/resized/basi3p02_w16_h25.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basi3p02_w16_h25.png
rename to test/pagespeed/kernel/image/testdata/resized/basi3p02_w16_h25.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basi3p02_w31_h31.png b/test/pagespeed/kernel/image/testdata/resized/basi3p02_w31_h31.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basi3p02_w31_h31.png
rename to test/pagespeed/kernel/image/testdata/resized/basi3p02_w31_h31.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basi3p02_w32_h32.png b/test/pagespeed/kernel/image/testdata/resized/basi3p02_w32_h32.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basi3p02_w32_h32.png
rename to test/pagespeed/kernel/image/testdata/resized/basi3p02_w32_h32.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basi3p02_w32_h5.png b/test/pagespeed/kernel/image/testdata/resized/basi3p02_w32_h5.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basi3p02_w32_h5.png
rename to test/pagespeed/kernel/image/testdata/resized/basi3p02_w32_h5.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basi3p02_w3_h3.png b/test/pagespeed/kernel/image/testdata/resized/basi3p02_w3_h3.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basi3p02_w3_h3.png
rename to test/pagespeed/kernel/image/testdata/resized/basi3p02_w3_h3.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basi3p02_w3_h32.png b/test/pagespeed/kernel/image/testdata/resized/basi3p02_w3_h32.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basi3p02_w3_h32.png
rename to test/pagespeed/kernel/image/testdata/resized/basi3p02_w3_h32.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basi3p02_w8_h8.png b/test/pagespeed/kernel/image/testdata/resized/basi3p02_w8_h8.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basi3p02_w8_h8.png
rename to test/pagespeed/kernel/image/testdata/resized/basi3p02_w8_h8.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basn6a16_w16_h16.png b/test/pagespeed/kernel/image/testdata/resized/basn6a16_w16_h16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basn6a16_w16_h16.png
rename to test/pagespeed/kernel/image/testdata/resized/basn6a16_w16_h16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basn6a16_w16_h25.png b/test/pagespeed/kernel/image/testdata/resized/basn6a16_w16_h25.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basn6a16_w16_h25.png
rename to test/pagespeed/kernel/image/testdata/resized/basn6a16_w16_h25.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basn6a16_w31_h31.png b/test/pagespeed/kernel/image/testdata/resized/basn6a16_w31_h31.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basn6a16_w31_h31.png
rename to test/pagespeed/kernel/image/testdata/resized/basn6a16_w31_h31.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basn6a16_w32_h32.png b/test/pagespeed/kernel/image/testdata/resized/basn6a16_w32_h32.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basn6a16_w32_h32.png
rename to test/pagespeed/kernel/image/testdata/resized/basn6a16_w32_h32.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basn6a16_w32_h5.png b/test/pagespeed/kernel/image/testdata/resized/basn6a16_w32_h5.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basn6a16_w32_h5.png
rename to test/pagespeed/kernel/image/testdata/resized/basn6a16_w32_h5.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basn6a16_w3_h3.png b/test/pagespeed/kernel/image/testdata/resized/basn6a16_w3_h3.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basn6a16_w3_h3.png
rename to test/pagespeed/kernel/image/testdata/resized/basn6a16_w3_h3.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basn6a16_w3_h32.png b/test/pagespeed/kernel/image/testdata/resized/basn6a16_w3_h32.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basn6a16_w3_h32.png
rename to test/pagespeed/kernel/image/testdata/resized/basn6a16_w3_h32.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/basn6a16_w8_h8.png b/test/pagespeed/kernel/image/testdata/resized/basn6a16_w8_h8.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/basn6a16_w8_h8.png
rename to test/pagespeed/kernel/image/testdata/resized/basn6a16_w8_h8.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/large_w16_h16.png b/test/pagespeed/kernel/image/testdata/resized/large_w16_h16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/large_w16_h16.png
rename to test/pagespeed/kernel/image/testdata/resized/large_w16_h16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/large_w16_h25.png b/test/pagespeed/kernel/image/testdata/resized/large_w16_h25.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/large_w16_h25.png
rename to test/pagespeed/kernel/image/testdata/resized/large_w16_h25.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/large_w31_h31.png b/test/pagespeed/kernel/image/testdata/resized/large_w31_h31.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/large_w31_h31.png
rename to test/pagespeed/kernel/image/testdata/resized/large_w31_h31.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/large_w32_h32.png b/test/pagespeed/kernel/image/testdata/resized/large_w32_h32.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/large_w32_h32.png
rename to test/pagespeed/kernel/image/testdata/resized/large_w32_h32.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/large_w32_h5.png b/test/pagespeed/kernel/image/testdata/resized/large_w32_h5.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/large_w32_h5.png
rename to test/pagespeed/kernel/image/testdata/resized/large_w32_h5.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/large_w3_h3.png b/test/pagespeed/kernel/image/testdata/resized/large_w3_h3.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/large_w3_h3.png
rename to test/pagespeed/kernel/image/testdata/resized/large_w3_h3.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/large_w3_h32.png b/test/pagespeed/kernel/image/testdata/resized/large_w3_h32.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/large_w3_h32.png
rename to test/pagespeed/kernel/image/testdata/resized/large_w3_h32.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/large_w8_h8.png b/test/pagespeed/kernel/image/testdata/resized/large_w8_h8.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/large_w8_h8.png
rename to test/pagespeed/kernel/image/testdata/resized/large_w8_h8.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w16_h16.png b/test/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w16_h16.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w16_h16.png
rename to test/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w16_h16.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w16_h25.png b/test/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w16_h25.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w16_h25.png
rename to test/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w16_h25.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w31_h31.png b/test/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w31_h31.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w31_h31.png
rename to test/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w31_h31.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w32_h32.png b/test/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w32_h32.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w32_h32.png
rename to test/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w32_h32.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w32_h5.png b/test/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w32_h5.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w32_h5.png
rename to test/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w32_h5.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w3_h3.png b/test/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w3_h3.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w3_h3.png
rename to test/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w3_h3.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w3_h32.png b/test/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w3_h32.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w3_h32.png
rename to test/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w3_h32.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w8_h8.png b/test/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w8_h8.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w8_h8.png
rename to test/pagespeed/kernel/image/testdata/resized/pagespeed-33x34_w8_h8.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/webp/alpha_32x32.png b/test/pagespeed/kernel/image/testdata/webp/alpha_32x32.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/webp/alpha_32x32.png
rename to test/pagespeed/kernel/image/testdata/webp/alpha_32x32.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/webp/alpha_32x32.webp b/test/pagespeed/kernel/image/testdata/webp/alpha_32x32.webp
similarity index 100%
rename from pagespeed/kernel/image/testdata/webp/alpha_32x32.webp
rename to test/pagespeed/kernel/image/testdata/webp/alpha_32x32.webp
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/webp/animated.webp b/test/pagespeed/kernel/image/testdata/webp/animated.webp
similarity index 100%
rename from pagespeed/kernel/image/testdata/webp/animated.webp
rename to test/pagespeed/kernel/image/testdata/webp/animated.webp
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/webp/completely_opaque_32x20.png b/test/pagespeed/kernel/image/testdata/webp/completely_opaque_32x20.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/webp/completely_opaque_32x20.png
rename to test/pagespeed/kernel/image/testdata/webp/completely_opaque_32x20.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/webp/corrupt_body.webp b/test/pagespeed/kernel/image/testdata/webp/corrupt_body.webp
similarity index 100%
rename from pagespeed/kernel/image/testdata/webp/corrupt_body.webp
rename to test/pagespeed/kernel/image/testdata/webp/corrupt_body.webp
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/webp/corrupt_header.webp b/test/pagespeed/kernel/image/testdata/webp/corrupt_header.webp
similarity index 100%
rename from pagespeed/kernel/image/testdata/webp/corrupt_header.webp
rename to test/pagespeed/kernel/image/testdata/webp/corrupt_header.webp
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/webp/gray_saved_as_gray.png b/test/pagespeed/kernel/image/testdata/webp/gray_saved_as_gray.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/webp/gray_saved_as_gray.png
rename to test/pagespeed/kernel/image/testdata/webp/gray_saved_as_gray.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/webp/gray_saved_as_rgb.png b/test/pagespeed/kernel/image/testdata/webp/gray_saved_as_rgb.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/webp/gray_saved_as_rgb.png
rename to test/pagespeed/kernel/image/testdata/webp/gray_saved_as_rgb.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/webp/gray_saved_as_rgb.webp b/test/pagespeed/kernel/image/testdata/webp/gray_saved_as_rgb.webp
similarity index 100%
rename from pagespeed/kernel/image/testdata/webp/gray_saved_as_rgb.webp
rename to test/pagespeed/kernel/image/testdata/webp/gray_saved_as_rgb.webp
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/webp/icc_xmp_ex.webp b/test/pagespeed/kernel/image/testdata/webp/icc_xmp_ex.webp
similarity index 100%
rename from pagespeed/kernel/image/testdata/webp/icc_xmp_ex.webp
rename to test/pagespeed/kernel/image/testdata/webp/icc_xmp_ex.webp
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/webp/img3.webpla b/test/pagespeed/kernel/image/testdata/webp/img3.webpla
similarity index 100%
rename from pagespeed/kernel/image/testdata/webp/img3.webpla
rename to test/pagespeed/kernel/image/testdata/webp/img3.webpla
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/webp/multiple_frame_opaque.gif b/test/pagespeed/kernel/image/testdata/webp/multiple_frame_opaque.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/webp/multiple_frame_opaque.gif
rename to test/pagespeed/kernel/image/testdata/webp/multiple_frame_opaque.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/webp/multiple_frame_opaque_gray.gif b/test/pagespeed/kernel/image/testdata/webp/multiple_frame_opaque_gray.gif
similarity index 100%
rename from pagespeed/kernel/image/testdata/webp/multiple_frame_opaque_gray.gif
rename to test/pagespeed/kernel/image/testdata/webp/multiple_frame_opaque_gray.gif
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/webp/opaque_32x20.png b/test/pagespeed/kernel/image/testdata/webp/opaque_32x20.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/webp/opaque_32x20.png
rename to test/pagespeed/kernel/image/testdata/webp/opaque_32x20.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/webp/opaque_32x20.webp b/test/pagespeed/kernel/image/testdata/webp/opaque_32x20.webp
similarity index 100%
rename from pagespeed/kernel/image/testdata/webp/opaque_32x20.webp
rename to test/pagespeed/kernel/image/testdata/webp/opaque_32x20.webp
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/webp/pagespeed_32x32_gray.png b/test/pagespeed/kernel/image/testdata/webp/pagespeed_32x32_gray.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/webp/pagespeed_32x32_gray.png
rename to test/pagespeed/kernel/image/testdata/webp/pagespeed_32x32_gray.png
Binary files differ
diff --git a/pagespeed/kernel/image/testdata/webp/partially_opaque_32x20.png b/test/pagespeed/kernel/image/testdata/webp/partially_opaque_32x20.png
similarity index 100%
rename from pagespeed/kernel/image/testdata/webp/partially_opaque_32x20.png
rename to test/pagespeed/kernel/image/testdata/webp/partially_opaque_32x20.png
Binary files differ
diff --git a/pagespeed/kernel/image/webp_optimizer_test.cc b/test/pagespeed/kernel/image/webp_optimizer_test.cc
similarity index 99%
rename from pagespeed/kernel/image/webp_optimizer_test.cc
rename to test/pagespeed/kernel/image/webp_optimizer_test.cc
index 048bd6b..c080592 100644
--- a/pagespeed/kernel/image/webp_optimizer_test.cc
+++ b/test/pagespeed/kernel/image/webp_optimizer_test.cc
@@ -28,9 +28,9 @@
#include "pagespeed/kernel/image/image_util.h"
#include "pagespeed/kernel/image/png_optimizer.h"
#include "pagespeed/kernel/image/read_image.h"
-#include "pagespeed/kernel/image/test_utils.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
+#include "test/pagespeed/kernel/image/test_utils.h"
namespace {
diff --git a/test/pagespeed/kernel/js/BUILD b/test/pagespeed/kernel/js/BUILD
new file mode 100644
index 0000000..52c2d6b
--- /dev/null
+++ b/test/pagespeed/kernel/js/BUILD
@@ -0,0 +1,15 @@
+load(
+ "//bazel:pagespeed_test.bzl",
+ "pagespeed_cc_test",
+)
+
+licenses(["notice"]) # Apache 2
+
+pagespeed_cc_test(
+ name = "js",
+ srcs = glob(["*_test.cc"]),
+ data = glob(["testdata/third_party/*"]),
+ deps = [
+ "//pagespeed/kernel/js",
+ ],
+)
diff --git a/pagespeed/kernel/js/js_minify_test.cc b/test/pagespeed/kernel/js/js_minify_test.cc
similarity index 99%
rename from pagespeed/kernel/js/js_minify_test.cc
rename to test/pagespeed/kernel/js/js_minify_test.cc
index 847ea1d..c2ee744 100644
--- a/pagespeed/kernel/js/js_minify_test.cc
+++ b/test/pagespeed/kernel/js/js_minify_test.cc
@@ -85,7 +85,7 @@
"is.ie=is.ns=false;is.opera=true;}"
"if(is.ua.indexOf('gecko')>=0){is.ie=is.ns=false;is.gecko=true;}";
-const char kTestRootDir[] = "/pagespeed/kernel/js/testdata/third_party/";
+const char kTestRootDir[] = "/test/pagespeed/kernel/js/testdata/third_party/";
class JsMinifyTest : public testing::Test {
protected:
diff --git a/pagespeed/kernel/js/js_tokenizer_test.cc b/test/pagespeed/kernel/js/js_tokenizer_test.cc
similarity index 99%
rename from pagespeed/kernel/js/js_tokenizer_test.cc
rename to test/pagespeed/kernel/js/js_tokenizer_test.cc
index d4bb016..48d29e6 100644
--- a/pagespeed/kernel/js/js_tokenizer_test.cc
+++ b/test/pagespeed/kernel/js/js_tokenizer_test.cc
@@ -35,7 +35,7 @@
namespace {
-const char kTestRootDir[] = "/pagespeed/kernel/js/testdata/third_party/";
+const char kTestRootDir[] = "/test/pagespeed/kernel/js/testdata/third_party/";
class JsTokenizerTest : public testing::Test {
protected:
diff --git a/pagespeed/kernel/js/testdata/third_party/angular.minified b/test/pagespeed/kernel/js/testdata/third_party/angular.minified
similarity index 100%
rename from pagespeed/kernel/js/testdata/third_party/angular.minified
rename to test/pagespeed/kernel/js/testdata/third_party/angular.minified
diff --git a/pagespeed/kernel/js/testdata/third_party/angular.original b/test/pagespeed/kernel/js/testdata/third_party/angular.original
similarity index 100%
rename from pagespeed/kernel/js/testdata/third_party/angular.original
rename to test/pagespeed/kernel/js/testdata/third_party/angular.original
diff --git a/pagespeed/kernel/js/testdata/third_party/jquery.minified b/test/pagespeed/kernel/js/testdata/third_party/jquery.minified
similarity index 100%
rename from pagespeed/kernel/js/testdata/third_party/jquery.minified
rename to test/pagespeed/kernel/js/testdata/third_party/jquery.minified
diff --git a/pagespeed/kernel/js/testdata/third_party/jquery.original b/test/pagespeed/kernel/js/testdata/third_party/jquery.original
similarity index 100%
rename from pagespeed/kernel/js/testdata/third_party/jquery.original
rename to test/pagespeed/kernel/js/testdata/third_party/jquery.original
diff --git a/pagespeed/kernel/js/testdata/third_party/prototype.minified b/test/pagespeed/kernel/js/testdata/third_party/prototype.minified
similarity index 100%
rename from pagespeed/kernel/js/testdata/third_party/prototype.minified
rename to test/pagespeed/kernel/js/testdata/third_party/prototype.minified
diff --git a/pagespeed/kernel/js/testdata/third_party/prototype.original b/test/pagespeed/kernel/js/testdata/third_party/prototype.original
similarity index 100%
rename from pagespeed/kernel/js/testdata/third_party/prototype.original
rename to test/pagespeed/kernel/js/testdata/third_party/prototype.original
diff --git a/test/pagespeed/kernel/sharedmem/BUILD b/test/pagespeed/kernel/sharedmem/BUILD
new file mode 100644
index 0000000..0ca42aa
--- /dev/null
+++ b/test/pagespeed/kernel/sharedmem/BUILD
@@ -0,0 +1,47 @@
+load(
+ "//bazel:pagespeed_test.bzl",
+ "pagespeed_cc_test",
+ "pagespeed_cc_test_library",
+)
+
+licenses(["notice"]) # Apache 2
+
+pagespeed_cc_test_library(
+ name = "test_base",
+ srcs = [
+ "shared_circular_buffer_test_base.cc",
+ "shared_dynamic_string_map_test_base.cc",
+ "shared_mem_cache_data_test_base.cc",
+ "shared_mem_cache_test_base.cc",
+ "shared_mem_lock_manager_test_base.cc",
+ "shared_mem_statistics_test_base.cc",
+ "shared_mem_test_base.cc",
+ ],
+ hdrs = [
+ "shared_circular_buffer_test_base.h",
+ "shared_dynamic_string_map_test_base.h",
+ "shared_mem_cache_data_test_base.h",
+ "shared_mem_cache_test_base.h",
+ "shared_mem_lock_manager_test_base.h",
+ "shared_mem_statistics_test_base.h",
+ "shared_mem_test_base.h",
+ ],
+ deps = [
+ "//pagespeed/kernel/sharedmem",
+ "//test/pagespeed/kernel/base:kernel_test_util",
+ "//test/pagespeed/kernel/cache:cache_test_base",
+ "//test/pagespeed/kernel/thread:thread_test_base",
+ "//test/pagespeed/kernel/util:util_test_base",
+ ],
+)
+
+pagespeed_cc_test(
+ name = "sharedmem",
+ srcs = glob(["*_test.cc"]),
+ shard_count = 1,
+ deps = [
+ "//pagespeed/kernel/cache",
+ "//pagespeed/kernel/sharedmem",
+ "//test/pagespeed/kernel/sharedmem:test_base",
+ ],
+)
diff --git a/pagespeed/kernel/sharedmem/inprocess_shared_mem_test.cc b/test/pagespeed/kernel/sharedmem/inprocess_shared_mem_test.cc
similarity index 88%
rename from pagespeed/kernel/sharedmem/inprocess_shared_mem_test.cc
rename to test/pagespeed/kernel/sharedmem/inprocess_shared_mem_test.cc
index 703705d..4bb0c77 100644
--- a/pagespeed/kernel/sharedmem/inprocess_shared_mem_test.cc
+++ b/test/pagespeed/kernel/sharedmem/inprocess_shared_mem_test.cc
@@ -33,15 +33,15 @@
#include "pagespeed/kernel/base/stl_util.h"
#include "pagespeed/kernel/base/thread.h"
#include "pagespeed/kernel/base/thread_system.h"
-#include "pagespeed/kernel/sharedmem/shared_circular_buffer_test_base.h"
-#include "pagespeed/kernel/sharedmem/shared_dynamic_string_map_test_base.h"
-#include "pagespeed/kernel/sharedmem/shared_mem_cache_data_test_base.h"
-#include "pagespeed/kernel/sharedmem/shared_mem_cache_test_base.h"
-#include "pagespeed/kernel/sharedmem/shared_mem_lock_manager_test_base.h"
-#include "pagespeed/kernel/sharedmem/shared_mem_statistics_test_base.h"
-#include "pagespeed/kernel/sharedmem/shared_mem_test_base.h"
#include "pagespeed/kernel/util/platform.h"
#include "test/pagespeed/kernel/base/gtest.h"
+#include "test/pagespeed/kernel/sharedmem/shared_circular_buffer_test_base.h"
+#include "test/pagespeed/kernel/sharedmem/shared_dynamic_string_map_test_base.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_cache_data_test_base.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_cache_test_base.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_lock_manager_test_base.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_statistics_test_base.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_test_base.h"
namespace net_instaweb {
diff --git a/pagespeed/kernel/sharedmem/pthread_shared_mem_test.cc b/test/pagespeed/kernel/sharedmem/pthread_shared_mem_test.cc
similarity index 91%
rename from pagespeed/kernel/sharedmem/pthread_shared_mem_test.cc
rename to test/pagespeed/kernel/sharedmem/pthread_shared_mem_test.cc
index 93d9b54..cc4b928 100644
--- a/pagespeed/kernel/sharedmem/pthread_shared_mem_test.cc
+++ b/test/pagespeed/kernel/sharedmem/pthread_shared_mem_test.cc
@@ -29,14 +29,14 @@
#include "pagespeed/kernel/base/abstract_shared_mem.h"
#include "pagespeed/kernel/base/function.h"
-#include "pagespeed/kernel/sharedmem/shared_circular_buffer_test_base.h"
-#include "pagespeed/kernel/sharedmem/shared_dynamic_string_map_test_base.h"
-#include "pagespeed/kernel/sharedmem/shared_mem_cache_data_test_base.h"
-#include "pagespeed/kernel/sharedmem/shared_mem_cache_test_base.h"
-#include "pagespeed/kernel/sharedmem/shared_mem_lock_manager_test_base.h"
-#include "pagespeed/kernel/sharedmem/shared_mem_statistics_test_base.h"
-#include "pagespeed/kernel/sharedmem/shared_mem_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
+#include "test/pagespeed/kernel/sharedmem/shared_circular_buffer_test_base.h"
+#include "test/pagespeed/kernel/sharedmem/shared_dynamic_string_map_test_base.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_cache_data_test_base.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_cache_test_base.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_lock_manager_test_base.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_statistics_test_base.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_test_base.h"
namespace net_instaweb {
diff --git a/pagespeed/kernel/sharedmem/shared_circular_buffer_test_base.cc b/test/pagespeed/kernel/sharedmem/shared_circular_buffer_test_base.cc
similarity index 97%
rename from pagespeed/kernel/sharedmem/shared_circular_buffer_test_base.cc
rename to test/pagespeed/kernel/sharedmem/shared_circular_buffer_test_base.cc
index 0ef70c4..bc80c08 100644
--- a/pagespeed/kernel/sharedmem/shared_circular_buffer_test_base.cc
+++ b/test/pagespeed/kernel/sharedmem/shared_circular_buffer_test_base.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "pagespeed/kernel/sharedmem/shared_circular_buffer_test_base.h"
+#include "test/pagespeed/kernel/sharedmem/shared_circular_buffer_test_base.h"
#include "pagespeed/kernel/base/function.h"
#include "pagespeed/kernel/base/null_message_handler.h"
@@ -25,10 +25,10 @@
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/base/thread_system.h"
#include "pagespeed/kernel/sharedmem/shared_circular_buffer.h"
-#include "pagespeed/kernel/sharedmem/shared_mem_test_base.h"
#include "pagespeed/kernel/util/platform.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_test_base.h"
namespace net_instaweb {
diff --git a/pagespeed/kernel/sharedmem/shared_circular_buffer_test_base.h b/test/pagespeed/kernel/sharedmem/shared_circular_buffer_test_base.h
similarity index 98%
rename from pagespeed/kernel/sharedmem/shared_circular_buffer_test_base.h
rename to test/pagespeed/kernel/sharedmem/shared_circular_buffer_test_base.h
index 0c5452e..4e60bfc 100644
--- a/pagespeed/kernel/sharedmem/shared_circular_buffer_test_base.h
+++ b/test/pagespeed/kernel/sharedmem/shared_circular_buffer_test_base.h
@@ -25,9 +25,9 @@
#include "pagespeed/kernel/base/null_message_handler.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string_util.h"
-#include "pagespeed/kernel/sharedmem/shared_mem_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_test_base.h"
namespace net_instaweb {
diff --git a/pagespeed/kernel/sharedmem/shared_dynamic_string_map_test_base.cc b/test/pagespeed/kernel/sharedmem/shared_dynamic_string_map_test_base.cc
similarity index 98%
rename from pagespeed/kernel/sharedmem/shared_dynamic_string_map_test_base.cc
rename to test/pagespeed/kernel/sharedmem/shared_dynamic_string_map_test_base.cc
index 18f34bc..7f7128d 100644
--- a/pagespeed/kernel/sharedmem/shared_dynamic_string_map_test_base.cc
+++ b/test/pagespeed/kernel/sharedmem/shared_dynamic_string_map_test_base.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "pagespeed/kernel/sharedmem/shared_dynamic_string_map_test_base.h"
+#include "test/pagespeed/kernel/sharedmem/shared_dynamic_string_map_test_base.h"
#include <cmath>
#include <cstddef>
diff --git a/pagespeed/kernel/sharedmem/shared_dynamic_string_map_test_base.h b/test/pagespeed/kernel/sharedmem/shared_dynamic_string_map_test_base.h
similarity index 98%
rename from pagespeed/kernel/sharedmem/shared_dynamic_string_map_test_base.h
rename to test/pagespeed/kernel/sharedmem/shared_dynamic_string_map_test_base.h
index 056e41d..e3f9694 100644
--- a/pagespeed/kernel/sharedmem/shared_dynamic_string_map_test_base.h
+++ b/test/pagespeed/kernel/sharedmem/shared_dynamic_string_map_test_base.h
@@ -26,9 +26,9 @@
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string.h"
-#include "pagespeed/kernel/sharedmem/shared_mem_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_test_base.h"
namespace net_instaweb {
class SharedDynamicStringMap;
diff --git a/pagespeed/kernel/sharedmem/shared_mem_cache_data_test_base.cc b/test/pagespeed/kernel/sharedmem/shared_mem_cache_data_test_base.cc
similarity index 99%
rename from pagespeed/kernel/sharedmem/shared_mem_cache_data_test_base.cc
rename to test/pagespeed/kernel/sharedmem/shared_mem_cache_data_test_base.cc
index acf2211..b1f9c7a 100644
--- a/pagespeed/kernel/sharedmem/shared_mem_cache_data_test_base.cc
+++ b/test/pagespeed/kernel/sharedmem/shared_mem_cache_data_test_base.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "pagespeed/kernel/sharedmem/shared_mem_cache_data_test_base.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_cache_data_test_base.h"
#include <cstddef> // for size_t
#include <set>
diff --git a/pagespeed/kernel/sharedmem/shared_mem_cache_data_test_base.h b/test/pagespeed/kernel/sharedmem/shared_mem_cache_data_test_base.h
similarity index 97%
rename from pagespeed/kernel/sharedmem/shared_mem_cache_data_test_base.h
rename to test/pagespeed/kernel/sharedmem/shared_mem_cache_data_test_base.h
index 9398bf9..ad1dd8d 100644
--- a/pagespeed/kernel/sharedmem/shared_mem_cache_data_test_base.h
+++ b/test/pagespeed/kernel/sharedmem/shared_mem_cache_data_test_base.h
@@ -26,9 +26,9 @@
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/sharedmem/shared_mem_cache_data.h"
-#include "pagespeed/kernel/sharedmem/shared_mem_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_test_base.h"
namespace net_instaweb {
diff --git a/pagespeed/kernel/sharedmem/shared_mem_cache_spammer_test.cc b/test/pagespeed/kernel/sharedmem/shared_mem_cache_spammer_test.cc
similarity index 100%
rename from pagespeed/kernel/sharedmem/shared_mem_cache_spammer_test.cc
rename to test/pagespeed/kernel/sharedmem/shared_mem_cache_spammer_test.cc
diff --git a/pagespeed/kernel/sharedmem/shared_mem_cache_test_base.cc b/test/pagespeed/kernel/sharedmem/shared_mem_cache_test_base.cc
similarity index 99%
rename from pagespeed/kernel/sharedmem/shared_mem_cache_test_base.cc
rename to test/pagespeed/kernel/sharedmem/shared_mem_cache_test_base.cc
index b20020b..5be8583 100644
--- a/pagespeed/kernel/sharedmem/shared_mem_cache_test_base.cc
+++ b/test/pagespeed/kernel/sharedmem/shared_mem_cache_test_base.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "pagespeed/kernel/sharedmem/shared_mem_cache_test_base.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_cache_test_base.h"
#include <unistd.h>
diff --git a/pagespeed/kernel/sharedmem/shared_mem_cache_test_base.h b/test/pagespeed/kernel/sharedmem/shared_mem_cache_test_base.h
similarity index 98%
rename from pagespeed/kernel/sharedmem/shared_mem_cache_test_base.h
rename to test/pagespeed/kernel/sharedmem/shared_mem_cache_test_base.h
index fe7dffc..0cf25c2 100644
--- a/pagespeed/kernel/sharedmem/shared_mem_cache_test_base.h
+++ b/test/pagespeed/kernel/sharedmem/shared_mem_cache_test_base.h
@@ -26,7 +26,6 @@
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/sharedmem/shared_mem_cache.h"
-#include "pagespeed/kernel/sharedmem/shared_mem_test_base.h"
#include "pagespeed/kernel/thread/slow_worker.h"
#include "pagespeed/kernel/util/simple_stats.h"
#include "test/pagespeed/kernel/base/gtest.h"
@@ -34,6 +33,7 @@
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
#include "test/pagespeed/kernel/cache/cache_test_base.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_test_base.h"
namespace net_instaweb {
diff --git a/pagespeed/kernel/sharedmem/shared_mem_lock_manager_test_base.cc b/test/pagespeed/kernel/sharedmem/shared_mem_lock_manager_test_base.cc
similarity index 97%
rename from pagespeed/kernel/sharedmem/shared_mem_lock_manager_test_base.cc
rename to test/pagespeed/kernel/sharedmem/shared_mem_lock_manager_test_base.cc
index fd6f9b4..96846a7 100644
--- a/pagespeed/kernel/sharedmem/shared_mem_lock_manager_test_base.cc
+++ b/test/pagespeed/kernel/sharedmem/shared_mem_lock_manager_test_base.cc
@@ -17,18 +17,18 @@
* under the License.
*/
-#include "pagespeed/kernel/sharedmem/shared_mem_lock_manager_test_base.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_lock_manager_test_base.h"
#include "pagespeed/kernel/base/function.h"
#include "pagespeed/kernel/base/md5_hasher.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/sharedmem/shared_mem_lock_manager.h"
-#include "pagespeed/kernel/sharedmem/shared_mem_test_base.h"
#include "pagespeed/kernel/thread/scheduler_based_abstract_lock.h"
#include "pagespeed/kernel/util/platform.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_test_base.h"
namespace net_instaweb {
diff --git a/pagespeed/kernel/sharedmem/shared_mem_lock_manager_test_base.h b/test/pagespeed/kernel/sharedmem/shared_mem_lock_manager_test_base.h
similarity index 97%
rename from pagespeed/kernel/sharedmem/shared_mem_lock_manager_test_base.h
rename to test/pagespeed/kernel/sharedmem/shared_mem_lock_manager_test_base.h
index e66abd9..11b07d3 100644
--- a/pagespeed/kernel/sharedmem/shared_mem_lock_manager_test_base.h
+++ b/test/pagespeed/kernel/sharedmem/shared_mem_lock_manager_test_base.h
@@ -26,10 +26,10 @@
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/thread_system.h"
#include "pagespeed/kernel/sharedmem/shared_mem_lock_manager.h"
-#include "pagespeed/kernel/sharedmem/shared_mem_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_test_base.h"
#include "test/pagespeed/kernel/thread/mock_scheduler.h"
namespace net_instaweb {
diff --git a/pagespeed/kernel/sharedmem/shared_mem_statistics_test_base.cc b/test/pagespeed/kernel/sharedmem/shared_mem_statistics_test_base.cc
similarity index 98%
rename from pagespeed/kernel/sharedmem/shared_mem_statistics_test_base.cc
rename to test/pagespeed/kernel/sharedmem/shared_mem_statistics_test_base.cc
index 0051acf..002ea70 100644
--- a/pagespeed/kernel/sharedmem/shared_mem_statistics_test_base.cc
+++ b/test/pagespeed/kernel/sharedmem/shared_mem_statistics_test_base.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "pagespeed/kernel/sharedmem/shared_mem_statistics_test_base.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_statistics_test_base.h"
#include <memory>
@@ -28,10 +28,10 @@
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_writer.h"
#include "pagespeed/kernel/base/timer.h"
-#include "pagespeed/kernel/sharedmem/shared_mem_test_base.h"
#include "pagespeed/kernel/util/platform.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_test_base.h"
namespace net_instaweb {
diff --git a/pagespeed/kernel/sharedmem/shared_mem_statistics_test_base.h b/test/pagespeed/kernel/sharedmem/shared_mem_statistics_test_base.h
similarity index 98%
rename from pagespeed/kernel/sharedmem/shared_mem_statistics_test_base.h
rename to test/pagespeed/kernel/sharedmem/shared_mem_statistics_test_base.h
index 5410cd1..cbf6b40 100644
--- a/pagespeed/kernel/sharedmem/shared_mem_statistics_test_base.h
+++ b/test/pagespeed/kernel/sharedmem/shared_mem_statistics_test_base.h
@@ -26,11 +26,11 @@
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/base/thread_system.h"
#include "pagespeed/kernel/sharedmem/shared_mem_statistics.h"
-#include "pagespeed/kernel/sharedmem/shared_mem_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mem_file_system.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_test_base.h"
namespace net_instaweb {
diff --git a/pagespeed/kernel/sharedmem/shared_mem_test_base.cc b/test/pagespeed/kernel/sharedmem/shared_mem_test_base.cc
similarity index 99%
rename from pagespeed/kernel/sharedmem/shared_mem_test_base.cc
rename to test/pagespeed/kernel/sharedmem/shared_mem_test_base.cc
index 3cd66fd..48065e4 100644
--- a/pagespeed/kernel/sharedmem/shared_mem_test_base.cc
+++ b/test/pagespeed/kernel/sharedmem/shared_mem_test_base.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "pagespeed/kernel/sharedmem/shared_mem_test_base.h"
+#include "test/pagespeed/kernel/sharedmem/shared_mem_test_base.h"
#include <cstddef>
diff --git a/pagespeed/kernel/sharedmem/shared_mem_test_base.h b/test/pagespeed/kernel/sharedmem/shared_mem_test_base.h
similarity index 100%
rename from pagespeed/kernel/sharedmem/shared_mem_test_base.h
rename to test/pagespeed/kernel/sharedmem/shared_mem_test_base.h
diff --git a/test/pagespeed/kernel/util/BUILD b/test/pagespeed/kernel/util/BUILD
new file mode 100644
index 0000000..3594f50
--- /dev/null
+++ b/test/pagespeed/kernel/util/BUILD
@@ -0,0 +1,35 @@
+load(
+ "//bazel:pagespeed_test.bzl",
+ "pagespeed_cc_test",
+ "pagespeed_cc_test_library",
+)
+
+licenses(["notice"]) # Apache 2
+
+
+pagespeed_cc_test_library(
+ name = "util_test_base",
+ srcs = [
+ "lock_manager_spammer.cc",
+ "mock_nonce_generator.cc",
+ "nonce_generator_test_base.cc",
+ ],
+ hdrs = [
+ "lock_manager_spammer.h",
+ "mock_nonce_generator.h",
+ "nonce_generator_test_base.h",
+ ],
+ deps = [
+ "//pagespeed/kernel/util",
+ "//test/pagespeed/kernel/base:kernel_test_util",
+ "//test/pagespeed/kernel/thread:thread_test_base",
+ ],
+)
+
+pagespeed_cc_test(
+ name = "util",
+ srcs = glob(["*_test.cc"]),
+ deps = [
+ "//test/pagespeed/kernel/util:util_test_base",
+ ],
+)
diff --git a/pagespeed/kernel/util/brotli_inflater_test.cc b/test/pagespeed/kernel/util/brotli_inflater_test.cc
similarity index 100%
rename from pagespeed/kernel/util/brotli_inflater_test.cc
rename to test/pagespeed/kernel/util/brotli_inflater_test.cc
diff --git a/pagespeed/kernel/util/categorized_refcount_test.cc b/test/pagespeed/kernel/util/categorized_refcount_test.cc
similarity index 100%
rename from pagespeed/kernel/util/categorized_refcount_test.cc
rename to test/pagespeed/kernel/util/categorized_refcount_test.cc
diff --git a/pagespeed/kernel/util/copy_on_write_test.cc b/test/pagespeed/kernel/util/copy_on_write_test.cc
similarity index 100%
rename from pagespeed/kernel/util/copy_on_write_test.cc
rename to test/pagespeed/kernel/util/copy_on_write_test.cc
diff --git a/pagespeed/kernel/util/file_system_lock_manager_test.cc b/test/pagespeed/kernel/util/file_system_lock_manager_test.cc
similarity index 100%
rename from pagespeed/kernel/util/file_system_lock_manager_test.cc
rename to test/pagespeed/kernel/util/file_system_lock_manager_test.cc
diff --git a/pagespeed/kernel/util/gzip_inflater_test.cc b/test/pagespeed/kernel/util/gzip_inflater_test.cc
similarity index 100%
rename from pagespeed/kernel/util/gzip_inflater_test.cc
rename to test/pagespeed/kernel/util/gzip_inflater_test.cc
diff --git a/pagespeed/kernel/util/hashed_nonce_generator_test.cc b/test/pagespeed/kernel/util/hashed_nonce_generator_test.cc
similarity index 97%
rename from pagespeed/kernel/util/hashed_nonce_generator_test.cc
rename to test/pagespeed/kernel/util/hashed_nonce_generator_test.cc
index 7230ffe..f281621 100644
--- a/pagespeed/kernel/util/hashed_nonce_generator_test.cc
+++ b/test/pagespeed/kernel/util/hashed_nonce_generator_test.cc
@@ -25,8 +25,8 @@
#include "pagespeed/kernel/base/md5_hasher.h"
#include "pagespeed/kernel/base/null_mutex.h"
#include "pagespeed/kernel/util/nonce_generator.h"
-#include "pagespeed/kernel/util/nonce_generator_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
+#include "test/pagespeed/kernel/util/nonce_generator_test_base.h"
namespace net_instaweb {
namespace {
diff --git a/pagespeed/kernel/util/input_file_nonce_generator_test.cc b/test/pagespeed/kernel/util/input_file_nonce_generator_test.cc
similarity index 96%
rename from pagespeed/kernel/util/input_file_nonce_generator_test.cc
rename to test/pagespeed/kernel/util/input_file_nonce_generator_test.cc
index 2409072..7dc0ed1 100644
--- a/pagespeed/kernel/util/input_file_nonce_generator_test.cc
+++ b/test/pagespeed/kernel/util/input_file_nonce_generator_test.cc
@@ -25,8 +25,8 @@
#include "pagespeed/kernel/base/null_mutex.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/stdio_file_system.h"
-#include "pagespeed/kernel/util/nonce_generator_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
+#include "test/pagespeed/kernel/util/nonce_generator_test_base.h"
namespace net_instaweb {
namespace {
diff --git a/pagespeed/kernel/util/lock_manager_spammer.cc b/test/pagespeed/kernel/util/lock_manager_spammer.cc
similarity index 98%
rename from pagespeed/kernel/util/lock_manager_spammer.cc
rename to test/pagespeed/kernel/util/lock_manager_spammer.cc
index 87fb00f..7bffbd9 100644
--- a/pagespeed/kernel/util/lock_manager_spammer.cc
+++ b/test/pagespeed/kernel/util/lock_manager_spammer.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "pagespeed/kernel/util/lock_manager_spammer.h"
+#include "test/pagespeed/kernel/util/lock_manager_spammer.h"
#include <vector>
diff --git a/pagespeed/kernel/util/lock_manager_spammer.h b/test/pagespeed/kernel/util/lock_manager_spammer.h
similarity index 100%
rename from pagespeed/kernel/util/lock_manager_spammer.h
rename to test/pagespeed/kernel/util/lock_manager_spammer.h
diff --git a/pagespeed/kernel/util/mem_lock_manager_test.cc b/test/pagespeed/kernel/util/mem_lock_manager_test.cc
similarity index 100%
rename from pagespeed/kernel/util/mem_lock_manager_test.cc
rename to test/pagespeed/kernel/util/mem_lock_manager_test.cc
diff --git a/pagespeed/kernel/util/mock_nonce_generator.cc b/test/pagespeed/kernel/util/mock_nonce_generator.cc
similarity index 94%
rename from pagespeed/kernel/util/mock_nonce_generator.cc
rename to test/pagespeed/kernel/util/mock_nonce_generator.cc
index 5c94220..94bb321 100644
--- a/pagespeed/kernel/util/mock_nonce_generator.cc
+++ b/test/pagespeed/kernel/util/mock_nonce_generator.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "pagespeed/kernel/util/mock_nonce_generator.h"
+#include "test/pagespeed/kernel/util/mock_nonce_generator.h"
#include "pagespeed/kernel/base/basictypes.h"
diff --git a/pagespeed/kernel/util/mock_nonce_generator.h b/test/pagespeed/kernel/util/mock_nonce_generator.h
similarity index 100%
rename from pagespeed/kernel/util/mock_nonce_generator.h
rename to test/pagespeed/kernel/util/mock_nonce_generator.h
diff --git a/pagespeed/kernel/util/nonce_generator_test_base.cc b/test/pagespeed/kernel/util/nonce_generator_test_base.cc
similarity index 97%
rename from pagespeed/kernel/util/nonce_generator_test_base.cc
rename to test/pagespeed/kernel/util/nonce_generator_test_base.cc
index d07e548..ed09b80 100644
--- a/pagespeed/kernel/util/nonce_generator_test_base.cc
+++ b/test/pagespeed/kernel/util/nonce_generator_test_base.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "pagespeed/kernel/util/nonce_generator_test_base.h"
+#include "test/pagespeed/kernel/util/nonce_generator_test_base.h"
#include <set>
#include <utility>
diff --git a/pagespeed/kernel/util/nonce_generator_test_base.h b/test/pagespeed/kernel/util/nonce_generator_test_base.h
similarity index 100%
rename from pagespeed/kernel/util/nonce_generator_test_base.h
rename to test/pagespeed/kernel/util/nonce_generator_test_base.h
diff --git a/pagespeed/kernel/util/re2_test.cc b/test/pagespeed/kernel/util/re2_test.cc
similarity index 100%
rename from pagespeed/kernel/util/re2_test.cc
rename to test/pagespeed/kernel/util/re2_test.cc
diff --git a/pagespeed/kernel/util/simple_stats_test.cc b/test/pagespeed/kernel/util/simple_stats_test.cc
similarity index 100%
rename from pagespeed/kernel/util/simple_stats_test.cc
rename to test/pagespeed/kernel/util/simple_stats_test.cc
diff --git a/pagespeed/kernel/util/statistics_logger_test.cc b/test/pagespeed/kernel/util/statistics_logger_test.cc
similarity index 100%
rename from pagespeed/kernel/util/statistics_logger_test.cc
rename to test/pagespeed/kernel/util/statistics_logger_test.cc
diff --git a/pagespeed/kernel/util/threadsafe_lock_manager_test.cc b/test/pagespeed/kernel/util/threadsafe_lock_manager_test.cc
similarity index 99%
rename from pagespeed/kernel/util/threadsafe_lock_manager_test.cc
rename to test/pagespeed/kernel/util/threadsafe_lock_manager_test.cc
index dc4e929..86601f2 100644
--- a/pagespeed/kernel/util/threadsafe_lock_manager_test.cc
+++ b/test/pagespeed/kernel/util/threadsafe_lock_manager_test.cc
@@ -37,12 +37,12 @@
#include "pagespeed/kernel/base/thread_system.h"
#include "pagespeed/kernel/base/timer.h"
#include "pagespeed/kernel/thread/scheduler.h"
-#include "pagespeed/kernel/util/lock_manager_spammer.h"
#include "pagespeed/kernel/util/platform.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
#include "test/pagespeed/kernel/base/named_lock_tester.h"
#include "test/pagespeed/kernel/thread/mock_scheduler.h"
+#include "test/pagespeed/kernel/util/lock_manager_spammer.h"
namespace net_instaweb {
diff --git a/pagespeed/kernel/util/url_escaper_test.cc b/test/pagespeed/kernel/util/url_escaper_test.cc
similarity index 100%
rename from pagespeed/kernel/util/url_escaper_test.cc
rename to test/pagespeed/kernel/util/url_escaper_test.cc
diff --git a/pagespeed/kernel/util/url_multipart_encoder_test.cc b/test/pagespeed/kernel/util/url_multipart_encoder_test.cc
similarity index 100%
rename from pagespeed/kernel/util/url_multipart_encoder_test.cc
rename to test/pagespeed/kernel/util/url_multipart_encoder_test.cc
diff --git a/pagespeed/kernel/util/url_to_filename_encoder_test.cc b/test/pagespeed/kernel/util/url_to_filename_encoder_test.cc
similarity index 100%
rename from pagespeed/kernel/util/url_to_filename_encoder_test.cc
rename to test/pagespeed/kernel/util/url_to_filename_encoder_test.cc
diff --git a/test/pagespeed/opt/ads/BUILD b/test/pagespeed/opt/ads/BUILD
new file mode 100644
index 0000000..d8120b6
--- /dev/null
+++ b/test/pagespeed/opt/ads/BUILD
@@ -0,0 +1,18 @@
+load(
+ "//bazel:pagespeed_test.bzl",
+ "pagespeed_cc_test",
+ "pagespeed_cc_test_library",
+)
+
+licenses(["notice"]) # Apache 2
+
+pagespeed_cc_test_library(
+ name = "test_base",
+ deps = ["//pagespeed/opt/ads"],
+)
+
+pagespeed_cc_test(
+ name = "ads",
+ srcs = glob(["*_test.cc"]),
+ deps = [":test_base"],
+)
diff --git a/pagespeed/opt/ads/ads_attribute_test.cc b/test/pagespeed/opt/ads/ads_attribute_test.cc
similarity index 100%
rename from pagespeed/opt/ads/ads_attribute_test.cc
rename to test/pagespeed/opt/ads/ads_attribute_test.cc
diff --git a/pagespeed/opt/ads/ads_util_test.cc b/test/pagespeed/opt/ads/ads_util_test.cc
similarity index 100%
rename from pagespeed/opt/ads/ads_util_test.cc
rename to test/pagespeed/opt/ads/ads_util_test.cc
diff --git a/pagespeed/opt/ads/show_ads_snippet_parser_test.cc b/test/pagespeed/opt/ads/show_ads_snippet_parser_test.cc
similarity index 100%
rename from pagespeed/opt/ads/show_ads_snippet_parser_test.cc
rename to test/pagespeed/opt/ads/show_ads_snippet_parser_test.cc
diff --git a/test/pagespeed/opt/http/BUILD b/test/pagespeed/opt/http/BUILD
new file mode 100644
index 0000000..e63860b
--- /dev/null
+++ b/test/pagespeed/opt/http/BUILD
@@ -0,0 +1,27 @@
+load(
+ "//bazel:pagespeed_test.bzl",
+ "pagespeed_cc_test",
+ "pagespeed_cc_test_library",
+)
+
+licenses(["notice"]) # Apache 2
+
+pagespeed_cc_test_library(
+ name = "test_base",
+ srcs = [
+ "mock_property_page.cc",
+ ],
+ hdrs = [
+ "mock_property_page.h",
+ ],
+ deps = [
+ "//pagespeed/opt/http",
+ "//test/pagespeed/kernel/base:kernel_test_util",
+ ],
+)
+
+pagespeed_cc_test(
+ name = "http",
+ srcs = glob(["*_test.cc"]),
+ deps = [":test_base"],
+)
diff --git a/pagespeed/opt/http/cache_property_store_test.cc b/test/pagespeed/opt/http/cache_property_store_test.cc
similarity index 99%
rename from pagespeed/opt/http/cache_property_store_test.cc
rename to test/pagespeed/opt/http/cache_property_store_test.cc
index de6dc00..1a8d04a 100644
--- a/pagespeed/opt/http/cache_property_store_test.cc
+++ b/test/pagespeed/opt/http/cache_property_store_test.cc
@@ -33,10 +33,10 @@
#include "pagespeed/kernel/util/platform.h"
#include "pagespeed/kernel/util/simple_stats.h"
#include "pagespeed/opt/http/abstract_property_store_get_callback.h"
-#include "pagespeed/opt/http/mock_property_page.h"
#include "pagespeed/opt/http/property_cache.pb.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
+#include "test/pagespeed/opt/http/mock_property_page.h"
namespace net_instaweb {
diff --git a/pagespeed/opt/http/fallback_property_page_test.cc b/test/pagespeed/opt/http/fallback_property_page_test.cc
similarity index 99%
rename from pagespeed/opt/http/fallback_property_page_test.cc
rename to test/pagespeed/opt/http/fallback_property_page_test.cc
index a05cd63..1f1efd9 100644
--- a/pagespeed/opt/http/fallback_property_page_test.cc
+++ b/test/pagespeed/opt/http/fallback_property_page_test.cc
@@ -29,11 +29,11 @@
#include "pagespeed/kernel/util/platform.h"
#include "pagespeed/kernel/util/simple_stats.h"
#include "pagespeed/opt/http/cache_property_store.h"
-#include "pagespeed/opt/http/mock_property_page.h"
#include "pagespeed/opt/http/property_cache.h"
#include "pagespeed/opt/http/property_store.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
+#include "test/pagespeed/opt/http/mock_property_page.h"
namespace net_instaweb {
diff --git a/pagespeed/opt/http/mock_property_page.cc b/test/pagespeed/opt/http/mock_property_page.cc
similarity index 93%
rename from pagespeed/opt/http/mock_property_page.cc
rename to test/pagespeed/opt/http/mock_property_page.cc
index 81b6bd0..0c17f58 100644
--- a/pagespeed/opt/http/mock_property_page.cc
+++ b/test/pagespeed/opt/http/mock_property_page.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "pagespeed/opt/http/mock_property_page.h"
+#include "test/pagespeed/opt/http/mock_property_page.h"
namespace net_instaweb {
diff --git a/pagespeed/opt/http/mock_property_page.h b/test/pagespeed/opt/http/mock_property_page.h
similarity index 100%
rename from pagespeed/opt/http/mock_property_page.h
rename to test/pagespeed/opt/http/mock_property_page.h
diff --git a/pagespeed/opt/http/property_cache_test.cc b/test/pagespeed/opt/http/property_cache_test.cc
similarity index 99%
rename from pagespeed/opt/http/property_cache_test.cc
rename to test/pagespeed/opt/http/property_cache_test.cc
index 8e0ed95..17716b8 100644
--- a/pagespeed/opt/http/property_cache_test.cc
+++ b/test/pagespeed/opt/http/property_cache_test.cc
@@ -32,10 +32,10 @@
#include "pagespeed/kernel/util/platform.h"
#include "pagespeed/kernel/util/simple_stats.h"
#include "pagespeed/opt/http/cache_property_store.h"
-#include "pagespeed/opt/http/mock_property_page.h"
#include "pagespeed/opt/http/property_store.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
+#include "test/pagespeed/opt/http/mock_property_page.h"
namespace net_instaweb {
diff --git a/pagespeed/opt/http/property_store_test.cc b/test/pagespeed/opt/http/property_store_test.cc
similarity index 100%
rename from pagespeed/opt/http/property_store_test.cc
rename to test/pagespeed/opt/http/property_store_test.cc
diff --git a/pagespeed/opt/http/request_context_test.cc b/test/pagespeed/opt/http/request_context_test.cc
similarity index 100%
rename from pagespeed/opt/http/request_context_test.cc
rename to test/pagespeed/opt/http/request_context_test.cc
diff --git a/pagespeed/opt/http/two_level_property_store_test.cc b/test/pagespeed/opt/http/two_level_property_store_test.cc
similarity index 99%
rename from pagespeed/opt/http/two_level_property_store_test.cc
rename to test/pagespeed/opt/http/two_level_property_store_test.cc
index 196cdbb..d4cf6e9 100644
--- a/pagespeed/opt/http/two_level_property_store_test.cc
+++ b/test/pagespeed/opt/http/two_level_property_store_test.cc
@@ -33,10 +33,10 @@
#include "pagespeed/kernel/util/simple_stats.h"
#include "pagespeed/opt/http/abstract_property_store_get_callback.h"
#include "pagespeed/opt/http/cache_property_store.h"
-#include "pagespeed/opt/http/mock_property_page.h"
#include "pagespeed/opt/http/property_cache.pb.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
+#include "test/pagespeed/opt/http/mock_property_page.h"
namespace net_instaweb {
diff --git a/test/pagespeed/opt/logging/BUILD b/test/pagespeed/opt/logging/BUILD
new file mode 100644
index 0000000..b38ca31
--- /dev/null
+++ b/test/pagespeed/opt/logging/BUILD
@@ -0,0 +1,29 @@
+load(
+ "//bazel:pagespeed_test.bzl",
+ "pagespeed_cc_test",
+ "pagespeed_cc_test_library",
+)
+
+licenses(["notice"]) # Apache 2
+
+pagespeed_cc_test_library(
+ name = "test_base",
+ srcs = [
+ "log_record_test_helper.cc",
+ ],
+ hdrs = [
+ "log_record_test_helper.h",
+ ],
+ deps = [
+ "//pagespeed/opt/logging",
+ "//test/pagespeed/kernel/base:kernel_test_util",
+ ],
+)
+
+pagespeed_cc_test(
+ name = "logging",
+ srcs = glob(["*_test.cc"]),
+ deps = [
+ ":test_base",
+ ],
+)
diff --git a/pagespeed/opt/logging/log_record_test.cc b/test/pagespeed/opt/logging/log_record_test.cc
similarity index 100%
rename from pagespeed/opt/logging/log_record_test.cc
rename to test/pagespeed/opt/logging/log_record_test.cc
diff --git a/pagespeed/opt/logging/log_record_test_helper.cc b/test/pagespeed/opt/logging/log_record_test_helper.cc
similarity index 96%
rename from pagespeed/opt/logging/log_record_test_helper.cc
rename to test/pagespeed/opt/logging/log_record_test_helper.cc
index 3b0cbe9..8d423bc 100644
--- a/pagespeed/opt/logging/log_record_test_helper.cc
+++ b/test/pagespeed/opt/logging/log_record_test_helper.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "pagespeed/opt/logging/log_record_test_helper.h"
+#include "test/pagespeed/opt/logging/log_record_test_helper.h"
namespace net_instaweb {
diff --git a/pagespeed/opt/logging/log_record_test_helper.h b/test/pagespeed/opt/logging/log_record_test_helper.h
similarity index 100%
rename from pagespeed/opt/logging/log_record_test_helper.h
rename to test/pagespeed/opt/logging/log_record_test_helper.h
diff --git a/pagespeed/opt/logging/request_timing_info_test.cc b/test/pagespeed/opt/logging/request_timing_info_test.cc
similarity index 100%
rename from pagespeed/opt/logging/request_timing_info_test.cc
rename to test/pagespeed/opt/logging/request_timing_info_test.cc
diff --git a/test/pagespeed/system/BUILD b/test/pagespeed/system/BUILD
new file mode 100644
index 0000000..b628e2b
--- /dev/null
+++ b/test/pagespeed/system/BUILD
@@ -0,0 +1,58 @@
+load("@rules_cc//cc:defs.bzl", "cc_binary")
+load(
+ "//bazel:pagespeed_test.bzl",
+ "pagespeed_cc_test",
+ "pagespeed_cc_test_library",
+)
+
+licenses(["notice"]) # Apache 2
+
+cc_binary(
+ name = "redis_cache_cluster_setup",
+ testonly = True,
+ srcs = [
+ "redis_cache_cluster_setup_main.cc",
+ ],
+ deps = [
+ "//test/pagespeed/system:test_base",
+ ],
+)
+
+pagespeed_cc_test_library(
+ name = "test_base",
+ srcs = [
+ "redis_cache_cluster_setup.cc",
+ "tcp_connection_for_testing.cc",
+ "tcp_server_thread_for_testing.cc",
+ ],
+ hdrs = [
+ "redis_cache_cluster_setup.h",
+ "tcp_connection_for_testing.h",
+ "tcp_server_thread_for_testing.h",
+ ],
+ deps = [
+ "//pagespeed/system",
+ "//test/net/instaweb/rewriter:test_base",
+ "//test/pagespeed/kernel/base:kernel_test_util",
+ "//test/pagespeed/kernel/cache:cache_test_base",
+ "//test/pagespeed/kernel/thread:thread_test_base",
+ ],
+)
+
+pagespeed_cc_test(
+ name = "system",
+ srcs = [
+ "apr_mem_cache_test.cc",
+ "external_server_spec_test.cc",
+ "in_place_resource_recorder_test.cc",
+ "loopback_route_fetcher_test.cc",
+ "redis_cache_cluster_test.cc",
+ "serf_url_async_fetcher_test.cc",
+ "system_caches_test.cc",
+ "system_message_handler_test.cc",
+ ],
+ shard_count = 1,
+ deps = [
+ "//test/pagespeed/system:test_base",
+ ],
+)
diff --git a/pagespeed/system/add_headers_fetcher_test.cc b/test/pagespeed/system/add_headers_fetcher_test.cc
similarity index 94%
rename from pagespeed/system/add_headers_fetcher_test.cc
rename to test/pagespeed/system/add_headers_fetcher_test.cc
index 351bdb1..2047a66 100644
--- a/pagespeed/system/add_headers_fetcher_test.cc
+++ b/test/pagespeed/system/add_headers_fetcher_test.cc
@@ -22,11 +22,8 @@
//
#include "pagespeed/system/add_headers_fetcher.h"
-#include "net/instaweb/http/public/mock_callback.h"
-#include "net/instaweb/http/public/reflecting_test_fetcher.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_options_test_base.h"
#include "pagespeed/kernel/base/google_message_handler.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string_util.h"
@@ -34,6 +31,9 @@
#include "pagespeed/kernel/http/request_headers.h"
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/util/platform.h"
+#include "test/net/instaweb/http/mock_callback.h"
+#include "test/net/instaweb/http/reflecting_test_fetcher.h"
+#include "test/net/instaweb/rewriter/rewrite_options_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/pagespeed/system/admin_site_test.cc b/test/pagespeed/system/admin_site_test.cc
similarity index 95%
rename from pagespeed/system/admin_site_test.cc
rename to test/pagespeed/system/admin_site_test.cc
index 52a5a3c..beb7ab1 100644
--- a/pagespeed/system/admin_site_test.cc
+++ b/test/pagespeed/system/admin_site_test.cc
@@ -22,12 +22,9 @@
#include "pagespeed/system/admin_site.h"
#include "net/instaweb/http/public/async_fetch.h"
-#include "net/instaweb/rewriter/public/custom_rewrite_test_base.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_driver_factory.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "pagespeed/kernel/base/message_handler.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string.h"
@@ -35,6 +32,9 @@
#include "pagespeed/kernel/util/platform.h"
#include "pagespeed/system/system_rewrite_options.h"
#include "pagespeed/system/system_server_context.h"
+#include "test/net/instaweb/rewriter/custom_rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gmock.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
diff --git a/pagespeed/system/admin_site_tests.js b/test/pagespeed/system/admin_site_tests.js
similarity index 100%
rename from pagespeed/system/admin_site_tests.js
rename to test/pagespeed/system/admin_site_tests.js
diff --git a/pagespeed/system/apr_mem_cache_test.cc b/test/pagespeed/system/apr_mem_cache_test.cc
similarity index 99%
rename from pagespeed/system/apr_mem_cache_test.cc
rename to test/pagespeed/system/apr_mem_cache_test.cc
index cf31559..2f2245e 100644
--- a/pagespeed/system/apr_mem_cache_test.cc
+++ b/test/pagespeed/system/apr_mem_cache_test.cc
@@ -48,13 +48,13 @@
#include "pagespeed/kernel/util/platform.h"
#include "pagespeed/kernel/util/simple_stats.h"
#include "pagespeed/system/external_server_spec.h"
-#include "pagespeed/system/tcp_server_thread_for_testing.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_hasher.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
#include "test/pagespeed/kernel/cache/cache_spammer.h"
#include "test/pagespeed/kernel/cache/cache_test_base.h"
#include "test/pagespeed/kernel/thread/blocking_callback.h"
+#include "test/pagespeed/system/tcp_server_thread_for_testing.h"
namespace net_instaweb {
diff --git a/pagespeed/system/external_server_spec_test.cc b/test/pagespeed/system/external_server_spec_test.cc
similarity index 100%
rename from pagespeed/system/external_server_spec_test.cc
rename to test/pagespeed/system/external_server_spec_test.cc
diff --git a/pagespeed/system/in_place_resource_recorder_test.cc b/test/pagespeed/system/in_place_resource_recorder_test.cc
similarity index 99%
rename from pagespeed/system/in_place_resource_recorder_test.cc
rename to test/pagespeed/system/in_place_resource_recorder_test.cc
index eb12417..3b94a2d 100644
--- a/pagespeed/system/in_place_resource_recorder_test.cc
+++ b/test/pagespeed/system/in_place_resource_recorder_test.cc
@@ -25,7 +25,6 @@
#include "net/instaweb/http/public/http_cache_failure.h"
#include "net/instaweb/http/public/http_value.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string_util.h"
@@ -33,6 +32,7 @@
#include "pagespeed/kernel/http/http_names.h"
#include "pagespeed/kernel/http/request_headers.h"
#include "pagespeed/kernel/http/response_headers.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
diff --git a/pagespeed/system/loopback_route_fetcher_test.cc b/test/pagespeed/system/loopback_route_fetcher_test.cc
similarity index 97%
rename from pagespeed/system/loopback_route_fetcher_test.cc
rename to test/pagespeed/system/loopback_route_fetcher_test.cc
index a2dce07..796cd17 100644
--- a/pagespeed/system/loopback_route_fetcher_test.cc
+++ b/test/pagespeed/system/loopback_route_fetcher_test.cc
@@ -26,13 +26,10 @@
#include "apr_network_io.h"
#include "apr_pools.h"
-#include "net/instaweb/http/public/mock_callback.h"
-#include "net/instaweb/http/public/reflecting_test_fetcher.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/rewriter/config/rewrite_options_manager.h"
#include "net/instaweb/rewriter/public/domain_lawyer.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_options_test_base.h"
#include "pagespeed/kernel/base/callback.h"
#include "pagespeed/kernel/base/google_message_handler.h"
#include "pagespeed/kernel/base/ref_counted_ptr.h"
@@ -42,6 +39,9 @@
#include "pagespeed/kernel/http/request_headers.h"
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/util/platform.h"
+#include "test/net/instaweb/http/mock_callback.h"
+#include "test/net/instaweb/http/reflecting_test_fetcher.h"
+#include "test/net/instaweb/rewriter/rewrite_options_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
namespace net_instaweb {
diff --git a/pagespeed/system/redis_cache_cluster_setup.cc b/test/pagespeed/system/redis_cache_cluster_setup.cc
similarity index 98%
rename from pagespeed/system/redis_cache_cluster_setup.cc
rename to test/pagespeed/system/redis_cache_cluster_setup.cc
index fb05f4b..bcfd1d3 100644
--- a/pagespeed/system/redis_cache_cluster_setup.cc
+++ b/test/pagespeed/system/redis_cache_cluster_setup.cc
@@ -19,19 +19,18 @@
// Unit-test the redis interface in conjunction with Redis Cluster
-#include "pagespeed/system/redis_cache_cluster_setup.h"
+#include "test/pagespeed/system/redis_cache_cluster_setup.h"
#include <algorithm>
#include <cstddef>
#include <cstdlib>
#include "base/logging.h"
-//#include "strings/stringpiece_utils.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/posix_timer.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
-#include "pagespeed/system/tcp_connection_for_testing.h"
+#include "test/pagespeed/system/tcp_connection_for_testing.h"
namespace net_instaweb {
diff --git a/pagespeed/system/redis_cache_cluster_setup.h b/test/pagespeed/system/redis_cache_cluster_setup.h
similarity index 97%
rename from pagespeed/system/redis_cache_cluster_setup.h
rename to test/pagespeed/system/redis_cache_cluster_setup.h
index e356af6..b9fc7d7 100644
--- a/pagespeed/system/redis_cache_cluster_setup.h
+++ b/test/pagespeed/system/redis_cache_cluster_setup.h
@@ -24,7 +24,7 @@
#include <vector>
#include "pagespeed/kernel/base/string_util.h"
-#include "pagespeed/system/tcp_connection_for_testing.h"
+#include "test/pagespeed/system/tcp_connection_for_testing.h"
namespace net_instaweb {
diff --git a/pagespeed/system/redis_cache_cluster_setup_main.cc b/test/pagespeed/system/redis_cache_cluster_setup_main.cc
similarity index 95%
rename from pagespeed/system/redis_cache_cluster_setup_main.cc
rename to test/pagespeed/system/redis_cache_cluster_setup_main.cc
index 9dd4126..0f47576 100644
--- a/pagespeed/system/redis_cache_cluster_setup_main.cc
+++ b/test/pagespeed/system/redis_cache_cluster_setup_main.cc
@@ -20,7 +20,7 @@
#include <vector>
#include "pagespeed/kernel/base/string_util.h"
-#include "pagespeed/system/redis_cache_cluster_setup.h"
+#include "test/pagespeed/system/redis_cache_cluster_setup.h"
// Lint complains if I put 'using namespace net_instaweb' even in main(), so
// adding this instead.
diff --git a/pagespeed/system/redis_cache_cluster_test.cc b/test/pagespeed/system/redis_cache_cluster_test.cc
similarity index 98%
rename from pagespeed/system/redis_cache_cluster_test.cc
rename to test/pagespeed/system/redis_cache_cluster_test.cc
index 8cdee63..807931d 100644
--- a/pagespeed/system/redis_cache_cluster_test.cc
+++ b/test/pagespeed/system/redis_cache_cluster_test.cc
@@ -36,11 +36,11 @@
#include "pagespeed/kernel/util/platform.h"
#include "pagespeed/kernel/util/simple_stats.h"
#include "pagespeed/system/redis_cache.h"
-#include "pagespeed/system/redis_cache_cluster_setup.h"
-#include "pagespeed/system/tcp_connection_for_testing.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_timer.h"
#include "test/pagespeed/kernel/cache/cache_test_base.h"
+#include "test/pagespeed/system/redis_cache_cluster_setup.h"
+#include "test/pagespeed/system/tcp_connection_for_testing.h"
namespace net_instaweb {
diff --git a/pagespeed/system/redis_cache_test.cc b/test/pagespeed/system/redis_cache_test.cc
similarity index 100%
rename from pagespeed/system/redis_cache_test.cc
rename to test/pagespeed/system/redis_cache_test.cc
diff --git a/pagespeed/system/serf_url_async_fetcher_test.cc b/test/pagespeed/system/serf_url_async_fetcher_test.cc
similarity index 99%
rename from pagespeed/system/serf_url_async_fetcher_test.cc
rename to test/pagespeed/system/serf_url_async_fetcher_test.cc
index 5584116..e3ac1d3 100644
--- a/pagespeed/system/serf_url_async_fetcher_test.cc
+++ b/test/pagespeed/system/serf_url_async_fetcher_test.cc
@@ -52,9 +52,9 @@
#include "pagespeed/kernel/util/gzip_inflater.h"
#include "pagespeed/kernel/util/platform.h"
#include "pagespeed/kernel/util/simple_stats.h"
-#include "pagespeed/system/tcp_server_thread_for_testing.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
+#include "test/pagespeed/system/tcp_server_thread_for_testing.h"
namespace {
diff --git a/pagespeed/system/system_caches_test.cc b/test/pagespeed/system/system_caches_test.cc
similarity index 99%
rename from pagespeed/system/system_caches_test.cc
rename to test/pagespeed/system/system_caches_test.cc
index f6a5aed..8f983f8 100644
--- a/pagespeed/system/system_caches_test.cc
+++ b/test/pagespeed/system/system_caches_test.cc
@@ -34,13 +34,10 @@
#include "net/instaweb/http/public/http_cache.h"
#include "net/instaweb/http/public/http_value.h"
#include "net/instaweb/http/public/request_context.h"
-#include "net/instaweb/rewriter/public/custom_rewrite_test_base.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_driver_factory.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
-#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
-#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/util/public/cache_property_store.h"
#include "net/instaweb/util/public/property_cache.h"
#include "net/instaweb/util/public/property_store.h"
@@ -79,6 +76,9 @@
#include "pagespeed/system/system_cache_path.h"
#include "pagespeed/system/system_rewrite_options.h"
#include "pagespeed/system/system_server_context.h"
+#include "test/net/instaweb/rewriter/custom_rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/rewrite_test_base.h"
+#include "test/net/instaweb/rewriter/test_rewrite_driver_factory.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/mem_file_system.h"
#include "test/pagespeed/kernel/base/mock_message_handler.h"
diff --git a/pagespeed/system/system_message_handler_test.cc b/test/pagespeed/system/system_message_handler_test.cc
similarity index 100%
rename from pagespeed/system/system_message_handler_test.cc
rename to test/pagespeed/system/system_message_handler_test.cc
diff --git a/pagespeed/system/system_rewrite_options_test.cc b/test/pagespeed/system/system_rewrite_options_test.cc
similarity index 99%
rename from pagespeed/system/system_rewrite_options_test.cc
rename to test/pagespeed/system/system_rewrite_options_test.cc
index 54f9bab..841fc37 100644
--- a/pagespeed/system/system_rewrite_options_test.cc
+++ b/test/pagespeed/system/system_rewrite_options_test.cc
@@ -21,9 +21,9 @@
#include <functional>
-#include "net/instaweb/rewriter/public/rewrite_options_test_base.h"
#include "pagespeed/kernel/base/google_message_handler.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
+#include "test/net/instaweb/rewriter/rewrite_options_test_base.h"
#include "test/pagespeed/kernel/base/gtest.h"
#include "test/pagespeed/kernel/base/null_thread_system.h"
diff --git a/pagespeed/system/tcp_connection_for_testing.cc b/test/pagespeed/system/tcp_connection_for_testing.cc
similarity index 97%
rename from pagespeed/system/tcp_connection_for_testing.cc
rename to test/pagespeed/system/tcp_connection_for_testing.cc
index 248d374..daf1f38 100644
--- a/pagespeed/system/tcp_connection_for_testing.cc
+++ b/test/pagespeed/system/tcp_connection_for_testing.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "pagespeed/system/tcp_connection_for_testing.h"
+#include "test/pagespeed/system/tcp_connection_for_testing.h"
#include <sys/socket.h>
diff --git a/pagespeed/system/tcp_connection_for_testing.h b/test/pagespeed/system/tcp_connection_for_testing.h
similarity index 100%
rename from pagespeed/system/tcp_connection_for_testing.h
rename to test/pagespeed/system/tcp_connection_for_testing.h
diff --git a/pagespeed/system/tcp_server_thread_for_testing.cc b/test/pagespeed/system/tcp_server_thread_for_testing.cc
similarity index 98%
rename from pagespeed/system/tcp_server_thread_for_testing.cc
rename to test/pagespeed/system/tcp_server_thread_for_testing.cc
index 304d52b..52d8327 100644
--- a/pagespeed/system/tcp_server_thread_for_testing.cc
+++ b/test/pagespeed/system/tcp_server_thread_for_testing.cc
@@ -17,7 +17,7 @@
* under the License.
*/
-#include "pagespeed/system/tcp_server_thread_for_testing.h"
+#include "test/pagespeed/system/tcp_server_thread_for_testing.h"
#include <sys/socket.h>
diff --git a/pagespeed/system/tcp_server_thread_for_testing.h b/test/pagespeed/system/tcp_server_thread_for_testing.h
similarity index 100%
rename from pagespeed/system/tcp_server_thread_for_testing.h
rename to test/pagespeed/system/tcp_server_thread_for_testing.h
