Skip to content

remove public identifiers from test methods per JUnit5 #1106

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.

Sign up for GitHub

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

Merged
ddsharpe merged 2 commits into from
Mar 23, 2022
Merged

remove public identifiers from test methods per JUnit5 #1106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b11a014
remove public identifiers from test methods per JUnit5
ddsharpe Mar 23, 2022
c303c4a
remove unused variable
ddsharpe Mar 23, 2022
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
2 changes: 0 additions & 2 deletions core/src/main/java/oracle/weblogic/deploy/json/JsonStreamTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ public JsonStreamTranslator(String streamFileName, InputStream jsonStream, boole
*/
@Override
public PyDictionary parse() throws JsonException {
final String METHOD = "parse";

PyDictionary result = null;
if (jsonStream != null) {
try {
Expand Down
58 changes: 29 additions & 29 deletions system-test/src/test/java/oracle/weblogic/deploy/integration/ITWdt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ private static PrintWriter getTestMethodWriter(TestInfo testInfo) throws IOExcep
@Order(1)
@Tag("gate")
@Test
public void test01CreateDomainNoDomainHome(TestInfo testInfo) throws Exception {
void test01CreateDomainNoDomainHome(TestInfo testInfo) throws Exception {
String cmd = createDomainScript + " -oracle_home " + mwhome_12213;
try (PrintWriter out = getTestMethodWriter(testInfo)) {
CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
Expand All @@ -126,7 +126,7 @@ public void test01CreateDomainNoDomainHome(TestInfo testInfo) throws Exception {
@Order(2)
@Tag("gate")
@Test
public void test02CreateDomainNoDomainHome(TestInfo testInfo) throws Exception {
void test02CreateDomainNoDomainHome(TestInfo testInfo) throws Exception {
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_type WLS";
try (PrintWriter out = getTestMethodWriter(testInfo)) {
CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
Expand All @@ -144,7 +144,7 @@ public void test02CreateDomainNoDomainHome(TestInfo testInfo) throws Exception {
@Order(3)
@Tag("gate")
@Test
public void test03CreateDomainNoModelfile(TestInfo testInfo) throws Exception {
void test03CreateDomainNoModelfile(TestInfo testInfo) throws Exception {
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_parent " + domainParentDir;
try (PrintWriter out = getTestMethodWriter(testInfo)) {
CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
Expand All @@ -162,7 +162,7 @@ public void test03CreateDomainNoModelfile(TestInfo testInfo) throws Exception {
@Order(4)
@Tag("gate")
@Test
public void test04CreateDomainNoArchivefile(TestInfo testInfo) throws Exception {
void test04CreateDomainNoArchivefile(TestInfo testInfo) throws Exception {
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_parent " + domainParentDir +
" -model_file " + getSampleModelFile("-constant") ;
try (PrintWriter out = getTestMethodWriter(testInfo)) {
Expand All @@ -181,7 +181,7 @@ public void test04CreateDomainNoArchivefile(TestInfo testInfo) throws Exception
@Order(5)
@Tag("gate")
@Test
public void test05CreateDomain(TestInfo testInfo) throws Exception {
void test05CreateDomain(TestInfo testInfo) throws Exception {
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_parent " + domainParentDir +
" -model_file " + getSampleModelFile("-constant") +
" -archive_file " + getSampleArchiveFile();
Expand All @@ -202,7 +202,7 @@ public void test05CreateDomain(TestInfo testInfo) throws Exception {
@Order(6)
@Tag("gate")
@Test
public void test06CreateDomainDifferentDomainName(TestInfo testInfo) throws Exception {
void test06CreateDomainDifferentDomainName(TestInfo testInfo) throws Exception {
String cmd = createDomainScript
+ " -oracle_home " + mwhome_12213
+ " -domain_home " + domainParentDir + FS + "domain2"
Expand All @@ -222,7 +222,7 @@ public void test06CreateDomainDifferentDomainName(TestInfo testInfo) throws Exce
@Order(7)
@Tag("gate")
@Test
public void test07CreateDomainWLSType(TestInfo testInfo) throws Exception {
void test07CreateDomainWLSType(TestInfo testInfo) throws Exception {
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
domainParentDir + FS + "domain2 -model_file " +
getSampleModelFile("-constant") + " -archive_file " + getSampleArchiveFile() +
Expand All @@ -242,7 +242,7 @@ public void test07CreateDomainWLSType(TestInfo testInfo) throws Exception {
@Order(8)
@Tag("gate")
@Test
public void test08CreateDomainNoVariableFile(TestInfo testInfo) throws Exception {
void test08CreateDomainNoVariableFile(TestInfo testInfo) throws Exception {
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_parent " + domainParentDir +
" -model_file " + getSampleModelFile("1") +
" -archive_file " + getSampleArchiveFile() ;
Expand All @@ -262,7 +262,7 @@ public void test08CreateDomainNoVariableFile(TestInfo testInfo) throws Exception
@Order(9)
@Tag("gate")
@Test
public void test09CreateDomainWithVariableFile(TestInfo testInfo) throws Exception {
void test09CreateDomainWithVariableFile(TestInfo testInfo) throws Exception {
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
domainParentDir + FS + "domain2 -model_file " +
getSampleModelFile("1") + " -archive_file " + getSampleArchiveFile() +
Expand All @@ -282,7 +282,7 @@ public void test09CreateDomainWithVariableFile(TestInfo testInfo) throws Excepti
@Order(10)
@Tag("gate")
@Test
public void test10CreateDomainWithWlstPath(TestInfo testInfo) throws Exception {
void test10CreateDomainWithWlstPath(TestInfo testInfo) throws Exception {
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
domainParentDir + FS + "domain2 -model_file " +
getSampleModelFile("1") + " -archive_file " + getSampleArchiveFile() +
Expand All @@ -303,7 +303,7 @@ public void test10CreateDomainWithWlstPath(TestInfo testInfo) throws Exception {
@Order(11)
@Tag("gate")
@Test
public void test11CreateDomainWithOracleCommonWlstPath(TestInfo testInfo) throws Exception {
void test11CreateDomainWithOracleCommonWlstPath(TestInfo testInfo) throws Exception {
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
domainParentDir + FS + "domain2 -model_file " +
getSampleModelFile("1") + " -archive_file " + getSampleArchiveFile() +
Expand All @@ -324,7 +324,7 @@ public void test11CreateDomainWithOracleCommonWlstPath(TestInfo testInfo) throws
@Order(12)
@Tag("gate")
@Test
public void test12CreateJRFDomainNoRunRCU(TestInfo testInfo) throws Exception {
void test12CreateJRFDomainNoRunRCU(TestInfo testInfo) throws Exception {
try (PrintWriter out = getTestMethodWriter(testInfo)) {
Path source = Paths.get(getSampleModelFile("2"));
Path modelOut = getTestOutputPath(testInfo).resolve(SAMPLE_MODEL_FILE_PREFIX + "2.yaml");
Expand All @@ -349,7 +349,7 @@ public void test12CreateJRFDomainNoRunRCU(TestInfo testInfo) throws Exception {
@Order(13)
@Tag("gate")
@Test
public void test13CreateJRFDomainRunRCU(TestInfo testInfo) throws Exception {
void test13CreateJRFDomainRunRCU(TestInfo testInfo) throws Exception {
waitForDatabase();
try (PrintWriter out = getTestMethodWriter(testInfo)) {
Path source = Paths.get(getSampleModelFile("2"));
Expand Down Expand Up @@ -378,7 +378,7 @@ public void test13CreateJRFDomainRunRCU(TestInfo testInfo) throws Exception {
@Order(14)
@Tag("gate")
@Test
public void test14OnlineUpdate1(TestInfo testInfo) throws Exception {
void test14OnlineUpdate1(TestInfo testInfo) throws Exception {
assumeTrue(rcuDomainCreated, "testDOnlineUpdate skipped because testDCreateJRFDomainRunRCU failed");

// Setup boot.properties
Expand Down Expand Up @@ -423,7 +423,7 @@ public void test14OnlineUpdate1(TestInfo testInfo) throws Exception {
@Order(15)
@Tag("gate")
@Test
public void test15OnlineUpdate2(TestInfo testInfo) throws Exception {
void test15OnlineUpdate2(TestInfo testInfo) throws Exception {
assumeTrue(rcuDomainCreated, "testDOnlineUpdate2 skipped because testDCreateJRFDomainRunRCU failed");

String domainHome = domainParentDir + FS + "jrfDomain1";
Expand Down Expand Up @@ -464,7 +464,7 @@ public void test15OnlineUpdate2(TestInfo testInfo) throws Exception {
@Order(16)
@Tag("gate")
@Test
public void test16CreateRestrictedJRFDomain(TestInfo testInfo) throws Exception {
void test16CreateRestrictedJRFDomain(TestInfo testInfo) throws Exception {
String cmd = createDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
domainParentDir + FS + "restrictedJRFD1 -model_file " +
getSampleModelFile("-constant") + " -archive_file " + getSampleArchiveFile() +
Expand All @@ -485,7 +485,7 @@ public void test16CreateRestrictedJRFDomain(TestInfo testInfo) throws Exception
@Order(17)
@Tag("gate")
@Test
public void test17DiscoverDomainWithRequiredArgument(TestInfo testInfo) throws Exception {
void test17DiscoverDomainWithRequiredArgument(TestInfo testInfo) throws Exception {
try (PrintWriter out = getTestMethodWriter(testInfo)) {
Path discoveredArchive = getTestOutputPath(testInfo).resolve("discoveredArchive.zip");
String cmd = discoverDomainScript
Expand Down Expand Up @@ -528,7 +528,7 @@ private void verifyFDiscoverDomainWithRequiredArgument(String expectedModelFile)
@Order(18)
@Tag("gate")
@Test
public void test18DiscoverDomainWithModelFile(TestInfo testInfo) throws Exception {
void test18DiscoverDomainWithModelFile(TestInfo testInfo) throws Exception {
Path discoveredArchive = getTestOutputPath(testInfo).resolve("discoveredArchive.zip");
Path discoveredModelFile = getTestOutputPath(testInfo).resolve("discoveredRestrictedJRFD1.yaml");
String cmd = discoverDomainScript + " -oracle_home " + mwhome_12213 + " -domain_home " +
Expand All @@ -552,7 +552,7 @@ public void test18DiscoverDomainWithModelFile(TestInfo testInfo) throws Exceptio
@Order(19)
@Tag("gate")
@Test
public void test19DiscoverDomainWithVariableFile(TestInfo testInfo) throws Exception {
void test19DiscoverDomainWithVariableFile(TestInfo testInfo) throws Exception {
Path discoveredArchive = getTestOutputPath(testInfo).resolve("discoveredArchive.zip");
Path discoveredModelFile = getTestOutputPath(testInfo).resolve("discoveredRestrictedJRFD1.yaml");
Path discoveredVariableFile = getTestOutputPath(testInfo).resolve("discoveredRestrictedJRFD1.properties");
Expand Down Expand Up @@ -589,7 +589,7 @@ private void verifyGDiscoverDomainWithVariableFile(String expectedModelFile) thr
@Order(20)
@Tag("gate")
@Test
public void test20DiscoverDomainJRFDomainType(TestInfo testInfo) throws Exception {
void test20DiscoverDomainJRFDomainType(TestInfo testInfo) throws Exception {
assumeTrue(rcuDomainCreated, "testHDiscoverDomainJRFDomainType skipped because testDCreateJRFDomainRunRCU failed");

try (PrintWriter out = getTestMethodWriter(testInfo)) {
Expand Down Expand Up @@ -631,7 +631,7 @@ private void verifyHDiscoverDomainJRFDomainType(String expectedModelFile) {
@Order(21)
@Tag("gate")
@Test
public void test21UpdateDomain(TestInfo testInfo) throws Exception {
void test21UpdateDomain(TestInfo testInfo) throws Exception {
try (PrintWriter out = getTestMethodWriter(testInfo)) {
Path source = Paths.get(getSampleVariableFile());
Path variableFile = getTestOutputPath(testInfo).resolve(SAMPLE_VARIABLE_FILE);
Expand Down Expand Up @@ -667,7 +667,7 @@ public void test21UpdateDomain(TestInfo testInfo) throws Exception {
@Order(22)
@Tag("gate")
@Test
public void test22DeployAppWithoutModelfile(TestInfo testInfo) throws Exception {
void test22DeployAppWithoutModelfile(TestInfo testInfo) throws Exception {
try (PrintWriter out = getTestMethodWriter(testInfo)) {
String cmd = deployAppScript
+ " -oracle_home " + mwhome_12213
Expand All @@ -686,7 +686,7 @@ public void test22DeployAppWithoutModelfile(TestInfo testInfo) throws Exception
@Order(23)
@Tag("gate")
@Test
public void test23DeployAppWithModelfile(TestInfo testInfo) throws Exception {
void test23DeployAppWithModelfile(TestInfo testInfo) throws Exception {
try (PrintWriter out = getTestMethodWriter(testInfo)) {
String cmd = deployAppScript
+ " -oracle_home " + mwhome_12213
Expand All @@ -706,7 +706,7 @@ public void test23DeployAppWithModelfile(TestInfo testInfo) throws Exception {
@Order(24)
@Tag("gate")
@Test
public void test24ValidateModelWithOracleHomeOnly(TestInfo testInfo) throws Exception {
void test24ValidateModelWithOracleHomeOnly(TestInfo testInfo) throws Exception {
try (PrintWriter out = getTestMethodWriter(testInfo)) {
String cmd = validateModelScript + " -oracle_home " + mwhome_12213;
CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
Expand All @@ -722,7 +722,7 @@ public void test24ValidateModelWithOracleHomeOnly(TestInfo testInfo) throws Exce
@Order(25)
@Tag("gate")
@Test
public void test25ValidateModelWithOracleHomeModelFile(TestInfo testInfo) throws Exception {
void test25ValidateModelWithOracleHomeModelFile(TestInfo testInfo) throws Exception {
try (PrintWriter out = getTestMethodWriter(testInfo)) {
String cmd = validateModelScript + " -oracle_home " + mwhome_12213 + " -model_file " +
getSampleModelFile("-constant");
Expand All @@ -739,7 +739,7 @@ public void test25ValidateModelWithOracleHomeModelFile(TestInfo testInfo) throws
@Order(26)
@Tag("gate")
@Test
public void test26ValidateModelWithoutVariableFile(TestInfo testInfo) throws Exception {
void test26ValidateModelWithoutVariableFile(TestInfo testInfo) throws Exception {
try (PrintWriter out = getTestMethodWriter(testInfo)) {
String cmd = validateModelScript
+ " -oracle_home " + mwhome_12213
Expand All @@ -757,7 +757,7 @@ public void test26ValidateModelWithoutVariableFile(TestInfo testInfo) throws Exc
@Order(27)
@Tag("gate")
@Test
public void test27CompareModelRemoveAttribute(TestInfo testInfo) throws Exception {
void test27CompareModelRemoveAttribute(TestInfo testInfo) throws Exception {
try (PrintWriter out = getTestMethodWriter(testInfo)) {
Path outputDir = getTestOutputPath(testInfo).resolve("wdt_temp_output");
Files.createDirectories(outputDir);
Expand All @@ -782,7 +782,7 @@ public void test27CompareModelRemoveAttribute(TestInfo testInfo) throws Exceptio
@Order(28)
@Tag("gate")
@Test
public void test28ValidateModelWithInvalidModelfile(TestInfo testInfo) throws Exception {
void test28ValidateModelWithInvalidModelfile(TestInfo testInfo) throws Exception {
try (PrintWriter out = getTestMethodWriter(testInfo)) {
String cmd = validateModelScript
+ " -oracle_home " + mwhome_12213
Expand All @@ -797,7 +797,7 @@ public void test28ValidateModelWithInvalidModelfile(TestInfo testInfo) throws Ex
@Order(29)
@Tag("gate")
@Test
public void test29EncryptModel(TestInfo testInfo) throws Exception {
void test29EncryptModel(TestInfo testInfo) throws Exception {
try (PrintWriter out = getTestMethodWriter(testInfo)) {
Path source = Paths.get(getSampleModelFile("-constant"));
Path model = getTestOutputPath(testInfo).resolve(SAMPLE_MODEL_FILE_PREFIX + "-constant.yaml");
Expand Down