From 5c35e11bb412d5f4e5b8b6a96a2a3410cb54604c Mon Sep 17 00:00:00 2001 From: Georg Schmidt Date: Wed, 20 Feb 2019 23:50:21 +0100 Subject: [PATCH 01/13] testing --- build.gradle | 43 +++++++++++++++++++ settings.gradle | 2 + .../passwords/PasswordStrengthTest.java | 34 +++++++++++++++ 3 files changed, 79 insertions(+) create mode 100644 build.gradle create mode 100644 settings.gradle create mode 100644 test/de/gs_sys/lib/crypto/passwords/PasswordStrengthTest.java diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..6b4ce40 --- /dev/null +++ b/build.gradle @@ -0,0 +1,43 @@ +plugins { + id 'java' +} + +// gradlew.bat build test + +group 'de.gs_sys' +version '1.0-SNAPSHOT' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.12' +} + +sourceSets { + main { + java { + srcDir 'src' + } + } + test { + java { + srcDir 'test' + } + } +} + +test { + useJUnit() +} + +jar { + manifest { + attributes 'Main-Class': 'guifx.FXstarter' +// attributes 'Main-Class': 'gui.PasswordGen' + } +} + diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..57e16cf --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'PasswordGen' + diff --git a/test/de/gs_sys/lib/crypto/passwords/PasswordStrengthTest.java b/test/de/gs_sys/lib/crypto/passwords/PasswordStrengthTest.java new file mode 100644 index 0000000..015757e --- /dev/null +++ b/test/de/gs_sys/lib/crypto/passwords/PasswordStrengthTest.java @@ -0,0 +1,34 @@ +package de.gs_sys.lib.crypto.passwords; + +import org.junit.Test; + +import static org.junit.Assert.*; + +public class PasswordStrengthTest { + + @Test + public void complexity1() { + Complexity com = PasswordStrength.complexity("a!84"); + assertEquals("Complexity{bit=22, length=4, charsetSize=53}", com.toString()); + } + @Test + public void complexity2() { + Complexity com = PasswordStrength.complexity("a!8A4"); + assertEquals("Complexity{bit=31, length=5, charsetSize=79}", com.toString()); + } + @Test + public void complexity3() { + Complexity com = PasswordStrength.complexity("aaaa"); + assertEquals("Complexity{bit=18, length=4, charsetSize=26}", com.toString()); + } + @Test + public void complexity4() { + Complexity com = PasswordStrength.complexity("AAAA"); + assertEquals("Complexity{bit=18, length=4, charsetSize=26}", com.toString()); + } + @Test + public void complexity5() { + Complexity com = PasswordStrength.complexity("0359"); + assertEquals("Complexity{bit=13, length=4, charsetSize=10}", com.toString()); + } +} \ No newline at end of file From e774741ed7f0a2c389ff351bd061e459250a98f6 Mon Sep 17 00:00:00 2001 From: Georg Schmidt Date: Wed, 20 Feb 2019 23:56:26 +0100 Subject: [PATCH 02/13] ci --- .travis.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..3a9ec3a --- /dev/null +++ b/.travis.yml @@ -0,0 +1,18 @@ +language: java +install: true +jdk: +# - oraclejdk8 +# - oraclejdk9 +# - openjdk11 + - openjdk8 +git: + quiet: true +branches: + only: + - test/version1.9 +install: + - gradle --quiet assemble +script: + - gradle --info test +notifications: + email: false \ No newline at end of file From 3f2ee52aaaaac55bd2e9ae01ea81aad727cbf57c Mon Sep 17 00:00:00 2001 From: Georg Schmidt Date: Thu, 21 Feb 2019 00:06:26 +0100 Subject: [PATCH 03/13] ci --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3a9ec3a..4e586bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,4 +15,4 @@ install: script: - gradle --info test notifications: - email: false \ No newline at end of file + email: false From 45b581ee61be55bbc12fdfb06a6b3cca06d19a3e Mon Sep 17 00:00:00 2001 From: Georg Schmidt Date: Thu, 21 Feb 2019 00:11:54 +0100 Subject: [PATCH 04/13] ci --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 4e586bf..18ead01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: java +apply from: 'http://dl.bintray.com/content/shemnon/javafx-gradle/javafx.plugin' install: true jdk: # - oraclejdk8 From 7fc7c93afd1578e1a3e4f680061fa78e2b97804d Mon Sep 17 00:00:00 2001 From: Georg Schmidt Date: Thu, 21 Feb 2019 00:15:40 +0100 Subject: [PATCH 05/13] ci --- .travis.yml | 1 - build.gradle | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 18ead01..4e586bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ language: java -apply from: 'http://dl.bintray.com/content/shemnon/javafx-gradle/javafx.plugin' install: true jdk: # - oraclejdk8 diff --git a/build.gradle b/build.gradle index 6b4ce40..3657b27 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,6 @@ plugins { id 'java' + id 'org.openjfx.javafxplugin' } // gradlew.bat build test From 4908dab768c0ad66c9c8f69b1d53b4d7618d63dd Mon Sep 17 00:00:00 2001 From: Georg Schmidt Date: Thu, 21 Feb 2019 00:19:01 +0100 Subject: [PATCH 06/13] ci --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3657b27..26701fa 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.openjfx.javafxplugin' + id "org.openjfx.javafxplugin" version "0.0.7" } // gradlew.bat build test From 5c19c3be921b90fabd1c07c6975f2c690a118bf7 Mon Sep 17 00:00:00 2001 From: Georg Schmidt Date: Thu, 21 Feb 2019 00:28:30 +0100 Subject: [PATCH 07/13] ci --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 26701fa..511a5ad 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.openjfx.javafxplugin" version "0.0.7" + id "org.openjfx.javafxplugin" version "0.0.6" } // gradlew.bat build test @@ -8,7 +8,7 @@ plugins { group 'de.gs_sys' version '1.0-SNAPSHOT' -sourceCompatibility = 1.8 +sourceCompatibility = 1.9 repositories { mavenCentral() From f57200d06d81ec5593da80fea1d95c8629055337 Mon Sep 17 00:00:00 2001 From: Georg Schmidt Date: Thu, 21 Feb 2019 00:31:31 +0100 Subject: [PATCH 08/13] ci --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e586bf..b75da0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,8 @@ install: true jdk: # - oraclejdk8 # - oraclejdk9 -# - openjdk11 - - openjdk8 + - openjdk11 +# - openjdk8 git: quiet: true branches: From 9986854ab202b656a688ffe4a86b8ad6f5c4bf57 Mon Sep 17 00:00:00 2001 From: Georg Schmidt Date: Thu, 21 Feb 2019 00:34:45 +0100 Subject: [PATCH 09/13] ci --- build.gradle | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 511a5ad..3780537 100644 --- a/build.gradle +++ b/build.gradle @@ -3,12 +3,25 @@ plugins { id "org.openjfx.javafxplugin" version "0.0.6" } +/* +Java 1.2 uses major version 46 +Java 1.3 uses major version 47 +Java 1.4 uses major version 48 +Java 5 uses major version 49 +Java 6 uses major version 50 +Java 7 uses major version 51 +Java 8 uses major version 52 +Java 9 uses major version 53 +Java 10 uses major version 54 +Java 11 uses major version 55 +*/ + // gradlew.bat build test group 'de.gs_sys' version '1.0-SNAPSHOT' -sourceCompatibility = 1.9 +sourceCompatibility = 1.11 repositories { mavenCentral() From bb9b27e0008fcb23c8ed1dd6f4edbc9948d48da9 Mon Sep 17 00:00:00 2001 From: Georg Schmidt Date: Thu, 21 Feb 2019 00:44:43 +0100 Subject: [PATCH 10/13] ci --- gradle/wrapper/gradle-wrapper.properties | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 gradle/wrapper/gradle-wrapper.properties diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..b4ec09a --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Feb 20 22:02:00 CET 2019 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-all.zip From 3d4684a7e4c3fe10b24a3bd6a75016dca9455d34 Mon Sep 17 00:00:00 2001 From: Georg Schmidt Date: Thu, 21 Feb 2019 00:48:36 +0100 Subject: [PATCH 11/13] build --- build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3780537..dedd139 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,11 @@ plugins { id 'java' - id "org.openjfx.javafxplugin" version "0.0.6" + id "org.openjfx.javafxplugin" version "0.0.7" } /* +https://stackoverflow.com/questions/46867399/react-native-error-could-not-determine-java-version-from-9-0-1 + Java 1.2 uses major version 46 Java 1.3 uses major version 47 Java 1.4 uses major version 48 From 3fc1bec613a8df1dfbe5df0f77f9d99e26f481b7 Mon Sep 17 00:00:00 2001 From: Georg Schmidt Date: Thu, 21 Feb 2019 14:23:50 +0100 Subject: [PATCH 12/13] named --- .../de/gs_sys/lib/crypto/passwords/PasswordStrengthTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/de/gs_sys/lib/crypto/passwords/PasswordStrengthTest.java b/test/de/gs_sys/lib/crypto/passwords/PasswordStrengthTest.java index 015757e..865569b 100644 --- a/test/de/gs_sys/lib/crypto/passwords/PasswordStrengthTest.java +++ b/test/de/gs_sys/lib/crypto/passwords/PasswordStrengthTest.java @@ -6,26 +6,31 @@ public class PasswordStrengthTest { + @DisplayName("Mix 1") @Test public void complexity1() { Complexity com = PasswordStrength.complexity("a!84"); assertEquals("Complexity{bit=22, length=4, charsetSize=53}", com.toString()); } + @DisplayName("Mix 2") @Test public void complexity2() { Complexity com = PasswordStrength.complexity("a!8A4"); assertEquals("Complexity{bit=31, length=5, charsetSize=79}", com.toString()); } + @DisplayName("lower char") @Test public void complexity3() { Complexity com = PasswordStrength.complexity("aaaa"); assertEquals("Complexity{bit=18, length=4, charsetSize=26}", com.toString()); } + @DisplayName("upper char") @Test public void complexity4() { Complexity com = PasswordStrength.complexity("AAAA"); assertEquals("Complexity{bit=18, length=4, charsetSize=26}", com.toString()); } + @DisplayName("numbers") @Test public void complexity5() { Complexity com = PasswordStrength.complexity("0359"); From 5e3c0f963fad8a4a59aee7a3588343bc23951c89 Mon Sep 17 00:00:00 2001 From: Georg Schmidt Date: Thu, 21 Feb 2019 15:17:57 +0100 Subject: [PATCH 13/13] fx --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index dedd139..dd9a221 100644 --- a/build.gradle +++ b/build.gradle @@ -31,6 +31,7 @@ repositories { dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' + testCompile "org.testfx:openjfx-monocle:jdk-11+26" // 8u76-b04 for Java 8, jdk-9+181 for Java 9, jdk-11+26 for Java 11 } sourceSets {