Commit 96ca7bb

ddsharperjeberhard

authored and

committed

enable checkstyle on test sources (#1270)

1 parent 711f1e9 commit 96ca7bbCopy full SHA for 96ca7bb

File tree

2 files changed

-6

lines changed

integration-tests/src/test/java/oracle/kubernetes/operator
- ItMonitoringExporter.java
pom.xml

2 files changed

-6

lines changed

`‎integration-tests/src/test/java/oracle/kubernetes/operator/ItMonitoringExporter.java‎`

Lines changed: 8 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,8 @@ private static void gitCloneBuildMonitoringExporter() throws Exception {`
`162`	`162`	`resourceExporterDir,`
`163`	`163`	`monitoringExporterScriptDir,`
`164`	`164`	`"buildMonitoringExporter.sh",`
`165`		`- monitoringExporterDir + " " + resourceExporterDir + " " + monitoringExporterBranchVer + " " + MONITORING_EXPORTER_VERSION);`
	`165`	`+ monitoringExporterDir + " " + resourceExporterDir + " " + monitoringExporterBranchVer + " "`
	`166`	`+ + MONITORING_EXPORTER_VERSION);`
`166`	`167`	`}`
`167`	`168`
`168`	`169`	`/**`
`@@ -959,7 +960,8 @@ private static void installPrometheusGrafanaWebHookMySQLCoordinatorWLSImage() th`
`959`	`960`	`resourceExporterDir,`
`960`	`961`	`monitoringExporterScriptDir,`
`961`	`962`	`"createPromGrafanaMySqlCoordWebhook.sh",`
`962`		`- monitoringExporterDir + " " + resourceExporterDir + " " + PROMETHEUS_CHART_VERSION + " " + GRAFANA_CHART_VERSION);`
	`963`	`+ monitoringExporterDir + " " + resourceExporterDir + " " + PROMETHEUS_CHART_VERSION + " "`
	`964`	`+ + GRAFANA_CHART_VERSION);`
`963`	`965`
`964`	`966`	`String webhookPod = getPodName("app=webhook", "webhook");`
`965`	`967`	`TestUtils.checkPodReady(webhookPod, "webhook");`
`@@ -1006,9 +1008,9 @@ static void checkPromGrafana() throws Exception {`
`1006`	`1008`	`+ " --data-binary @grafana/dashboard.json";`
`1007`	`1009`	`TestUtils.exec(crdCmd);`
`1008`	`1010`	`crdCmd = " cd "`
`1009`		`- + monitoringExporterEndToEndDir`
`1010`		`- + " && " +`
`1011`		`- "curl -v -H 'Content-Type: application/json' -X GET http://admin:12345678@$HOSTNAME:31000/api/dashboards/db/weblogic-server-dashboard";`
	`1011`	`+ + monitoringExporterEndToEndDir`
	`1012`	`+ + " && "`
	`1013`	`+ + "curl -v -H 'Content-Type: application/json' -X GET http://admin:12345678@$HOSTNAME:31000/api/dashboards/db/weblogic-server-dashboard";`
`1012`	`1014`	`ExecResult result = ExecCommand.exec(crdCmd);`
`1013`	`1015`	`assertTrue(result.stdout().contains("wls_jvm_uptime"));`
`1014`	`1016`	`assertTrue(`
`@@ -1154,7 +1156,7 @@ private static boolean checkMetricsViaPrometheus(String searchKey, String expect`
`1154`	`1156`	`* @param yamlFile - Name of the yaml file to make changes.`
`1155`	`1157`	`* @throws IOException exception`
`1156`	`1158`	`*/`
`1157`		`- private static void addRestOptToYaml(String yamlFile, String prop, int restPort) throws IOException {`
	`1159`	`+ private static void addRestOptToYaml(String yamlFile, String prop, int restPort) throws IOException {`
`1158`	`1160`	`ObjectMapper objectMapper = new ObjectMapper();`
`1159`	`1161`
`1160`	`1162`	`ObjectMapper yamlReader = new ObjectMapper(new YAMLFactory());`

`‎pom.xml‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@`
`86`	`86`	`<failOnViolation>true</failOnViolation>`
`87`	`87`	`<violationSeverity>warning</violationSeverity>`
`88`	`88`	`<includeTestResources>true</includeTestResources>`
	`89`	`+ <includeTestSourceDirectory>true</includeTestSourceDirectory>`
`89`	`90`	`</configuration>`
`90`	`91`	`</execution>`
`91`	`92`	`</executions>`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 96ca7bb

File tree

2 files changed

2 files changed

`‎integration-tests/src/test/java/oracle/kubernetes/operator/ItMonitoringExporter.java‎`

`‎pom.xml‎`

0 commit comments