Skip to content

Commit d5b0aa4

Browse files
bojankomabojankoma
authored
Merge pull request #101 from infinum/develop
Develop
2 parents 8d2d695 + cb895c4 commit d5b0aa4

File tree

178 files changed

+2916
-2014
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+2916
-2014
lines changed

‎.codecov.yml‎

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

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
Changelog
22
=========
33

4+
## Version 5.4.2
5+
6+
_2021-12-24_
7+
8+
* Update to Kotlin 1.6.10.
9+
* Update Corooutines to 1.6.0.
10+
* Update Gradle wrapper to 7.3.3.
11+
* Refactor edit database activity to rename database dialog.
12+
413
## Version 5.4.1
514

615
_2021-09-25_

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ Then add the following dependencies in your app `build.gradle` or `build.gradle.
4444

4545
**Groovy**
4646
```groovy
47-
debugImplementation "com.infinum.dbinspector:dbinspector:5.4.1"
48-
releaseImplementation "com.infinum.dbinspector:dbinspector-no-op:5.4.1"
47+
debugImplementation "com.infinum.dbinspector:dbinspector:5.4.2"
48+
releaseImplementation "com.infinum.dbinspector:dbinspector-no-op:5.4.2"
4949
```
5050
**KotlinDSL**
5151
```kotlin
52-
debugImplementation("com.infinum.dbinspector:dbinspector:5.4.1")
53-
releaseImplementation("com.infinum.dbinspector:dbinspector-no-op:5.4.1")
52+
debugImplementation("com.infinum.dbinspector:dbinspector:5.4.2")
53+
releaseImplementation("com.infinum.dbinspector:dbinspector-no-op:5.4.2")
5454
```
5555

5656
### Usage

‎build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ buildscript {
1616
classpath libs.ktlint
1717
classpath libs.dokka
1818
classpath libs.protobuf.gradle
19+
classpath libs.kover
1920
}
2021
}
2122

‎config.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ext {
77
]
88
releaseConfig = [
99
"group" : "com.infinum.dbinspector",
10-
"version" : "5.4.1",
11-
"versionCode": 5 * 100 * 100 + 4 * 100 + 1
10+
"version" : "5.4.2",
11+
"versionCode": 5 * 100 * 100 + 4 * 100 + 2
1212
]
1313
}

‎dbinspector/build.gradle‎

Lines changed: 39 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
import org.gradle.api.tasks.testing.logging.TestLogEvent
2-
import org.gradle.api.tasks.testing.TestListener
3-
import org.gradle.api.tasks.testing.TestResult.ResultType
4-
import groovy.time.TimeCategory
5-
import groovy.time.TimeDuration
6-
71
plugins {
82
id "com.android.library"
93
id "kotlin-android"
104
id "kotlin-parcelize"
115
id "com.google.protobuf"
6+
id "kover"
127
}
138

149
android {
@@ -56,6 +51,36 @@ android {
5651

5752
testOptions {
5853
unitTests.returnDefaultValues = true
54+
unitTests.all {
55+
kover {
56+
enabled = name == "testDebugUnitTest"
57+
includes = [
58+
"com.infinum.dbinspector.data.sources.*",
59+
"com.infinum.dbinspector.domain.*.*UseCase*.*",
60+
"com.infinum.dbinspector.domain.*.*Repository*.*",
61+
"com.infinum.dbinspector.domain.*.*Control*.*",
62+
"com.infinum.dbinspector.domain.*.*Converter*.*",
63+
"com.infinum.dbinspector.domain.*.*Mapper*.*",
64+
"com.infinum.dbinspector.domain.*.*Interactor*.*",
65+
"com.infinum.dbinspector.ui.*.*ViewModel*.*"
66+
]
67+
excludes = [
68+
"com.infinum.dbinspector.di.*",
69+
"com.infinum.dbinspector.data.shared.base.*",
70+
"com.infinum.dbinspector.domain.schema.shared.models.*",
71+
"com.infinum.dbinspector.domain.shared.base.*",
72+
"com.infinum.dbinspector.domain.shared.models.dsl.*",
73+
"com.infinum.dbinspector.ui.shared.base.*",
74+
"com.infinum.dbinspector.ui.shared.delegates.*",
75+
"com.infinum.dbinspector.ui.shared.edgefactories.*",
76+
"com.infinum.dbinspector.ui.shared.listeners.*",
77+
"com.infinum.dbinspector.ui.shared.searchable.*",
78+
"com.infinum.dbinspector.ui.shared.views.*",
79+
"com.infinum.dbinspector.extensions.*",
80+
"com.infinum.dbinspector.databinding.*"
81+
]
82+
}
83+
}
5984
}
6085

6186
sourceSets.each {
@@ -97,122 +122,16 @@ protobuf {
97122
}
98123
}
99124

125+
kover {
126+
enabled = true
127+
coverageEngine.set(kotlinx.kover.api.CoverageEngine.INTELLIJ)
128+
intellijEngineVersion.set(libs.versions.intellij.get())
129+
jacocoEngineVersion.set(libs.versions.jacoco.get())
130+
generateReportOnCheck.set(true)
131+
}
132+
100133
tasks.withType(Test) {
101134
useJUnitPlatform()
102-
// testLogging {
103-
// events TestLogEvent.FAILED, TestLogEvent.SKIPPED // , TestLogEvent.PASSED
104-
// }
105-
def testListener = new TestListener() {
106-
107-
def template = """
108-
109-
# {timestamp}
110-
## Duration
111-
{duration}
112-
## Count
113-
| Total | Passed | Failed | Failed |
114-
|:-------------:|:--------------:|:--------------:|:---------------:|
115-
| {total_count} | {passed_count} | {failed_count} | {skipped_count} |
116-
## Details
117-
<details>
118-
<summary>PASSED</summary>
119-
120-
{passed}
121-
</details>
122-
<details>
123-
<summary>FAILED</summary>
124-
125-
{failed}
126-
</details>
127-
<details>
128-
<summary>SKIPPED</summary>
129-
130-
{skipped}
131-
</details>
132-
133-
"""
134-
ArrayList<TestDescriptor> passed = new ArrayList<TestDescriptor>()
135-
ArrayList<TestDescriptor> failed = new ArrayList<TestDescriptor>()
136-
ArrayList<TestDescriptor> skipped = new ArrayList<TestDescriptor>()
137-
138-
@Override
139-
void beforeSuite(TestDescriptor testDescriptor) {
140-
141-
}
142-
143-
@Override
144-
void afterSuite(TestDescriptor testDescriptor, TestResult testResult) {
145-
if (testDescriptor.getParent() == null) {
146-
TimeDuration duration = TimeCategory.minus(new Date(testResult.endTime), new Date(testResult.startTime))
147-
148-
def passedSuite = ""
149-
Map<TestDescriptor, List<TestDescriptor>> passedMap = passed.groupBy { it.parent }
150-
passedMap.each {
151-
passedSuite += " * " + it.key.displayName
152-
passedSuite += "\n"
153-
it.value.each {
154-
passedSuite += " * " + it.displayName
155-
passedSuite += "\n"
156-
}
157-
}
158-
def failedSuite = ""
159-
Map<TestDescriptor, List<TestDescriptor>> failedMap = failed.groupBy { it.parent }
160-
failedMap.each {
161-
failedSuite += " * " + it.key.displayName
162-
failedSuite += "\n"
163-
it.value.each {
164-
failedSuite += " * " + it.displayName
165-
failedSuite += "\n"
166-
}
167-
}
168-
def skippedSuite = ""
169-
Map<TestDescriptor, List<TestDescriptor>> skippedMap = skipped.groupBy { it.parent }
170-
skippedMap.each {
171-
skippedSuite += " * " + it.key.displayName
172-
skippedSuite += "\n"
173-
it.value.each {
174-
skippedSuite += " * " + it.displayName
175-
skippedSuite += "\n"
176-
}
177-
}
178-
179-
File file = new File("test_report.md")
180-
file << template
181-
.replace("{timestamp}", new Date().format("dd.MM.yyyy. - HH:mm"))
182-
.replace("{duration}", duration.toString())
183-
.replace("{total_count}", testResult.testCount + "")
184-
.replace("{passed_count}", testResult.successfulTestCount + "")
185-
.replace("{failed_count}", testResult.failedTestCount + "")
186-
.replace("{skipped_count}", testResult.skippedTestCount + "")
187-
.replace("{passed}", passedSuite)
188-
.replace("{failed}", failedSuite)
189-
.replace("{skipped}", skippedSuite)
190-
}
191-
}
192-
193-
@Override
194-
void beforeTest(TestDescriptor testDescriptor) {
195-
196-
}
197-
198-
@Override
199-
void afterTest(TestDescriptor testDescriptor, TestResult testResult) {
200-
// println('\n\nNAME: ' + testDescriptor.name + '\nDISPLAY NAME: ' + testDescriptor.displayName + '\nCLASS NAME: ' + testDescriptor.className + '\nIS COMPOSITE: ' + testDescriptor.isComposite() + '\nPARENT: ' + testDescriptor.parent + '\nRESULT: ' + testResult.resultType)
201-
if (testResult.resultType == ResultType.FAILURE || testResult.resultType == ResultType.SKIPPED) {
202-
println('\n\nNAME: ' + testDescriptor.name + '\nDISPLAY NAME: ' + testDescriptor.displayName + '\nCLASS NAME: ' + testDescriptor.className + '\nIS COMPOSITE: ' + testDescriptor.isComposite() + '\nPARENT: ' + testDescriptor.parent + '\nRESULT: ' + testResult.resultType)
203-
}
204-
if (testResult.resultType == ResultType.FAILURE) {
205-
failed += testDescriptor
206-
} else if (testResult.resultType == ResultType.SKIPPED) {
207-
skipped += testDescriptor
208-
} else if (testResult.resultType == ResultType.SUCCESS) {
209-
passed += testDescriptor
210-
}
211-
}
212-
}
213-
addTestListener(testListener)
214-
finalizedBy jacocoTestReport
215135
}
216136

217-
apply from: "jacoco.gradle"
218137
apply from: "publish.gradle"

‎dbinspector/jacoco.gradle‎

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

‎dbinspector/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@
3333
android:taskAffinity="com.infinum.dbinspector"
3434
android:theme="@style/DbInspector.BaseTheme" />
3535

36-
<activity
37-
android:name="com.infinum.dbinspector.ui.databases.edit.EditDatabaseActivity"
38-
android:exported="false"
39-
android:taskAffinity="com.infinum.dbinspector"
40-
android:theme="@style/DbInspector.BaseTheme" />
41-
4236
<activity
4337
android:name="com.infinum.dbinspector.ui.schema.SchemaActivity"
4438
android:exported="false"

‎dbinspector/src/main/kotlin/com/infinum/dbinspector/data/Data.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ internal object Data {
145145
get(qualifier = Qualifiers.Schema.TRIGGERS),
146146
get(qualifier = Qualifiers.Schema.TRIGGER_BY_NAME),
147147
get(qualifier = Qualifiers.Schema.DROP_TRIGGER),
148-
get(),
149148
get()
150149
)
151150
}
@@ -155,15 +154,13 @@ internal object Data {
155154
get(qualifier = Qualifiers.Pragma.TABLE_INFO),
156155
get(qualifier = Qualifiers.Pragma.FOREIGN_KEYS),
157156
get(qualifier = Qualifiers.Pragma.INDEXES),
158-
get(),
159157
get()
160158
)
161159
}
162160

163161
factory<Sources.Local.RawQuery> {
164162
RawQuerySource(
165163
get(qualifier = Qualifiers.Schema.RAW_QUERY),
166-
get(),
167164
get()
168165
)
169166
}

‎dbinspector/src/main/kotlin/com/infinum/dbinspector/data/sources/local/cursor/PragmaSource.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import com.infinum.dbinspector.data.models.local.cursor.output.FieldType
99
import com.infinum.dbinspector.data.models.local.cursor.output.QueryResult
1010
import com.infinum.dbinspector.data.models.local.cursor.output.Row
1111
import com.infinum.dbinspector.data.sources.local.cursor.shared.CursorSource
12-
import com.infinum.dbinspector.data.sources.memory.logger.Logger
1312
import com.infinum.dbinspector.data.sources.memory.pagination.Paginator
1413
import kotlin.coroutines.resume
1514
import kotlin.coroutines.resumeWithException
@@ -19,9 +18,8 @@ internal class PragmaSource(
1918
private val tableInfoPaginator: Paginator,
2019
private val foreignKeysPaginator: Paginator,
2120
private val indexesPaginator: Paginator,
22-
private val store: Sources.Local.Settings,
23-
logger: Logger
24-
) : CursorSource(logger), Sources.Local.Pragma {
21+
private val store: Sources.Local.Settings
22+
) : CursorSource(), Sources.Local.Pragma {
2523

2624
override suspend fun getUserVersion(query: Query): QueryResult =
2725
store.current().let {

0 commit comments

Comments
 (0)