From f523920d361500001936a26d40787e8ccbc3eb0a Mon Sep 17 00:00:00 2001 From: Saravana Date: Wed, 18 Sep 2024 19:11:10 +0200 Subject: [PATCH] Revert "Testing main flow" --- .github/workflows/coverage.yml | 20 ++++++++----------- .../com/madrapps/playground/MainActivity.kt | 2 +- .../com/madrapps/playground/MainViewModel.kt | 6 +----- .../playground/events/OnClickEvent.kt | 8 -------- math/src/main/java/com/madrapps/math/Math.kt | 4 ---- .../java/com/madrapps/math/MathOperation.kt | 1 - .../main/java/com/madrapps/math/Statistics.kt | 10 ---------- .../main/java/com/madrapps/text/StringOp.java | 7 +------ ...ingOperation.java => StringOperation.java} | 4 +--- 9 files changed, 12 insertions(+), 50 deletions(-) delete mode 100644 app/src/main/java/com/madrapps/playground/events/OnClickEvent.kt delete mode 100644 math/src/main/java/com/madrapps/math/Statistics.kt rename text/src/main/java/com/madrapps/text/{IStringOperation.java => StringOperation.java} (62%) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index bcb1705..e9caa8d 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -23,21 +23,17 @@ jobs: - name: Jacoco Report to PR id: jacoco - uses: madrapps/jacoco-report@workflow_summary + uses: madrapps/jacoco-report@v1.2 with: paths: | - ${{ github.workspace }}/**/build/reports/jacoco/**/**.xml, - ${{ github.workspace }}/**/build/reports/jacoco/**/**.xml + ${{ github.workspace }}/app/build/reports/jacoco/prodNormalDebugCoverage/prodNormalDebugCoverage.xml, + ${{ github.workspace }}/math/build/reports/jacoco/debugCoverage/debugCoverage.xml, + ${{ github.workspace }}/text/build/reports/jacoco/debugCoverage/debugCoverage.xml token: ${{ secrets.GITHUB_TOKEN }} - min-coverage-overall: 45 - min-coverage-changed-files: 84 - title: '# :lobster: `Coverage Report`' - update-comment: true - comment-type: 'both' - pass-emoji: ':green_circle:' - fail-emoji: ':red_circle:' - continue-on-error: true - debug-mode: true + min-coverage-overall: 40 + min-coverage-changed-files: 60 + title: Code Coverage + debug-mode: false - name: Get the Coverage info run: | diff --git a/app/src/main/java/com/madrapps/playground/MainActivity.kt b/app/src/main/java/com/madrapps/playground/MainActivity.kt index f3086da..7b81fbc 100644 --- a/app/src/main/java/com/madrapps/playground/MainActivity.kt +++ b/app/src/main/java/com/madrapps/playground/MainActivity.kt @@ -17,7 +17,7 @@ class MainActivity : AppCompatActivity() { val userId = "admin" val model: MainViewModel by viewModels() Log.d("App", "Validate = ${model.validate(userId)}") - Log.d("App", "Verify Access = ${model.verifyAccess1(userId)}") + Log.d("App", "Verify Access = ${model.verifyAccess(userId)}") // Math module val arithmetic = Arithmetic() diff --git a/app/src/main/java/com/madrapps/playground/MainViewModel.kt b/app/src/main/java/com/madrapps/playground/MainViewModel.kt index 9006cbe..4977769 100644 --- a/app/src/main/java/com/madrapps/playground/MainViewModel.kt +++ b/app/src/main/java/com/madrapps/playground/MainViewModel.kt @@ -8,11 +8,7 @@ class MainViewModel : ViewModel() { return userId == "admin" } - fun verifyAccess1(userId: String): Boolean { + fun verifyAccess(userId: String): Boolean { return userId == "super-admin" } - - fun verifyPassword(password: String): Boolean { - return password.isNotBlank() - } } diff --git a/app/src/main/java/com/madrapps/playground/events/OnClickEvent.kt b/app/src/main/java/com/madrapps/playground/events/OnClickEvent.kt deleted file mode 100644 index 4652f55..0000000 --- a/app/src/main/java/com/madrapps/playground/events/OnClickEvent.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.madrapps.playground.events - -class OnClickEvent { - - fun onClick() { - // do nothing - } -} \ No newline at end of file diff --git a/math/src/main/java/com/madrapps/math/Math.kt b/math/src/main/java/com/madrapps/math/Math.kt index f60d60b..0963a0c 100644 --- a/math/src/main/java/com/madrapps/math/Math.kt +++ b/math/src/main/java/com/madrapps/math/Math.kt @@ -18,10 +18,6 @@ class Arithmetic : MathOperation { return a / b } - override fun difference(a: Int, b: Int): Int { - return subtract(a, b) - } - fun modulo(a: Int, b: Int): Int { return a % b } diff --git a/math/src/main/java/com/madrapps/math/MathOperation.kt b/math/src/main/java/com/madrapps/math/MathOperation.kt index 01394b3..521eb92 100644 --- a/math/src/main/java/com/madrapps/math/MathOperation.kt +++ b/math/src/main/java/com/madrapps/math/MathOperation.kt @@ -5,7 +5,6 @@ interface MathOperation { fun subtract(a: Int, b: Int): Int fun multiply(a: Int, b: Int): Int fun divide(a: Int, b: Int): Int - fun difference(a: Int, b: Int): Int interface MathOp { diff --git a/math/src/main/java/com/madrapps/math/Statistics.kt b/math/src/main/java/com/madrapps/math/Statistics.kt deleted file mode 100644 index 209af39..0000000 --- a/math/src/main/java/com/madrapps/math/Statistics.kt +++ /dev/null @@ -1,10 +0,0 @@ -@file:Suppress("unused") - -package com.madrapps.math - -class Statistics { - - fun rateOfFlow(): Double { - return 0.1 - } -} diff --git a/text/src/main/java/com/madrapps/text/StringOp.java b/text/src/main/java/com/madrapps/text/StringOp.java index 16198af..37b5ee5 100644 --- a/text/src/main/java/com/madrapps/text/StringOp.java +++ b/text/src/main/java/com/madrapps/text/StringOp.java @@ -3,7 +3,7 @@ /** * String related operation */ -public class StringOp implements IStringOperation { +public class StringOp implements StringOperation { @Override public boolean endsWith(String source, String chars) { @@ -14,9 +14,4 @@ public boolean endsWith(String source, String chars) { public boolean startsWith(String source, String chars) { return source.startsWith(chars); } - - @Override - public boolean replace(String from, String to) { - return false; - } } diff --git a/text/src/main/java/com/madrapps/text/IStringOperation.java b/text/src/main/java/com/madrapps/text/StringOperation.java similarity index 62% rename from text/src/main/java/com/madrapps/text/IStringOperation.java rename to text/src/main/java/com/madrapps/text/StringOperation.java index b56a46d..5e4f394 100644 --- a/text/src/main/java/com/madrapps/text/IStringOperation.java +++ b/text/src/main/java/com/madrapps/text/StringOperation.java @@ -1,9 +1,7 @@ package com.madrapps.text; -public interface IStringOperation { +public interface StringOperation { boolean endsWith(String source, String chars); boolean startsWith(String source, String chars); - - boolean replace(String from, String to); }