Skip to content

Commit

Permalink
refactor: Move tools from corellium directory (#2038)
Browse files Browse the repository at this point in the history
Fixes #2003 

Just moves some files between directories
  • Loading branch information
jan-goral authored Jun 18, 2021
1 parent 46a701f commit af7a9ba
Show file tree
Hide file tree
Showing 65 changed files with 42 additions and 40 deletions.
4 changes: 2 additions & 2 deletions corellium/cli/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ dependencies {
implementation(project(":corellium:api"))
implementation(project(":corellium:domain"))
implementation(project(":corellium:adapter"))
implementation(project(":corellium:apk"))
implementation(project(":corellium:junit"))
implementation(project(":tool:apk"))
implementation(project(":tool:junit"))
implementation(Dependencies.JACKSON_KOTLIN)
implementation(Dependencies.JACKSON_YAML)
implementation(Dependencies.JACKSON_XML)
Expand Down
14 changes: 7 additions & 7 deletions corellium/domain/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ tasks.withType<KotlinCompile> { kotlinOptions.jvmTarget = "1.8" }
dependencies {
implementation(Dependencies.KOTLIN_COROUTINES_CORE)
implementation(project(":corellium:api"))
implementation(project(":corellium:apk"))
implementation(project(":corellium:shard:calculate"))
implementation(project(":corellium:shard:obfuscate"))
implementation(project(":corellium:shard:dump"))
implementation(project(":corellium:instrument:command"))
implementation(project(":corellium:instrument:log"))
implementation(project(":corellium:junit"))
implementation(project(":tool:apk"))
implementation(project(":tool:shard:calculate"))
implementation(project(":tool:shard:obfuscate"))
implementation(project(":tool:shard:dump"))
implementation(project(":tool:instrument:command"))
implementation(project(":tool:instrument:log"))
implementation(project(":tool:junit"))

testImplementation(Dependencies.JUNIT)
testImplementation(project(":corellium:adapter"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import flank.corellium.domain.run.test.android.step.parseTestCasesFromApks
import flank.corellium.domain.run.test.android.step.prepareShards
import flank.corellium.domain.util.CreateTransformation
import flank.corellium.domain.util.execute
import flank.corellium.shard.Shard
import flank.instrument.log.Instrument
import flank.junit.JUnit
import flank.shard.Shard
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.runBlocking
import java.lang.System.currentTimeMillis
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package flank.corellium.domain.run.test.android.step

import flank.corellium.domain.RunTestCorelliumAndroid
import flank.corellium.shard.dumpTo
import flank.corellium.shard.obfuscate
import flank.shard.dumpTo
import flank.shard.obfuscate
import java.io.File

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package flank.corellium.domain.run.test.android.step

import flank.corellium.api.AndroidApps
import flank.corellium.domain.RunTestCorelliumAndroid
import flank.corellium.shard.Shard
import flank.shard.Shard
import kotlinx.coroutines.delay

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package flank.corellium.domain.run.test.android.step

import flank.corellium.domain.RunTestCorelliumAndroid
import flank.corellium.shard.Shard
import flank.corellium.shard.calculateShards
import flank.shard.Shard
import flank.shard.calculateShards

/**
* The step is calculating shards data.
Expand Down
24 changes: 13 additions & 11 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,22 @@ include(
"samples:gradle-export-api",
"test_projects:android",
":common",

":corellium:cli",
":corellium:domain",
":corellium:sandbox",
":corellium:client",
":corellium:instrument:log",
":corellium:instrument:command",
":corellium:api",
":corellium:apk",
":corellium:shard",
":corellium:shard:calculate",
":corellium:shard:obfuscate",
":corellium:shard:dump",
":corellium:adapter",
":corellium:junit",
":corellium:domain",
":corellium:cli",
":corellium:client",

":tool:apk",
":tool:shard",
":tool:shard:calculate",
":tool:shard:obfuscate",
":tool:shard:dump",
":tool:instrument:command",
":tool:instrument:log",
":tool:junit",
)

plugins {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ tasks.withType<KotlinCompile> { kotlinOptions.jvmTarget = "1.8" }

dependencies {
implementation(Dependencies.KOTLIN_COROUTINES_CORE)
api(project(":corellium:shard"))
api(project(":tool:shard"))

testImplementation(Dependencies.JUNIT)
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package flank.corellium.shard
package flank.shard

/**
* Distribute the test cases into the [List] of shards where each shard have similar duration.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package flank.corellium.shard
package flank.shard

import kotlin.math.min

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package flank.corellium.shard
package flank.shard

import org.junit.Assert
import org.junit.Test as JTest
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ tasks.withType<KotlinCompile> { kotlinOptions.jvmTarget = "1.8" }
dependencies {
implementation(Dependencies.KOTLIN_COROUTINES_CORE)
implementation(Dependencies.GSON)
api(project(":corellium:shard"))
api(project(":tool:shard"))

testImplementation(Dependencies.JUNIT)
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package flank.corellium.shard
package flank.shard

import flank.corellium.shard.mapper.prettyGson
import flank.shard.mapper.prettyGson
import java.io.Writer

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package flank.corellium.shard.mapper
package flank.shard.mapper

import com.google.gson.Gson
import com.google.gson.GsonBuilder
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package flank.corellium.shard
package flank.shard

import org.junit.After
import org.junit.Assert
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repositories {
tasks.withType<KotlinCompile> { kotlinOptions.jvmTarget = "1.8" }

dependencies {
api(project(":corellium:shard"))
api(project(":tool:shard"))

testImplementation(Dependencies.JUNIT)
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package flank.corellium.shard
package flank.shard

private const val LOWER_CASE_CHARS = "abcdefghijklmnopqrstuvwxyz"
private const val UPPER_CASE_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package flank.corellium.shard
package flank.shard

/**
* Obfuscate each test cases names.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package flank.corellium.shard
package flank.shard

import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotEquals
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package flank.corellium.shard
package flank.shard

/**
* Namespace for sharding input and output structures.
Expand Down

0 comments on commit af7a9ba

Please sign in to comment.