Skip to content

Commit 4699f46

Browse files
abnegateabnegate
authored
Merge pull request #769 from appwrite/test-fix-failing-test
fix: tests
2 parents 8f8b134 + d7db297 commit 4699f46

File tree

27 files changed

+159
-536
lines changed

27 files changed

+159
-536
lines changed

‎.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
php-version: ['8.2']
16-
sdk: [Android5Java17, Android14Java17, CLINode16, CLINode18, DartBeta, DartStable, Deno1193, Deno1303, DotNet60, DotNet70, FlutterStable, FlutterBeta, Go112, Go118, KotlinJava8, KotlinJava11, KotlinJava17, Node16, Node18, Node20, PHP74, PHP80, Python38, Python39, Python310, Ruby27, Ruby30, Ruby31, AppleSwift55, Swift55, WebChromium, WebNode]
16+
sdk: [Android5Java17, Android14Java17, CLINode16, CLINode18, DartBeta, DartStable, Deno1193, Deno1303, DotNet60, DotNet70, FlutterStable, FlutterBeta, Go112, Go118, KotlinJava8, KotlinJava11, KotlinJava17, Node16, Node18, Node20, PHP74, PHP80, Python38, Python39, Python310, Ruby27, Ruby30, Ruby31, AppleSwift56, Swift56, WebChromium, WebNode]
1717

1818
steps:
1919
- name: Checkout repository

‎src/SDK/Language/Android.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,6 @@ public function getFiles(): array
145145
'destination' => '/library/src/main/java/{{ sdk.namespace | caseSlash }}/extensions/CollectionExtensions.kt',
146146
'template' => '/android/library/src/main/java/io/package/extensions/CollectionExtensions.kt.twig',
147147
],
148-
[
149-
'scope' => 'default',
150-
'destination' => '/library/src/main/java/{{ sdk.namespace | caseSlash }}/json/PreciseNumberAdapter.kt',
151-
'template' => '/android/library/src/main/java/io/package/json/PreciseNumberAdapter.kt.twig',
152-
],
153148
[
154149
'scope' => 'default',
155150
'destination' => '/library/src/main/java/{{ sdk.namespace | caseSlash }}/models/InputFile.kt',

‎src/SDK/Language/Apple.php

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function getFiles(): array
3333
[
3434
'scope' => 'default',
3535
'destination' => 'Package.swift',
36-
'template' => 'swift/Package.swift.twig',
36+
'template' => 'apple/Package.swift.twig',
3737
],
3838
[
3939
'scope' => 'method',
@@ -246,16 +246,6 @@ public function getFiles(): array
246246
'destination' => '/Sources/{{ spec.title | caseUcfirst}}/WebSockets/WebSocketClientError.swift',
247247
'template' => '/swift/Sources/WebSockets/WebSocketClientError.swift.twig',
248248
],
249-
[
250-
'scope' => 'default',
251-
'destination' => '/Sources/{{ spec.title | caseUcfirst}}/{{ spec.title | caseUcfirst }}Delegate.swift',
252-
'template' => '/swift/Sources/Delegate.swift.twig',
253-
],
254-
[
255-
'scope' => 'default',
256-
'destination' => '/Sources/{{ spec.title | caseUcfirst}}/NotificationHandler.swift',
257-
'template' => '/swift/Sources/NotificationHandler.swift.twig',
258-
],
259249
// Config for project example-swiftui
260250
[
261251
'scope' => 'default',

‎src/SDK/Language/Kotlin.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -386,11 +386,6 @@ public function getFiles(): array
386386
'template' => '/kotlin/src/main/kotlin/io/appwrite/extensions/TypeExtensions.kt.twig',
387387
'minify' => false,
388388
],
389-
[
390-
'scope' => 'default',
391-
'destination' => '/src/main/kotlin/{{ sdk.namespace | caseSlash }}/json/PreciseNumberAdapter.kt',
392-
'template' => '/kotlin/src/main/kotlin/io/appwrite/json/PreciseNumberAdapter.kt.twig',
393-
],
394389
[
395390
'scope' => 'default',
396391
'destination' => '/src/main/kotlin/{{ sdk.namespace | caseSlash }}/services/Service.kt',

‎templates/android/library/src/main/java/io/package/extensions/JsonExtensions.kt.twig

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@ package {{ sdk.namespace | caseDot }}.extensions
22

33
import com.google.gson.Gson
44
import com.google.gson.GsonBuilder
5+
import com.google.gson.ToNumberPolicy
56
import com.google.gson.reflect.TypeToken
6-
import {{ sdk.namespace | caseDot }}.json.PreciseNumberAdapter
77

88
val gson: Gson = GsonBuilder()
9-
.registerTypeAdapter(
10-
object : TypeToken<Map<String, Any>>() {}.type,
11-
PreciseNumberAdapter()
12-
)
9+
.setNumberToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE)
10+
.setObjectToNumberStrategy(ToNumberPolicy.LONG_OR_DOUBLE)
1311
.create()
1412

1513
fun Any.toJson(): String =

‎templates/android/library/src/main/java/io/package/json/PreciseNumberAdapter.kt.twig

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎templates/apple/Package.swift.twig

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
// swift-tools-version:5.1
2+
3+
import PackageDescription
4+
5+
let package = Package(
6+
name: "{{spec.title | caseUcfirst}}",
7+
platforms: [
8+
.iOS("15.0"),
9+
.macOS("11.0"),
10+
.watchOS("7.0"),
11+
.tvOS("13.0"),
12+
],
13+
products: [
14+
.library(
15+
name: "{{spec.title | caseUcfirst}}",
16+
targets: [
17+
"{{spec.title | caseUcfirst}}",
18+
"{{spec.title | caseUcfirst}}Enums",
19+
"{{spec.title | caseUcfirst}}Models",
20+
"JSONCodable"
21+
]
22+
),
23+
],
24+
dependencies: [
25+
.package(url: "https://github.com/swift-server/async-http-client.git", from: "1.9.0"),
26+
.package(url: "https://github.com/apple/swift-nio.git", from: "2.32.0"),
27+
],
28+
targets: [
29+
.target(
30+
name: "{{spec.title | caseUcfirst}}",
31+
dependencies: [
32+
.product(name: "AsyncHTTPClient", package: "async-http-client"),
33+
.product(name: "NIOWebSocket", package: "swift-nio"),
34+
{%~ if spec.definitions is not empty %}
35+
"{{spec.title | caseUcfirst}}Models",
36+
{%~ endif %}
37+
{%~ if spec.enums is not empty %}
38+
"{{spec.title | caseUcfirst}}Enums",
39+
{%~ endif %}
40+
"JSONCodable"
41+
]
42+
),
43+
{%~ if spec.definitions is not empty %}
44+
.target(
45+
name: "{{spec.title | caseUcfirst}}Models",
46+
dependencies: [
47+
"JSONCodable"
48+
]
49+
),
50+
{%~ endif %}
51+
{%~ if spec.enums is not empty %}
52+
.target(
53+
name: "{{spec.title | caseUcfirst}}Enums"
54+
),
55+
{%~ endif %}
56+
.target(
57+
name: "JSONCodable"
58+
),
59+
.testTarget(
60+
name: "{{spec.title | caseUcfirst}}Tests",
61+
dependencies: [
62+
"{{ spec.title | caseUcfirst }}"
63+
]
64+
)
65+
],
66+
swiftLanguageVersions: [.v5]
67+
)

‎templates/apple/Sources/Client.swift.twig

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ open class Client {
5353
http = Client.createHTTP()
5454
addUserAgentHeader()
5555
addOriginHeader()
56-
57-
NotificationHandler.shared.client = self
5856
}
5957

6058
private static func createHTTP(
@@ -88,7 +86,6 @@ open class Client {
8886
decompression: .enabled(limit: .none)
8987
)
9088
)
91-
9289
}
9390

