[ObjC] Test file cleanups
- Remove some types not needed.
- Remove some files not needed.
- Move some tests files into different prefixes to logically segment things.
- Add objc_class_prefix to the files.
- Use an expected prefix file during generation to exercise that code and
validate things.
- Require prefixes for the test file.
diff --git a/objectivec/DevTools/compile_testing_protos.sh b/objectivec/DevTools/compile_testing_protos.sh
index 7bdfbb8..fb8a853 100755
--- a/objectivec/DevTools/compile_testing_protos.sh
+++ b/objectivec/DevTools/compile_testing_protos.sh
@@ -42,10 +42,8 @@
objectivec/Tests/unittest_extension_chain_e.proto
objectivec/Tests/unittest_extension_chain_f.proto
objectivec/Tests/unittest_extension_chain_g.proto
- objectivec/Tests/unittest_import_public_lite.proto
objectivec/Tests/unittest_import_public.proto
objectivec/Tests/unittest_import.proto
- objectivec/Tests/unittest_mset_wire_format.proto
objectivec/Tests/unittest_mset.proto
objectivec/Tests/unittest_objc_options.proto
objectivec/Tests/unittest_objc_startup.proto
@@ -128,8 +126,11 @@
# -----------------------------------------------------------------------------
# Generate the Objective C specific testing protos.
-"${PROTOC}" \
- --objc_out="${OUTPUT_DIR}" \
- --proto_path=. \
- --proto_path=src \
+"${PROTOC}" \
+ --objc_out="${OUTPUT_DIR}" \
+ --objc_opt=expected_prefixes_path=objectivec/Tests/expected_prefixes.txt \
+ --objc_opt=prefixes_must_be_registered=yes \
+ --objc_opt=require_prefixes=yes \
+ --proto_path=. \
+ --proto_path=src \
"${OBJC_TEST_PROTO_FILES[@]}"
