iSharkFly-Open/Java-Tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '更新 Junit 5 的测试类并且准备使用 main 分支' (#15) from code_bank into master

Browse Source 
Reviewed-on: https://src.ossez.com/cwiki-us-docs/java-tutorials/pulls/15
This commit is contained in:
honeymoose
2022-04-30 18:44:20 -04:00
parent 7bb2e0e930 6392d5e31c
commit 6069eeca67
14 changed files with 263 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/compiler.xml
Generated
+51 -52
View File
@@ -2,73 +2,72 @@
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="jmh" />
<module name="assertion-libraries" />
<module name="cucumber" />
<module name="core-java-annotations" />
<module name="jackson-simple" />
<module name="spring-testing-2" />
<module name="test-containers" />
<module name="mockserver" />
<module name="spring-testing" />
<module name="xml" />
<module name="core-java-datetime-conversion" />
<module name="testing-libraries" />
<module name="mocks" />
<module name="load-testing-comparison" />
<module name="junit-5-basics" />
<module name="mockito-2" />
<module name="testing-assertions" />
<module name="easymock" />
<module name="codebank" />
<module name="core-java-collections-list" />
<module name="junit5-migration" />
<module name="core-java-io" />
<module name="easy-random" />
<module name="junit-5" />
<module name="junit-4" />
<module name="junit-5-advanced" />
<module name="rest-testing" />
<module name="jackson-exceptions" />
<module name="core-java-8" />
<module name="jackson-conversions" />
<module name="math-test-functions" />
<module name="java-numbers-2" />
<module name="jackson-annotations" />
<module name="java-numbers" />
<module name="mockito" />
<module name="jackson" />
<module name="groovy-spock" />
<module name="jackson-conversions-2" />
<module name="codebank" />
<module name="selenium-junit-testng" />
<module name="junit5-annotations" />
<module name="mockito-3" />
<module name="powermock" />
<module name="zerocode" />
<module name="gatling" />
<module name="discourse" />
<module name="rest-assured" />
<module name="jackson-custom-conversions" />
<module name="testing-libraries-2" />
<module name="string-test-functions" />
<module name="xmlunit-2" />
<module name="testng" />
<module name="hamcrest" />
<module name="core-java-8" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="cucumber" target="14" />
<module name="easy-random" target="11" />
<module name="easymock" target="1.5" />
<module name="gatling" target="1.8" />
<module name="groovy-spock" target="11" />
<module name="hamcrest" target="1.5" />
<module name="jackson" target="11" />
<module name="jackson-annotations" target="11" />
<module name="jackson-conversions" target="11" />
<module name="jackson-conversions-2" target="11" />
<module name="jackson-custom-conversions" target="11" />
<module name="jackson-exceptions" target="11" />
<module name="jackson-modules" target="11" />
<module name="jackson-simple" target="11" />
<module name="java-numbers" target="11" />
<module name="java-numbers-2" target="11" />
<module name="jmh" target="11" />
<module name="junit-4" target="1.5" />
<module name="junit-5" target="11" />
<module name="junit-5-advanced" target="11" />
<module name="junit-5-basics" target="11" />
<module name="junit5-annotations" target="11" />
<module name="load-testing-comparison" target="1.8" />
<module name="math-test-functions" target="1.5" />
<module name="mockito" target="1.5" />
<module name="mockito-2" target="11" />
<module name="mockito-3" target="1.5" />
<module name="mocks" target="1.5" />
<module name="mockserver" target="11" />
<module name="parallel-tests-junit" target="1.5" />
<module name="parent-java" target="11" />
<module name="powermock" target="1.5" />
<module name="rest-assured" target="11" />
<module name="rest-testing" target="11" />
<module name="selenium-junit-testng" target="1.5" />
<module name="spring-testing" target="11" />
<module name="spring-testing-2" target="11" />
<module name="string-test-functions" target="1.5" />
<module name="test-containers" target="1.5" />
<module name="testing-assertions" target="1.5" />
<module name="testing-libraries" target="1.5" />
<module name="testing-libraries-2" target="1.5" />
<module name="testng" target="1.5" />
<module name="xml" target="11" />
<module name="xmlunit-2" target="1.5" />
<module name="zerocode" target="8" />
</bytecodeTargetLevel>
</component>
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="codebank" options="" />
<module name="discourse" options="" />
<module name="java-numbers" options="" />
<module name="java-numbers-2" options="" />
<module name="jmh" options="--add-exports java.base/jdk.internal.vm.annotation=ALL-UNNAMED" />
<module name="xml" options="" />
</option>
</component>
</project>
.idea/encodings.xml
Generated
+16 -4
View File
@@ -7,10 +7,6 @@
<file url="file://$PROJECT_DIR$/core-java-modules/core-java-annotations/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/core-java-modules/core-java-collections-list/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/core-java-modules/core-java-collections-list/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/core-java-modules/core-java-datetime-conversion/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/core-java-modules/core-java-datetime-conversion/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/core-java-modules/core-java-io/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/core-java-modules/core-java-io/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/core-java-modules/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/core-java-modules/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jackson-modules/jackson-annotations/src/main/java" charset="UTF-8" />
@@ -39,17 +35,33 @@
<file url="file://$PROJECT_DIR$/parent-java/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/assertion-libraries/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/assertion-libraries/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/easy-random/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/easy-random/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/groovy-spock/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/groovy-spock/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/junit-5-advanced/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/junit-5-advanced/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/junit-5-basics/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/junit-5-basics/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/junit-5-basics/src/test/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/junit-5/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/junit-5/src/test/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/junit5-annotations/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/junit5-annotations/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/junit5-migration/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/junit5-migration/src/test/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/mockito-2/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/mockito-2/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/mockserver/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/mockserver/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/rest-assured/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/rest-assured/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/rest-testing/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/rest-testing/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/spring-testing-2/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/spring-testing-2/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/spring-testing/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/spring-testing/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/testing-modules/src/main/java" charset="UTF-8" />
.idea/jarRepositories.xml
Generated
-5
View File
@@ -6,11 +6,6 @@
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="m2-ossez-com-m2" />
<option name="name" value="m2-ossez-com-m2" />
<option name="url" value="https://m2-ossez-com-206755003006.d.codeartifact.us-east-2.amazonaws.com/maven/m2/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
.idea/jpa-buddy.xml
Generated
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JpaBuddyIdeaProjectConfig">
<option name="defaultUnitInitialized" value="true" />
</component>
</project>
.idea/misc.xml
Generated
+3
View File
@@ -5,6 +5,9 @@
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/testing-modules/pom.xml" />
<option value="$PROJECT_DIR$/core-java-modules/pom.xml" />
<option value="$PROJECT_DIR$/testing-modules/junit5-migration/pom.xml" />
</list>
</option>
</component>
.idea/vcs.xml
Generated
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="" vcs="Git" />
</component>
</project>
.idea/workspace.xml
Generated
+175 -248
View File
File diff suppressed because it is too large Load Diff
core-java-modules/core-java-collections-list/src/test/java/com/ossez/collections/JavaCollectionCleanupUnitTest.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class JavaCollectionCleanupUnitTest {
@Test
public void givenListContainsNulls_whenRemovingNullsWithPlainJava_thenCorrect() {
final List<Integer> list = Lists.newArrayList(null, 1, null);
while (list.remove(null));
while (list.remove(null)) ;
assertThat(list, hasSize(1));
}
jackson-modules/pom.xml
+1 -1
View File
@@ -39,7 +39,7 @@
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
pom.xml
+6 -7
View File
@@ -40,12 +40,12 @@
<modules>
<module>core-java-modules</module>
<module>jackson-modules</module>
<module>jackson-simple</module>
<module>parent-java</module>
<module>testing-modules</module>
<!-- <module>jackson-modules</module>-->
<!-- <module>jackson-simple</module>-->
<!-- <module>parent-java</module>-->
<!-- <module>testing-modules</module>-->
<module>toolkits</module>
<module>xml</module>
<!-- <module>xml</module>-->
</modules>
<properties>
@@ -105,7 +105,7 @@
<jmh-core.version>1.33</jmh-core.version>
<exec-maven-plugin.version>3.0.0</exec-maven-plugin.version>
<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
<logback-classic.version>1.2.5</logback-classic.version>
<rest-assured.version>3.1.1</rest-assured.version>
@@ -255,7 +255,6 @@
<artifactId>zip4j</artifactId>
<version>2.9.1</version>
</dependency>
<!-- RETS -->
<!-- TESTS -->
src/test/java/com/ossez/codebank/algorithm/tests/VariableTest.java
-71
View File
@@ -28,75 +28,4 @@ class OssezVariable {
}
}
/**
* @author YuCheng
*/
public class VariableTest extends TestCase {
private final static Logger logger = LoggerFactory.getLogger(VariableTest.class);
/**
* Do RetsServerConnection Test
*/
@Test
public void testStaticVariableChange() {
// OssezVariable objA = new OssezVariable(1, 2, 3);
// logger.debug("s1/s2/s3 - [{}]/[{}]/[{}]", objA.s1, objA.s2, OssezVariable.s3);
//
// OssezVariable objB = new OssezVariable(4, 5, 6);
// logger.debug("s1/s2/s3 - [{}]/[{}]/[{}]", objA.s1, objA.s2, OssezVariable.s3);
// logger.debug("s1/s2/s3 - [{}]/[{}]/[{}]", objB.s1, objB.s2, OssezVariable.s3);
String[][] connections = {{"192.167.0.0", "192.167.0.1"}, {"192.167.0.2", "192.167.0.0"}, {"192.167.0.0", "192.167.0.3"}};
Boolean[][] connectionsP = {{false, false}, {false, false}, {false, false}};
String[] toggleIps = {"192.167.0.1", "192.167.0.0", "192.167.0.2", "192.167.0.0", "0.0.0.0"};
HashMap<String, String> ipMap = new HashMap();
HashMap<String, Boolean> devMap = new HashMap();
Integer retArray[] = new Integer[toggleIps.length];
for (int i = 0; i < toggleIps.length; i++) {
String toggleIp = toggleIps[i];
int count = 0;
// INIT
Boolean dStatus = false;
for (int row = 0; row < connections.length; row++) {
for (int col = 0; col < connections[row].length; col++) {
String ipKey = connections[row][col];
if (ipKey.equals(toggleIp))
if (connectionsP[row][col] == false) {
connectionsP[row][col] = true;
dStatus = true;
}
else if (connectionsP[row][col] == true) {
connectionsP[row][col] = false;
dStatus = false;
}
}
}
String retStr = "";
for (int row = 0; row < connectionsP.length; row++) {
List<Boolean> statusList = new ArrayList<>();
for (int col = 0; col < connectionsP[row].length; col++) {
statusList.add(connectionsP[row][col]);
}
if (statusList.get(0) && statusList.get(1) && dStatus) {
count ++;
}
}
System.out.println(count);
}
//
}
}
testing-modules/junit-5-basics/pom.xml
+2 -2
View File
@@ -10,9 +10,9 @@
<parent>
<groupId>com.ossez</groupId>
<artifactId>testing</artifactId>
<artifactId>testing-modules</artifactId>
<version>0.0.2-SNAPSHOT</version>
<relativePath>../</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>
<dependencies>
toolkits/codebank/pom.xml
+6
View File
@@ -38,6 +38,12 @@
<artifactId>javax.persistence-api</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>RELEASE</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
toolkits/codebank/src/test/java/com/ossez/toolkits/codebank/tests/BitOperationTest.java
+1 -1
View File
@@ -1,7 +1,7 @@
package com.ossez.toolkits.codebank.tests;
import org.apache.commons.math3.util.FastMath;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;