Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: Introduce unit testing to framework #314

Merged
merged 58 commits into from
May 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
9e05637
Upgrade Gradle to 7.4 and Node.js to 16.x
scroix Mar 18, 2024
c10d6ef
Bump Gradle version to 7.6.4
scroix Mar 29, 2024
0fcc59e
Replace deprecated jcenter
scroix Mar 29, 2024
2c8f6f5
Resolve minor warnings
scroix Mar 29, 2024
d151cda
Bump node-gradle plugin version to 7.0.2
scroix Mar 29, 2024
8a93e80
Enable some speed-ups
scroix Mar 29, 2024
48c0b59
Attempt to cache grunt
scroix Mar 29, 2024
3121adf
Add hack for "cache" of grunt tasks
scroix Mar 29, 2024
3e66086
Further attempt to cache the grunt task
scroix Mar 29, 2024
820dba9
Remove the grunt script from the package.json
scroix Mar 29, 2024
2fd735b
Maybe this is working now
scroix Mar 29, 2024
1a766c2
Remove Gradle optimisation flags
scroix Mar 29, 2024
027a129
Remove unneccesary dir check during Gradle webui tasks
scroix Mar 29, 2024
d65be71
Move the feature to check for file changes into a class
scroix Mar 29, 2024
1b0b706
Add a couple more optimisations
scroix Mar 29, 2024
162d58d
Revert node version to simplify grunt issue
scroix Mar 30, 2024
0cfb6fd
Revert to original devDependencies
scroix Mar 30, 2024
9018716
Move project info variables to top-level build file
scroix Mar 30, 2024
90c5066
Update gradlew files
scroix Mar 30, 2024
d23abeb
Switch to Gradle bin
scroix Mar 30, 2024
058a407
Update gradle-wrapper.jar
scroix Mar 30, 2024
997b677
Revert "Update gradle-wrapper.jar"
scroix Mar 30, 2024
138c477
Stop targetting specific Gruntfile command
scroix Apr 3, 2024
de67ed4
Rename branch in support of .jar generation
scroix Apr 4, 2024
36a59f3
minor: ignore IntelliJ IDE files
scroix Apr 4, 2024
9328669
Add JUnit as a testing framework
scroix Apr 4, 2024
6114356
Add first ever JUnit tests
scroix Apr 4, 2024
a37d107
Add Mockito and Logback test dependencies
scroix Apr 4, 2024
9e53135
minor: Remove public declaration from SimpleNameTest
scroix Apr 4, 2024
ac56791
Add GitHubIssue annotation to mark up tests
scroix Apr 4, 2024
1440a78
Introduce test cases to cover expected names of dynamically generated…
scroix Apr 4, 2024
9a23d63
minor: ignore IntelliJ IDE files
scroix Apr 4, 2024
e7b7e3e
Add JUnit as a testing framework
scroix Apr 4, 2024
7586d24
Add first ever JUnit tests
scroix Apr 4, 2024
5ebcf19
Add Mockito and Logback test dependencies
scroix Apr 4, 2024
9d003b7
minor: Remove public declaration from SimpleNameTest
scroix Apr 4, 2024
b67c120
Add GitHubIssue annotation to mark up tests
scroix Apr 4, 2024
e386b21
Introduce test cases to cover expected names of dynamically generated…
scroix Apr 4, 2024
2ff6dda
Merge branch 'feature/introduce-junit-testing' of github.com:scroix/n…
scroix Apr 6, 2024
08e99fe
Manually 'rebase' in preparation for PR
scroix Apr 6, 2024
6a0ed30
Revert "minor: ignore IntelliJ IDE files"
scroix Apr 6, 2024
128dbe2
Re-add Gradle job for running tests
scroix Apr 6, 2024
e74f409
Revert to original parent build file
scroix Apr 6, 2024
d9830bc
Revert to Java 8 compatible logback dependency
scroix Apr 19, 2024
14b7033
Add JUnit as a testing framework
scroix Apr 4, 2024
2daa92b
Add first ever JUnit tests
scroix Apr 4, 2024
c04baf2
Add Mockito and Logback test dependencies
scroix Apr 4, 2024
a1c0e13
minor: Remove public declaration from SimpleNameTest
scroix Apr 4, 2024
da01834
Add GitHubIssue annotation to mark up tests
scroix Apr 4, 2024
1198db3
Introduce test cases to cover expected names of dynamically generated…
scroix Apr 4, 2024
9a0ebd2
Add JUnit as a testing framework
scroix Apr 4, 2024
b1a73ad
Add first ever JUnit tests
scroix Apr 4, 2024
50dfbcb
Merge branch 'feature/introduce-junit-testing' of github.com:scroix/n…
scroix Apr 20, 2024
ca5bc00
Revert "Merge branch 'feature/introduce-junit-testing' of github.com:…
scroix Apr 20, 2024
1b9e15b
Revert to Java 8 compatible logback dependency
scroix Apr 19, 2024
1d9d4ad
Revert "Revert to Java 8 compatible logback dependency"
scroix Apr 24, 2024
a2a27fd
Apply Java 11 compile patch from @justparking
scroix Apr 24, 2024
3c3bd3e
Fix broken versioning of nodehost builds
scroix Apr 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,47 @@
import org.joda.time.DateTime

buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'joda-time:joda-time:2.10.10'
}
}

ext {
getGitInfo = {
return [
branch : 'git rev-parse --abbrev-ref HEAD'.execute().text.trim(),
id : 'git rev-parse HEAD'.execute().text.trim(),
rev : 'git rev-list --count HEAD'.execute().text.trim(),
origin : 'git config --get remote.origin.url'.execute().text.trim()
]
}

gitInfo = getGitInfo()
buildSummary = gitInfo.id
hostname = InetAddress.getLocalHost().getHostName().toUpperCase()
now = DateTime.now().toString()
rev = gitInfo.rev.replaceAll(/[^a-zA-Z0-9]/, '')

branch = gitInfo.branch
if (branch == 'master') {
branch = 'release'
} else if (branch.contains('/')) {
branch = branch.substring(branch.indexOf('/') + 1)
}

baseVersion = '2.2.1'
versionIdentifier = "${baseVersion}-${branch}_r${rev}"
println "versionIdentifier: ${versionIdentifier}"
}

subprojects {
apply plugin: 'java'
group = 'org.nodel'
version = '2.2.1'
version = rootProject.ext.baseVersion
repositories {
mavenCentral()
}
}
}
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading