From d30714d80e43b27b6c866395944de9a2cc604600 Mon Sep 17 00:00:00 2001 From: Sinan Cepel Date: Wed, 19 Jul 2023 13:09:05 -0700 Subject: [PATCH] move all explicitly marked model generators from .json -> .models Summary: refactortractor Reviewed By: dkgi Differential Revision: D47552417 fbshipit-source-id: 187cb264b56a7bef1ca0e3293dc509a345aa001e --- ...atureGenerator.json => CastUriFeatureGenerator.models} | 0 ...tureGenerator.json => DataCastFeatureGenerator.models} | 0 ...nerator.json => ExplicitIntentFeatureGenerator.models} | 0 ...reGenerator.json => IntentDataFeatureGenerator.models} | 0 .../{CommonSanitizers.json => CommonSanitizers.models} | 0 ...rator.json => AndroidIntentLaunchSinkGenerator.models} | 0 ...nkGenerator.json => CodeExecutionSinkGenerator.models} | 0 .../{FileSinkGenerator.json => FileSinkGenerator.models} | 0 ...Generator.json => SQLiteDatabaseSinksGenerator.models} | 0 ...ViewLoadGenerator.json => WebViewLoadGenerator.models} | 0 ...ourceGenerator.json => ActivitySourceGenerator.models} | 0 ...erator.json => AndroidBroadcastSourceGenerator.models} | 0 ...enerator.json => ImplicitIntentSourceGenerator.models} | 0 ...Generator.json => SensitiveCookieDataGenerator.models} | 0 .../tests/DataCastFeatureGeneratorTest.cpp | 8 ++++---- 15 files changed, 4 insertions(+), 4 deletions(-) rename configuration/model-generators/propagations/{CastUriFeatureGenerator.json => CastUriFeatureGenerator.models} (100%) rename configuration/model-generators/propagations/{DataCastFeatureGenerator.json => DataCastFeatureGenerator.models} (100%) rename configuration/model-generators/propagations/{ExplicitIntentFeatureGenerator.json => ExplicitIntentFeatureGenerator.models} (100%) rename configuration/model-generators/propagations/{IntentDataFeatureGenerator.json => IntentDataFeatureGenerator.models} (100%) rename configuration/model-generators/sanitizers/{CommonSanitizers.json => CommonSanitizers.models} (100%) rename configuration/model-generators/sinks/{AndroidIntentLaunchSinkGenerator.json => AndroidIntentLaunchSinkGenerator.models} (100%) rename configuration/model-generators/sinks/{CodeExecutionSinkGenerator.json => CodeExecutionSinkGenerator.models} (100%) rename configuration/model-generators/sinks/{FileSinkGenerator.json => FileSinkGenerator.models} (100%) rename configuration/model-generators/sinks/{SQLiteDatabaseSinksGenerator.json => SQLiteDatabaseSinksGenerator.models} (100%) rename configuration/model-generators/sinks/{WebViewLoadGenerator.json => WebViewLoadGenerator.models} (100%) rename configuration/model-generators/sources/{ActivitySourceGenerator.json => ActivitySourceGenerator.models} (100%) rename configuration/model-generators/sources/{AndroidBroadcastSourceGenerator.json => AndroidBroadcastSourceGenerator.models} (100%) rename configuration/model-generators/sources/{ImplicitIntentSourceGenerator.json => ImplicitIntentSourceGenerator.models} (100%) rename configuration/model-generators/sources/{SensitiveCookieDataGenerator.json => SensitiveCookieDataGenerator.models} (100%) diff --git a/configuration/model-generators/propagations/CastUriFeatureGenerator.json b/configuration/model-generators/propagations/CastUriFeatureGenerator.models similarity index 100% rename from configuration/model-generators/propagations/CastUriFeatureGenerator.json rename to configuration/model-generators/propagations/CastUriFeatureGenerator.models diff --git a/configuration/model-generators/propagations/DataCastFeatureGenerator.json b/configuration/model-generators/propagations/DataCastFeatureGenerator.models similarity index 100% rename from configuration/model-generators/propagations/DataCastFeatureGenerator.json rename to configuration/model-generators/propagations/DataCastFeatureGenerator.models diff --git a/configuration/model-generators/propagations/ExplicitIntentFeatureGenerator.json b/configuration/model-generators/propagations/ExplicitIntentFeatureGenerator.models similarity index 100% rename from configuration/model-generators/propagations/ExplicitIntentFeatureGenerator.json rename to configuration/model-generators/propagations/ExplicitIntentFeatureGenerator.models diff --git a/configuration/model-generators/propagations/IntentDataFeatureGenerator.json b/configuration/model-generators/propagations/IntentDataFeatureGenerator.models similarity index 100% rename from configuration/model-generators/propagations/IntentDataFeatureGenerator.json rename to configuration/model-generators/propagations/IntentDataFeatureGenerator.models diff --git a/configuration/model-generators/sanitizers/CommonSanitizers.json b/configuration/model-generators/sanitizers/CommonSanitizers.models similarity index 100% rename from configuration/model-generators/sanitizers/CommonSanitizers.json rename to configuration/model-generators/sanitizers/CommonSanitizers.models diff --git a/configuration/model-generators/sinks/AndroidIntentLaunchSinkGenerator.json b/configuration/model-generators/sinks/AndroidIntentLaunchSinkGenerator.models similarity index 100% rename from configuration/model-generators/sinks/AndroidIntentLaunchSinkGenerator.json rename to configuration/model-generators/sinks/AndroidIntentLaunchSinkGenerator.models diff --git a/configuration/model-generators/sinks/CodeExecutionSinkGenerator.json b/configuration/model-generators/sinks/CodeExecutionSinkGenerator.models similarity index 100% rename from configuration/model-generators/sinks/CodeExecutionSinkGenerator.json rename to configuration/model-generators/sinks/CodeExecutionSinkGenerator.models diff --git a/configuration/model-generators/sinks/FileSinkGenerator.json b/configuration/model-generators/sinks/FileSinkGenerator.models similarity index 100% rename from configuration/model-generators/sinks/FileSinkGenerator.json rename to configuration/model-generators/sinks/FileSinkGenerator.models diff --git a/configuration/model-generators/sinks/SQLiteDatabaseSinksGenerator.json b/configuration/model-generators/sinks/SQLiteDatabaseSinksGenerator.models similarity index 100% rename from configuration/model-generators/sinks/SQLiteDatabaseSinksGenerator.json rename to configuration/model-generators/sinks/SQLiteDatabaseSinksGenerator.models diff --git a/configuration/model-generators/sinks/WebViewLoadGenerator.json b/configuration/model-generators/sinks/WebViewLoadGenerator.models similarity index 100% rename from configuration/model-generators/sinks/WebViewLoadGenerator.json rename to configuration/model-generators/sinks/WebViewLoadGenerator.models diff --git a/configuration/model-generators/sources/ActivitySourceGenerator.json b/configuration/model-generators/sources/ActivitySourceGenerator.models similarity index 100% rename from configuration/model-generators/sources/ActivitySourceGenerator.json rename to configuration/model-generators/sources/ActivitySourceGenerator.models diff --git a/configuration/model-generators/sources/AndroidBroadcastSourceGenerator.json b/configuration/model-generators/sources/AndroidBroadcastSourceGenerator.models similarity index 100% rename from configuration/model-generators/sources/AndroidBroadcastSourceGenerator.json rename to configuration/model-generators/sources/AndroidBroadcastSourceGenerator.models diff --git a/configuration/model-generators/sources/ImplicitIntentSourceGenerator.json b/configuration/model-generators/sources/ImplicitIntentSourceGenerator.models similarity index 100% rename from configuration/model-generators/sources/ImplicitIntentSourceGenerator.json rename to configuration/model-generators/sources/ImplicitIntentSourceGenerator.models diff --git a/configuration/model-generators/sources/SensitiveCookieDataGenerator.json b/configuration/model-generators/sources/SensitiveCookieDataGenerator.models similarity index 100% rename from configuration/model-generators/sources/SensitiveCookieDataGenerator.json rename to configuration/model-generators/sources/SensitiveCookieDataGenerator.models diff --git a/source/model-generator/tests/DataCastFeatureGeneratorTest.cpp b/source/model-generator/tests/DataCastFeatureGeneratorTest.cpp index d365af55..769588cb 100644 --- a/source/model-generator/tests/DataCastFeatureGeneratorTest.cpp +++ b/source/model-generator/tests/DataCastFeatureGeneratorTest.cpp @@ -17,9 +17,9 @@ using namespace marianatrench; namespace { -boost::filesystem::path json_file_path() { +boost::filesystem::path models_file_path() { return test::find_repository_root() / - "configuration/model-generators/propagations/DataCastFeatureGenerator.json"; + "configuration/model-generators/propagations/DataCastFeatureGenerator.models"; } } // namespace @@ -68,7 +68,7 @@ TEST_F(DataCastFeatureGeneratorTest, CastToInt) { EXPECT_THAT( JsonModelGenerator::from_file( - "DataCastFeatureGenerator", context, json_file_path()) + "DataCastFeatureGenerator", context, models_file_path()) .emit_method_models(*context.methods), testing::UnorderedElementsAre(expected_model)); } @@ -113,7 +113,7 @@ TEST_F(DataCastFeatureGeneratorTest, CastToBool) { EXPECT_THAT( JsonModelGenerator::from_file( - "DataCastFeatureGenerator", context, json_file_path()) + "DataCastFeatureGenerator", context, models_file_path()) .emit_method_models(*context.methods), testing::UnorderedElementsAre(expected_model)); }