From 5f435ed9d78d6fabb3b230987905d5856b8bbe3b Mon Sep 17 00:00:00 2001 From: Kharkunov Eugene Date: Fri, 17 Apr 2026 13:38:47 +0300 Subject: [PATCH] Cleanup code according to CodeQL reports --- .../extender/client/ExtenderClient.java | 6 ++--- .../extender/client/ExtenderClientTest.java | 2 +- .../defold/manifestmergetool/HtmlMerger.java | 13 +---------- .../java/com/defold/extender/Extender.java | 10 ++++----- .../defold/extender/ExtenderController.java | 2 +- .../com/defold/extender/ExtenderUtil.java | 1 - .../extender/cache/DataCacheException.java | 11 ---------- .../extender/remote/RemoteEngineBuilder.java | 4 +--- .../extender/services/DataCacheService.java | 2 +- .../extender/services/DefoldSdkService.java | 4 ++-- .../services/cocoapods/CocoaPodsService.java | 9 +++----- .../com/defold/extender/ExtenderTest.java | 8 +++---- .../ExtensionManifestValidatorTest.java | 1 - .../com/defold/extender/IntegrationTest.java | 5 +++++ .../services/cocoapods/PodSpecParserTest.java | 22 +++++++++---------- .../services/cocoapods/PodfileParserTest.java | 3 +-- .../services/cocoapods/ResolvedPodsTest.java | 2 +- 17 files changed, 37 insertions(+), 68 deletions(-) delete mode 100644 server/src/main/java/com/defold/extender/cache/DataCacheException.java diff --git a/client/src/main/java/com/defold/extender/client/ExtenderClient.java b/client/src/main/java/com/defold/extender/client/ExtenderClient.java index dedc6df5..0ea76865 100644 --- a/client/src/main/java/com/defold/extender/client/ExtenderClient.java +++ b/client/src/main/java/com/defold/extender/client/ExtenderClient.java @@ -31,7 +31,6 @@ import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.math.BigInteger; -import java.nio.file.Files; import java.nio.file.Path; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -79,7 +78,7 @@ public ExtenderClient(String extenderBaseUrl, File cacheDir) throws IOException public ExtenderClient(CookieStore cookieStore, String extenderBaseUrl, File cacheDir) throws IOException { - this(new ExtenderClientCache(cacheDir), cookieStore, + this(new ExtenderClientCache(cacheDir), HttpClientBuilder.create() .setDefaultRequestConfig( RequestConfig.custom() @@ -92,7 +91,6 @@ public ExtenderClient(CookieStore cookieStore, } public ExtenderClient(ExtenderClientCache cache, - CookieStore cookieStore, HttpClient httpClient, String extenderBaseUrl) { this.extenderBaseUrl = extenderBaseUrl; @@ -401,7 +399,7 @@ public boolean health() throws IOException { } public HttpGet createGetRequest(String url) throws UnsupportedEncodingException { - HttpGet request = new HttpGet(extenderBaseUrl); + HttpGet request = new HttpGet(url); addAuthorizationHeader(request); addHeaders(request); return request; diff --git a/client/src/test/java/com/defold/extender/client/ExtenderClientTest.java b/client/src/test/java/com/defold/extender/client/ExtenderClientTest.java index 2eea6600..2da66957 100644 --- a/client/src/test/java/com/defold/extender/client/ExtenderClientTest.java +++ b/client/src/test/java/com/defold/extender/client/ExtenderClientTest.java @@ -64,7 +64,7 @@ public void testClientHeaders() throws Exception { final String HDR_VALUE_2 = "my custom header2"; DefaultHttpClient httpClient = Mockito.mock(DefaultHttpClient.class); - ExtenderClient extenderClient = new ExtenderClient(null, null, httpClient, "http://localhost"); + ExtenderClient extenderClient = new ExtenderClient(null, httpClient, "http://localhost"); extenderClient.setHeader(HDR_NAME_1, HDR_VALUE_1); extenderClient.setHeader(HDR_NAME_2, HDR_VALUE_2); diff --git a/server/manifestmergetool/src/main/java/com/defold/manifestmergetool/HtmlMerger.java b/server/manifestmergetool/src/main/java/com/defold/manifestmergetool/HtmlMerger.java index 624c36de..912fabe2 100644 --- a/server/manifestmergetool/src/main/java/com/defold/manifestmergetool/HtmlMerger.java +++ b/server/manifestmergetool/src/main/java/com/defold/manifestmergetool/HtmlMerger.java @@ -20,9 +20,6 @@ public HtmlMerger(Logger logger) { HtmlMerger.logger = logger; } - class HtmlMergeException extends RuntimeException { - }; - private MergePolicy getMergePolicy(Element e) { String attr = e.attr("merge"); return MergePolicy.fromString(attr); @@ -108,17 +105,9 @@ private Document loadDocument(File file) throws IOException { public void merge(File main, File[] libraries, File out) throws RuntimeException, IOException { Document baseDocument = loadDocument(main); - // For error reporting/troubleshooting - String paths = "\n" + main.getAbsolutePath(); - for (File library : libraries) { - paths += "\n" + library.getAbsolutePath(); Document libraryDocument = loadDocument(library); - try { - mergeDocuments(baseDocument, libraryDocument); - } catch (HtmlMergeException e) { - throw new RuntimeException(String.format("Errors merging html files: %s + %s:\n%s", paths, library.getAbsolutePath(), e.toString())); - } + mergeDocuments(baseDocument, libraryDocument); } writeDocument(baseDocument, out); diff --git a/server/src/main/java/com/defold/extender/Extender.java b/server/src/main/java/com/defold/extender/Extender.java index 41ebfd98..8b701c85 100644 --- a/server/src/main/java/com/defold/extender/Extender.java +++ b/server/src/main/java/com/defold/extender/Extender.java @@ -113,7 +113,7 @@ class Extender { // * libraryJars - Array of .jar files should be passed to ProGuard as '-libraryjar' entries. // Everything from a libraryjar will be kept by ProGuard, i.e no optimization or // obfuscation will be performed. - private class ProGuardContext { + private static class ProGuardContext { public List proGuardFiles = new ArrayList<>(); public List libraryJars = new ArrayList<>(); } @@ -1377,8 +1377,6 @@ private List buildPipelineExtension(File manifest, Map man // *************************************************************************** // Python { - List srcFiles = ExtenderUtil.listFiles(srcDirs, platformConfig.sourceRe); - if (!protoFiles.isEmpty()) { List generatedFiles = generateProtoSrcForPlugin(extDir, manifestContext, protoFiles, "python"); outputFiles.addAll(generatedFiles); @@ -2204,7 +2202,7 @@ private File buildWin32Resources(Map mergedAppContext) throws Ex context.put("tgt", ExtenderUtil.getRelativePath(buildState.jobDir, resourceFile)); String command = templateExecutor.execute(platformConfig.windresCmd, context); - if (command.equals("")) { + if (command.isEmpty()) { return null; } try { @@ -2343,7 +2341,7 @@ private boolean shouldBuildArtifact(String artifact) { } private boolean shouldBuildEngine() { - return buildState.getBuildArtifacts().equals("") || shouldBuildArtifact("engine"); + return buildState.getBuildArtifacts().isEmpty() || shouldBuildArtifact("engine"); } private boolean shouldBuildPlugins() { return shouldBuildArtifact("plugins"); @@ -2711,7 +2709,7 @@ private List buildApple(String platform) throws ExtenderException { } private String getBasePlatform(String platform) { - String[] platformParts = buildState.fullPlatform.split("-"); + String[] platformParts = platform.split("-"); return platformParts[1]; } diff --git a/server/src/main/java/com/defold/extender/ExtenderController.java b/server/src/main/java/com/defold/extender/ExtenderController.java index 5a3a2f31..8320a957 100644 --- a/server/src/main/java/com/defold/extender/ExtenderController.java +++ b/server/src/main/java/com/defold/extender/ExtenderController.java @@ -235,7 +235,7 @@ public void buildEngineAsync(HttpServletRequest _request, if (remoteBuilderEnabled && buildEnvDescription != null && isRemotePlatform(buildEnvDescription[0], buildEnvDescription[1])) { LOGGER.info("Building engine on remote builder"); RemoteInstanceConfig remoteInstanceConfig = getRemoteBuilderConfig(buildEnvDescription[0], buildEnvDescription[1]); - this.remoteEngineBuilder.buildAsync(remoteInstanceConfig, uploadDirectory, platform, sdkVersion, jobDirectory, buildDirectory, metricsWriter); + this.remoteEngineBuilder.buildAsync(remoteInstanceConfig, uploadDirectory, platform, sdkVersion, jobDirectory, metricsWriter); } else if (instanceType.equals(InstanceType.MIXED)) { asyncBuilder.asyncBuildEngine(metricsWriter, platform, sdkVersion, jobDirectory, uploadDirectory, buildDirectory); } else { diff --git a/server/src/main/java/com/defold/extender/ExtenderUtil.java b/server/src/main/java/com/defold/extender/ExtenderUtil.java index beb630d0..183558ff 100644 --- a/server/src/main/java/com/defold/extender/ExtenderUtil.java +++ b/server/src/main/java/com/defold/extender/ExtenderUtil.java @@ -39,7 +39,6 @@ public class ExtenderUtil { static String convertStringToLiteral(String expression) { - String expressionOriginal = expression; int begin = expression.indexOf("{{"); if (begin >= 0) { diff --git a/server/src/main/java/com/defold/extender/cache/DataCacheException.java b/server/src/main/java/com/defold/extender/cache/DataCacheException.java deleted file mode 100644 index 7df94920..00000000 --- a/server/src/main/java/com/defold/extender/cache/DataCacheException.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.defold.extender.cache; - -class DataCacheException extends Exception { - public DataCacheException(String message) { - super(message); - } - - public DataCacheException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/server/src/main/java/com/defold/extender/remote/RemoteEngineBuilder.java b/server/src/main/java/com/defold/extender/remote/RemoteEngineBuilder.java index 72ecfbcc..7001a2bf 100644 --- a/server/src/main/java/com/defold/extender/remote/RemoteEngineBuilder.java +++ b/server/src/main/java/com/defold/extender/remote/RemoteEngineBuilder.java @@ -25,7 +25,6 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.ContentType; import org.apache.http.entity.mime.MultipartEntityBuilder; -import org.apache.http.entity.mime.content.ByteArrayBody; import org.apache.http.entity.mime.content.FileBody; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; @@ -38,7 +37,6 @@ import java.io.OutputStream; import java.io.PrintWriter; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -86,7 +84,7 @@ public void buildAsync(final RemoteInstanceConfig remoteInstanceConfig, final File projectDirectory, final String platform, final String sdkVersion, - File jobDirectory, File buildDirectory, MetricsWriter metricsWriter) throws FileNotFoundException, IOException { + File jobDirectory, MetricsWriter metricsWriter) throws FileNotFoundException, IOException { LOGGER.info("Building engine remotely at {}", remoteInstanceConfig.getUrl()); String jobName = jobDirectory.getName(); diff --git a/server/src/main/java/com/defold/extender/services/DataCacheService.java b/server/src/main/java/com/defold/extender/services/DataCacheService.java index 1e89d83d..26ef7687 100644 --- a/server/src/main/java/com/defold/extender/services/DataCacheService.java +++ b/server/src/main/java/com/defold/extender/services/DataCacheService.java @@ -42,7 +42,7 @@ public class DataCacheService { private DataCache dataCache; - public class DataCacheServiceInfo { + public static class DataCacheServiceInfo { public AtomicInteger cachedFileCount = new AtomicInteger(); public AtomicLong cachedFileSize = new AtomicLong(); } diff --git a/server/src/main/java/com/defold/extender/services/DefoldSdkService.java b/server/src/main/java/com/defold/extender/services/DefoldSdkService.java index 3f08b312..afa4155e 100644 --- a/server/src/main/java/com/defold/extender/services/DefoldSdkService.java +++ b/server/src/main/java/com/defold/extender/services/DefoldSdkService.java @@ -326,7 +326,7 @@ public void destroy() { } } - private JSONObject getLocalPlatformSdkMappings(String hash) throws IOException, ParseException { + private JSONObject getLocalPlatformSdkMappings() throws IOException, ParseException { JSONParser parser = new JSONParser(); return (JSONObject)parser.parse(new FileReader(Path.of(getLocalSdk().toFile().getAbsolutePath(), "platform.sdks.json").toFile())); } @@ -391,7 +391,7 @@ private JSONObject getRemotePlatformSdkMappings(String hash) throws IOException, } public JSONObject getPlatformSdkMappings(String hash) throws IOException, ExtenderException, ParseException { - return isLocalSdk(hash) ? getLocalPlatformSdkMappings(hash) : getRemotePlatformSdkMappings(hash); + return isLocalSdk(hash) ? getLocalPlatformSdkMappings() : getRemotePlatformSdkMappings(hash); } public void acquireSdk(String hash) { diff --git a/server/src/main/java/com/defold/extender/services/cocoapods/CocoaPodsService.java b/server/src/main/java/com/defold/extender/services/cocoapods/CocoaPodsService.java index 32a412bc..fcb9f413 100644 --- a/server/src/main/java/com/defold/extender/services/cocoapods/CocoaPodsService.java +++ b/server/src/main/java/com/defold/extender/services/cocoapods/CocoaPodsService.java @@ -55,7 +55,7 @@ static MainPodfile mainPodfileFromParseResult(PodfileParser.ParseResult parseRes return res; } - private class InstalledPods { + private static class InstalledPods { public Map podsMap = new HashMap<>(); // set of pod's specs to present build order public Set pods = new LinkedHashSet<>(); @@ -207,13 +207,10 @@ private Set getPodDeps(Map> specDepsMap, List jobEnvContext) throws IOException, ExtenderException { + private InstalledPods installPods(CocoaPodsServiceBuildState cocoapodsBuildState) throws IOException, ExtenderException { LOGGER.info("Installing pods"); Path cacheDir; // store current cache dir into local variable to use the same value for all 'pod' runs @@ -390,7 +387,7 @@ public ResolvedPods resolveDependencies(PlatformConfig config, ExtenderBuildStat CocoaPodsServiceBuildState cocoapodsBuildState = new CocoaPodsServiceBuildState(buildState); MainPodfile mainPodfile = createMainPodfile(buildState, cocoapodsBuildState, platformPodfiles, jobEnvContext); - InstalledPods installedPods = installPods(buildState, cocoapodsBuildState, jobEnvContext); + InstalledPods installedPods = installPods(cocoapodsBuildState); XCConfigParser parser = new XCConfigParser(buildState, cocoapodsBuildState); diff --git a/server/src/test/java/com/defold/extender/ExtenderTest.java b/server/src/test/java/com/defold/extender/ExtenderTest.java index f1011ccf..87168c06 100644 --- a/server/src/test/java/com/defold/extender/ExtenderTest.java +++ b/server/src/test/java/com/defold/extender/ExtenderTest.java @@ -63,17 +63,16 @@ public void testExtender(@TempDir File jobDir) throws IOException, InterruptedEx Map env = createEnv(); - Extender extender = new Extender.Builder() + assertDoesNotThrow(() -> new Extender.Builder() .setPlatform("x86_64-osx") .setSdk(sdk) .setJobDirectory(jobDir) .setUploadDirectory(uploadDir) .setBuildDirectory(buildDir) .setEnv(env) - .build(); + .build()); - uploadDir.delete(); - assertTrue(true); + assertTrue(uploadDir.delete()); } public static MultipartHttpServletRequest createMultipartHttpRequest(List files) throws IOException { @@ -376,7 +375,6 @@ public void testMergedContexts() throws IOException, ExtenderException { .build(); Map mergedAppContext = extender.getMergedAppContext(); - List libsOriginal = Arrays.asList("engine_release", "engine_service_null", "profile_null", "remotery_null", "profilerext_null", "record_null"); List libsExpected = Arrays.asList("clang_rt.osx", "engine_release", "engine_service_null", "remotery_null", "record_null"); assertEquals(libsExpected, mergedAppContext.getOrDefault("libs", new ArrayList())); diff --git a/server/src/test/java/com/defold/extender/ExtensionManifestValidatorTest.java b/server/src/test/java/com/defold/extender/ExtensionManifestValidatorTest.java index c1dfbaa7..f712dd27 100644 --- a/server/src/test/java/com/defold/extender/ExtensionManifestValidatorTest.java +++ b/server/src/test/java/com/defold/extender/ExtensionManifestValidatorTest.java @@ -51,7 +51,6 @@ public void testWhitelistCheckPatterns() { public void testWhitelistCheckContext() throws ExtenderException, IOException { String[] allowedLibsTemplatesArray = new String[]{"dtrace_dyld", "AccountPolicyTranslation", "alias.A", "alias", "apr-1.0", "apr-1", "aprutil-1.0", "aprutil-1", "archive.2", "archive", "ATCommandStudioDynamic", "auditd.0", "auditd", "auto", "AVFAudio", "blas", "BSDPClient.A", "BSDPClient", "bsm.0", "bsm", "bz2.1.0.5", "bz2.1.0", "bz2", "c\\+\\+.1", "c\\+\\+", "c\\+\\+abi", "c", "cblas", "charset.1.0.0", "charset.1", "charset", "ChineseTokenizer", "clapack", "cmph", "com_err", "compression", "CoreStorage", "CRFSuite", "CRFSuite0.12", "crypto.0.9.7", "crypto.0.9.8", "crypto.35", "crypto", "csfde", "cups.2", "cups", "cupscgi.1", "cupscgi", "cupsimage.2", "cupsimage", "cupsmime.1", "cupsmime", "cupsppdc.1", "cupsppdc", "curl.3", "curl.4", "curl", "curses", "dbm", "des425", "DHCPServer.A", "DHCPServer", "DiagnosticMessagesClient", "dl", "dns_services", "dtrace", "ecpg.6.5", "ecpg.6", "ecpg", "ecpg_compat.3.5", "ecpg_compat.3", "ecpg_compat", "edit.2", "edit.3.0", "edit.3", "edit", "energytrace", "expat.1", "expat", "exslt.0", "exslt", "extension", "f77lapack", "ffi", "form.5.4", "form", "Fosl_dynamic", "gcc_s.1", "gcc_s.10.4", "gcc_s.10.5", "germantok", "gmalloc", "gssapi_krb5", "heimdal-asn1", "hunspell-1.2.0.0.0", "hunspell-1.2.0", "hunspell-1.2", "IASAuthReboot", "IASUnifiedProgress", "iconv.2.4.0", "iconv.2", "iconv", "icucore.A", "icucore", "info", "iodbc.2.1.18", "iodbc.2", "iodbc", "iodbcinst.2.1.18", "iodbcinst.2", "iodbcinst", "ipconfig", "ipsec.A", "ipsec", "k5crypto", "krb4", "krb5", "krb524", "krb5support", "ktrace", "langid", "lapack", "lber", "ldap", "ldap_r", "lzma.5", "lzma", "m", "marisa", "Match.1", "Match", "mecab.1.0.0", "mecab", "mecabra", "menu.5.4", "menu", "mx.A", "mx", "ncurses.5.4", "ncurses.5", "ncurses", "netsnmp.15.1.2", "netsnmp.15", "netsnmp.25", "netsnmp.5.2.1", "netsnmp.5", "netsnmp", "netsnmpagent.25", "netsnmpagent", "netsnmphelpers.25", "netsnmphelpers", "netsnmpmibs.25", "netsnmpmibs", "netsnmptrapd.25", "netsnmptrapd", "network", "objc.A", "objc", "odfde", "odmodule", "OpenScriptingUtil", "pam.1", "pam.2", "pam", "panel.5.4", "panel", "pcap.A", "pcap", "pcre.0", "pcre", "pcreposix.0", "pcreposix", "pgtypes.3.4", "pgtypes.3", "pgtypes", "pmenergy", "pmsample", "poll", "pq.5.6", "pq.5", "pq", "prequelite", "proc", "pthread", "python", "python2.6", "python2.7", "QMIParserDynamic", "quit", "readline", "resolv.9", "resolv", "rpcsvc", "ruby.2.0.0", "ruby.2.0", "ruby", "sandbox.1", "sandbox", "sasl2.2.0.1", "sasl2.2.0.15", "sasl2.2.0.21", "sasl2.2.0.22", "sasl2.2", "sasl2", "ScreenReader", "spindump", "sqlite3.0", "sqlite3", "ssl.0.9.7", "ssl.0.9.8", "ssl.35", "ssl", "stdc\\+\\+.6.0.9", "stdc\\+\\+.6", "stdc\\+\\+", "sysmon", "System.B", "System.B_debug", "System", "System_debug", "systemstats", "tcl", "tcl8.5", "TelephonyUtilDynamic", "termcap", "ThaiTokenizer", "tidy.A", "tidy", "tk", "tk8.5", "tls.6", "tls", "UniversalAccess", "util", "util1.0", "xar.1", "xar", "xcselect", "xml2.2", "xml2", "Xplugin.1", "Xplugin", "XSEvent", "xslt.1", "xslt", "z.1.1.3", "z.1.2.5", "z.1", "z", "ssh-keychain", "dispatch", "system_pthread", "cache", "commonCrypto", "compiler_rt", "copyfile", "corecrypto", "dispatch", "dyld", "keymgr", "kxld", "launch", "macho", "mathCommon.A", "mathCommon", "quarantine", "removefile", "system_asl", "system_blocks", "system_c", "system_configuration", "system_coreservices", "system_coretls", "system_dnssd", "system_info", "system_kernel", "system_m", "system_malloc", "system_network", "system_networkextension", "system_notify", "system_platform", "system_pthread", "system_sandbox", "system_secinit", "system_trace", "unc", "unwind", "xpc", "AGL", "AVFoundation", "AVKit", "Accelerate", "Accounts", "AddressBook", "AppKit", "AppKitScripting", "AppleScriptKit", "AppleScriptObjC", "ApplicationServices", "AudioToolbox", "AudioUnit", "AudioVideoBridging", "Automator", "CFNetwork", "CalendarStore", "Carbon", "CloudKit", "Cocoa", "Collaboration", "Contacts", "ContactsUI", "CoreAudio", "CoreAudioKit", "CoreBluetooth", "CoreData", "CoreFoundation", "CoreGraphics", "CoreImage", "CoreLocation", "CoreMIDI", "CoreMIDIServer", "CoreMedia", "CoreMediaIO", "CoreServices", "CoreTelephony", "CoreText", "CoreVideo", "CoreWLAN", "CryptoTokenKit", "DVComponentGlue", "DVDPlayback", "DirectoryService", "DiscRecording", "DiscRecordingUI", "DiskArbitration", "DrawSprocket", "EventKit", "ExceptionHandling", "FWAUserLib", "FinderSync", "ForceFeedback", "Foundation", "GLKit", "GLUT", "GSS", "GameController", "GameKit", "GameplayKit", "Hypervisor", "ICADevices", "IMServicePlugIn", "IOBluetooth", "IOBluetoothUI", "IOKit", "IOSurface", "ImageCaptureCore", "ImageIO", "InputMethodKit", "InstallerPlugins", "InstantMessage", "JavaFrameEmbedding", "JavaScriptCore", "JavaVM", "Kerberos", "Kernel", "LDAP", "LatentSemanticMapping", "LocalAuthentication", "MapKit", "MediaAccessibility", "MediaLibrary", "MediaToolbox", "Message", "Metal", "MetalKit", "ModelIO", "MultipeerConnectivity", "NetFS", "NetworkExtension", "NotificationCenter", "OSAKit", "OpenAL", "OpenCL", "OpenDirectory", "OpenGL", "PCSC", "Photos", "PhotosUI", "PreferencePanes", "PubSub", "Python", "QTKit", "Quartz", "QuartzCore", "QuickLook", "QuickTime", "Ruby", "SceneKit", "ScreenSaver", "Scripting", "ScriptingBridge", "Security", "SecurityFoundation", "SecurityInterface", "ServiceManagement", "Social", "SpriteKit", "StoreKit", "SyncServices", "System", "SystemConfiguration", "TWAIN", "Tcl", "Tk", "VideoDecodeAcceleration", "VideoToolbox", "WebKit", "vecLib", "vmnet"}; - List allowedLibsTemplates = Arrays.asList(allowedLibsTemplatesArray); String[] allowedFlagsTemplatesArray = new String[]{"-ObjC", "-ObjC++", "-Wa,{{comma_separated_arg}}", "-W{{warning}}", "-ansi", "--ansi", "-std-default={{arg}}", "-stdlib=(libstdc\\+\\+|libc\\+\\+)", "-w", "-std=(c89|c99|c\\+\\+0x|c\\+\\+11|c\\+\\+14|c\\+\\+17|c\\+\\+20)", "-Wp,{{comma_separated_arg}}", "-W{{warning}}", "--extra-warnings", "--warn-{{warning}}", "--warn-={{warning}}", "-ferror-limit={{number}}", "-O([0-4]?|fast|s|z)"}; List allowedFlagsTemplates = Arrays.asList(allowedFlagsTemplatesArray); diff --git a/server/src/test/java/com/defold/extender/IntegrationTest.java b/server/src/test/java/com/defold/extender/IntegrationTest.java index b5b38a7e..fde5e2d9 100644 --- a/server/src/test/java/com/defold/extender/IntegrationTest.java +++ b/server/src/test/java/com/defold/extender/IntegrationTest.java @@ -86,6 +86,11 @@ public DefoldVersion(String sha1, Version version, String[] platforms) this.version = version; this.platforms = platforms; } + + @Override + public String toString() { + return version.toString(); + } } private static class TestConfiguration { diff --git a/server/src/test/java/com/defold/extender/services/cocoapods/PodSpecParserTest.java b/server/src/test/java/com/defold/extender/services/cocoapods/PodSpecParserTest.java index b52c3bc2..051e94c9 100644 --- a/server/src/test/java/com/defold/extender/services/cocoapods/PodSpecParserTest.java +++ b/server/src/test/java/com/defold/extender/services/cocoapods/PodSpecParserTest.java @@ -26,15 +26,15 @@ public class PodSpecParserTest { private static Stream specData() { return Stream.of( - Arguments.of("PNChartboostSDKAdapter", Path.of("test-data/pod_specs/PNChartboostSDKAdapter.json")), - Arguments.of("UnityAds", Path.of("test-data/pod_specs/UnityAds.json")), - Arguments.of("Cuckoo", Path.of("test-data/pod_specs/Cuckoo.json")), - Arguments.of("Rtc555Sdk", Path.of("test-data/pod_specs/Rtc555Sdk.json")), - Arguments.of("streethawk", Path.of("test-data/pod_specs/streethawk.json")), - Arguments.of("AXPracticalHUD", "test-data/pod_specs/AXPracticalHUD.json"), - Arguments.of("PubNub", "test-data/pod_specs/PubNub.json"), - Arguments.of("TPNiOS", "test-data/pod_specs/TPNiOS.json"), - Arguments.of("Wilddog", "test-data/pod_specs/Wilddog.json") + Arguments.of(Path.of("test-data/pod_specs/PNChartboostSDKAdapter.json")), + Arguments.of(Path.of("test-data/pod_specs/UnityAds.json")), + Arguments.of(Path.of("test-data/pod_specs/Cuckoo.json")), + Arguments.of(Path.of("test-data/pod_specs/Rtc555Sdk.json")), + Arguments.of(Path.of("test-data/pod_specs/streethawk.json")), + Arguments.of("test-data/pod_specs/AXPracticalHUD.json"), + Arguments.of("test-data/pod_specs/PubNub.json"), + Arguments.of("test-data/pod_specs/TPNiOS.json"), + Arguments.of("test-data/pod_specs/Wilddog.json") ); } @@ -48,14 +48,14 @@ public void setUp(TestInfo testInfo) throws IOException, InvalidNameException { @ParameterizedTest(name = "{index}_testParsePodSpecs_{0}") @MethodSource("specData") - public void testParsePodSpecs(String alias, Path spec) throws IOException, ExtenderException { + public void testParsePodSpecs(Path spec) throws IOException, ExtenderException { String jsonSpec = Files.readString(spec); assertDoesNotThrow(() -> PodSpecParser.createPodSpec(PodSpecParser.parseJson(jsonSpec), PodUtils.Platform.IPHONEOS, null)); } @ParameterizedTest(name = "{index}_testPodSpecsNoInherited_{0}") @MethodSource("specData") - public void testPodSpecsNoInherited(String alias, Path spec) throws IOException, ExtenderException { + public void testPodSpecsNoInherited(Path spec) throws IOException, ExtenderException { String jsonSpec = Files.readString(spec); PodSpec podSpec = PodSpecParser.createPodSpec(PodSpecParser.parseJson(jsonSpec), PodUtils.Platform.IPHONEOS, null); assertFalse(podSpec.linkflags.contains(INHERITED_VALUE)); diff --git a/server/src/test/java/com/defold/extender/services/cocoapods/PodfileParserTest.java b/server/src/test/java/com/defold/extender/services/cocoapods/PodfileParserTest.java index 8ad0c03b..65bf122c 100644 --- a/server/src/test/java/com/defold/extender/services/cocoapods/PodfileParserTest.java +++ b/server/src/test/java/com/defold/extender/services/cocoapods/PodfileParserTest.java @@ -14,7 +14,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInfo; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; @@ -26,7 +25,7 @@ public class PodfileParserTest { private File wrongPodfile; @BeforeEach - public void setUp(TestInfo testInfo) { + public void setUp() { this.emptyPodfile = new File("test-data/podfiles/empty.Podfile"); this.regularPodfile = new File("test-data/podfiles/regular.Podfile"); this.wrongPodfile = new File("test-data/podfiles/wrong.Podfile"); diff --git a/server/src/test/java/com/defold/extender/services/cocoapods/ResolvedPodsTest.java b/server/src/test/java/com/defold/extender/services/cocoapods/ResolvedPodsTest.java index ed2574b3..66be4292 100644 --- a/server/src/test/java/com/defold/extender/services/cocoapods/ResolvedPodsTest.java +++ b/server/src/test/java/com/defold/extender/services/cocoapods/ResolvedPodsTest.java @@ -39,7 +39,7 @@ public class ResolvedPodsTest { private CocoaPodsServiceBuildState cocoapodsState; CreateBuildSpecArgs args; - class EmptyConfigParser implements IConfigParser { + static class EmptyConfigParser implements IConfigParser { @Override public Map parse(String moduleName, String podName, File xcconfig) throws IOException { return Map.of();