9491
deinit {
@@ -165,19 +162,6 @@ open class Client {
165162
return self
166163
}
167164

168-
///
169-
/// Set push provider ID.
170-
///
171-
/// @param String endpoint
172-
///
173-
/// @return this
174-
///
175-
open func setPushProviderId(_ providerId: String) -> Client {
176-
NotificationHandler.shared.providerId = providerId
177-
178-
return self
179-
}
180-
181165
///
182166
/// Add header
183167
///

‎templates/dart/lib/query.dart.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class Query {
8484
Query._('contains', attribute, value).toString();
8585

8686
static String or(List<String> queries) =>
87-
Query._('and', null, queries.map((query) => jsonDecode(query)).toList()).toString();
87+
Query._('or', null, queries.map((query) => jsonDecode(query)).toList()).toString();
8888

8989
static String and(List<String> queries) =>
9090
Query._('and', null, queries.map((query) => jsonDecode(query)).toList()).toString();

‎templates/dotnet/src/Appwrite/Query.cs.twig

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,16 @@ namespace Appwrite
1717
this.method = method;
1818
this.attribute = attribute;
1919

20-
if (values == null || values is IList)
20+
if (values is IList valuesList)
21+
{
22+
this.values = new List<object>();
23+
foreach (var value in valuesList)
24+
{
25+
this.values.Add(value); // Automatically boxes if value is a value type
26+
}
27+
}
28+
else if (values != null)
2129
{
22-
this.values = (List<object>?)values;
23-
} else {
2430
this.values = new List<object> { values };
2531
}
2632
}

0 commit comments

Comments
 (0)