Skip to content

Commit

Permalink
preparation for next development iteration
Browse files Browse the repository at this point in the history
  • Loading branch information
brandt authored and brandt committed Oct 21, 2015
1 parent cbbd509 commit b44a7ac
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 20 deletions.
2 changes: 1 addition & 1 deletion src/main/java/hudson/plugins/emma/AbstractReport.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public AbstractBuild<?,?> getBuild() {
}

////////////////////////////////////////////////////////////////////////////////
//[KB] default interface implementation for the advanced setup support
// default interface implementation for the advanced setup support

// @Override
public boolean getTestNotMandatory(){
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/hudson/plugins/emma/AdvancedSettings.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import java.io.Serializable;

////////////////////////////////////////////////////////////////////////////////
//[KB] implementation for the advanced setup support
// implementation for the advanced setup support
public class AdvancedSettings implements Serializable {

private boolean testNotMandatory = false;
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/hudson/plugins/emma/CoverageReport.java
Original file line number Diff line number Diff line change
Expand Up @@ -101,46 +101,46 @@ private Digester createDigester() {
}

////////////////////////////////////////////////////////////////////////////////
//[KB] overridden interface implementation for the advanced setup support
// overridden interface implementation for the advanced setup support
//
// root object for reporting
// -> get config data from action object
// -> read from build.xml???

// @Override
@Override
public boolean getTestNotMandatory(){
return action.getTestNotMandatory();
}

// @Override
@Override
public String getFirstDataColumnDescriptor()
{
//return getLastAction().getFirstDataColumnDescriptor();
return action.getFirstDataColumnDescriptor();
}

// @Override
@Override
public String getSecondDataColumnDescriptor()
{
//return getLastAction().getFirstDataColumnDescriptor();
return action.getSecondDataColumnDescriptor();
}

// @Override
@Override
public String getThirdDataColumnDescriptor()
{
//return getLastAction().getFirstDataColumnDescriptor();
return action.getThirdDataColumnDescriptor();
}

// @Override
@Override
public String getFourthDataColumnDescriptor()
{
//return getLastAction().getFirstDataColumnDescriptor();
return action.getFourthDataColumnDescriptor();
}

// @Override
@Override
public String getFifthDataColumnDescriptor()
{
//return getLastAction().getFirstDataColumnDescriptor();
Expand Down
1 change: 0 additions & 1 deletion src/main/java/hudson/plugins/emma/EmmaPublisher.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ public class EmmaPublisher extends Recorder {
*/
public EmmaHealthReportThresholds healthReports = new EmmaHealthReportThresholds();

//[KB]
/**
* get instance of AdvancedSettings object
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
</f:entry>

<!-- /////////////////////////////////////////////////////////////////////// -->
<!-- [KB] for the advanced setup support -->
<!-- the advanced setup support -->
<f:section title="${%advancedSection.title}">
<f:advanced>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ useThreshold.description=\
Specify whether build should fail if actual coverage is less then defined by threshold.

#///////////////////////////////////////////////////////////////////////////////
#[KB] for the advanced setup support
# for the advanced setup support
advancedSection.title=advanced settings
test_not_mandatory.title=tests not mandatory
test_not_mandatory.description=Specify whether a coverage test should displayed as failed if no test available.
Expand Down
6 changes: 0 additions & 6 deletions src/test/java/hudson/plugins/emma/EmmaBuildActionTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ public void testLoadCocoReport1() throws Exception {

String description = r.getBuildHealth().getDescription() ;
assertEquals("Coverage: Classes 75/94 (80%). Methods 947/2176 (44%). Blocks 2842/7967 (36%). Decisions/Conditions 5917/15253 (39%). ",
//[KB-] assertEquals("Testabdeckung: Klassen 75/94 (80%). Methoden 947/2176 (44%). Blöcke 2842/7967 (36%). Decisions/Conditions 5917/15253 (39%). ",
description);
}

Expand All @@ -36,7 +35,6 @@ public void testLoadCocoReport2() throws Exception {

String description = r.getBuildHealth().getDescription() ;
assertEquals("Coverage: Blocks 2/5 (40%). Decisions/Conditions 4/15 (27%). ",
//[KB-] assertEquals("Testabdeckung: Blöcke 2/5 (40%). Decisions/Conditions 4/15 (27%). ",
description);
}

Expand All @@ -54,7 +52,6 @@ public void testLoadCocoReport3() throws Exception {

String description = r.getBuildHealth().getDescription() ;
assertEquals("Coverage: Blocks 2/5 (40%). ",
//[KB-] assertEquals("Testabdeckung: Blöcke 2/5 (40%). ",
description);
}

Expand All @@ -70,7 +67,6 @@ public void testLoadReport1() throws Exception {
assertRatio(r.line, 8346.3f,13135);
assert(r.condition == null);
assertEquals("Coverage: Methods 1345/2061 (65%). Blocks 44997/74846 (60%). ",
//[KB-] assertEquals("Testabdeckung: Methoden 1345/2061 (65%). Blöcke 44997/74846 (60%). ",
r.getBuildHealth().getDescription());
}

Expand All @@ -86,7 +82,6 @@ public void testLoadReport2() throws Exception {
assertRatio(r.line, 9, 1693);
assert(r.condition == null);
assertEquals("Coverage: Classes 1/149 (1%). Methods 2/678 (0%). Blocks 42/9659 (0%). Lines 9/1693 (1%). ",
//[KB-] assertEquals("Testabdeckung: Klassen 1/149 (1%). Methoden 2/678 (0%). Blöcke 42/9659 (0%). Zeilen 9/1693 (1%). ",
r.getBuildHealth().getDescription());
}

Expand All @@ -103,7 +98,6 @@ public void testLoadMultipleReports() throws Exception {
assertRatio(r.line, 8355.3f,14828);
assert(r.condition == null);
assertEquals("Coverage: Classes 186/334 (56%). Methods 1347/2739 (49%). Blocks 45039/84505 (53%). Lines 8355.3/14828 (56%). ",
//[KB-] assertEquals("Testabdeckung: Klassen 186/334 (56%). Methoden 1347/2739 (49%). Blöcke 45039/84505 (53%). Zeilen 8355.3/14828 (56%). ",
r.getBuildHealth().getDescription());
}
}
2 changes: 0 additions & 2 deletions src/test/java/hudson/plugins/emma/EmmaConfigSubmitTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ public void testHealthReportMinValue() throws Exception {
assertEquals(10, thresholds.getMinCondition());
}

//[KB]
public void test_new_no_tests_required_flag() throws Exception {
WebClient client = new WebClient();
client.setThrowExceptionOnFailingStatusCode(false);
Expand All @@ -175,7 +174,6 @@ public void test_new_no_tests_required_flag() throws Exception {
assertEquals(false, publisher4.advancedSettings.getTestNotMandatory());
}

//[KB]
public void testDataColumnMapping() throws Exception {
WebClient client = new WebClient();
client.setThrowExceptionOnFailingStatusCode(false);
Expand Down

0 comments on commit b44a7ac

Please sign in to comment.