Skip to content

Commit

Permalink
Merge pull request #137 from brunoguadagnini/master
Browse files Browse the repository at this point in the history 
Alteração de nomenclatura "valor" para "baseCalculoICMSST" (NFNotaInfoICMSTotal)
  • Loading branch information
@fincatto
fincatto committed May 4, 2016
2 parents 21d7a0b + 191190d commit 8e85773
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 23 deletions.
22 changes: 19 additions & 3 deletions src/main/java/com/fincatto/nfe310/classes/nota/NFNotaInfoICMSTotal.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class NFNotaInfoICMSTotal extends NFBase {
private String valorICMSPartilhaRementente;

@Element(name = "vBCST", required = true)
private String valor;
private String baseCalculoICMSST;

@Element(name = "vST", required = true)
private String valorTotalICMSST;
Expand Down Expand Up @@ -74,8 +74,16 @@ public void setValorTotalICMS(final BigDecimal valorTotalICMS) {
this.valorTotalICMS = BigDecimalParser.tamanho15Com2CasasDecimais(valorTotalICMS);
}

/**
* @deprecated Utilize setBaseCalculoICMSST(...)
*/
@Deprecated
public void setValor(final BigDecimal valor) {
this.valor = BigDecimalParser.tamanho15Com2CasasDecimais(valor);
this.baseCalculoICMSST = BigDecimalParser.tamanho15Com2CasasDecimais(valor);
}

public void setBaseCalculoICMSST(final BigDecimal baseCalculoICMSST) {
this.baseCalculoICMSST = BigDecimalParser.tamanho15Com2CasasDecimais(baseCalculoICMSST);
}

public void setValorTotalICMSST(final BigDecimal valorTotalICMSST) {
Expand Down Expand Up @@ -142,8 +150,16 @@ public String getValorICMSDesonerado() {
return this.valorICMSDesonerado;
}

/**
* @deprecated Utilize getBaseCalculoICMSST()
*/
@Deprecated
public String getValor() {
return this.valor;
return this.baseCalculoICMSST;
}

public String getBaseCalculoICMSST() {
return this.baseCalculoICMSST;
}

public String getValorTotalICMSST() {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/fincatto/nfe310/FabricaDeObjetosFake.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1116,7 +1116,7 @@ public static NFNotaInfoICMSTotal getNFNotaInfoICMSTotal() {
final NFNotaInfoICMSTotal icmsTotal = new NFNotaInfoICMSTotal();
icmsTotal.setBaseCalculoICMS(new BigDecimal("999999999999.99"));
icmsTotal.setOutrasDespesasAcessorias(new BigDecimal("999999999999.99"));
icmsTotal.setValor(new BigDecimal("999999999999.99"));
icmsTotal.setBaseCalculoICMSST(new BigDecimal("999999999999.99"));
icmsTotal.setValorCOFINS(new BigDecimal("999999999999.99"));
icmsTotal.setValorPIS(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDesconto(new BigDecimal("999999999999.99"));
Expand Down
38 changes: 19 additions & 19 deletions src/test/java/com/fincatto/nfe310/classes/nota/NFNotaInfoICMSTotalTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public void naoDevePermitirValorCOFINSInvalidoMonetario() {

@Test(expected = NumberFormatException.class)
public void naoDevePermitirValorInvalidoMonetario() {
new NFNotaInfoICMSTotal().setValor(new BigDecimal("1000000000000000"));
new NFNotaInfoICMSTotal().setBaseCalculoICMSST(new BigDecimal("1000000000000000"));
}

@Test(expected = NumberFormatException.class)
Expand All @@ -89,7 +89,7 @@ public void devePermitirValorICMSDesoneradoNulo() {
final NFNotaInfoICMSTotal icmsTotal = new NFNotaInfoICMSTotal();
icmsTotal.setBaseCalculoICMS(new BigDecimal("999999999999.99"));
icmsTotal.setOutrasDespesasAcessorias(new BigDecimal("999999999999.99"));
icmsTotal.setValor(new BigDecimal("999999999999.99"));
icmsTotal.setBaseCalculoICMSST(new BigDecimal("999999999999.99"));
icmsTotal.setValorCOFINS(new BigDecimal("999999999999.99"));
icmsTotal.setValorPIS(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDesconto(new BigDecimal("999999999999.99"));
Expand All @@ -114,7 +114,7 @@ public void devePermitirValorTotalTributosNulo() {
final NFNotaInfoICMSTotal icmsTotal = new NFNotaInfoICMSTotal();
icmsTotal.setBaseCalculoICMS(new BigDecimal("999999999999.99"));
icmsTotal.setOutrasDespesasAcessorias(new BigDecimal("999999999999.99"));
icmsTotal.setValor(new BigDecimal("999999999999.99"));
icmsTotal.setBaseCalculoICMSST(new BigDecimal("999999999999.99"));
icmsTotal.setValorCOFINS(new BigDecimal("999999999999.99"));
icmsTotal.setValorPIS(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDesconto(new BigDecimal("999999999999.99"));
Expand All @@ -137,7 +137,7 @@ public void devePermitirValorTotalTributosNulo() {
public void naoDevePermitirBaseCalculoICMSNulo() {
final NFNotaInfoICMSTotal icmsTotal = new NFNotaInfoICMSTotal();
icmsTotal.setOutrasDespesasAcessorias(new BigDecimal("999999999999.99"));
icmsTotal.setValor(new BigDecimal("999999999999.99"));
icmsTotal.setBaseCalculoICMSST(new BigDecimal("999999999999.99"));
icmsTotal.setValorCOFINS(new BigDecimal("999999999999.99"));
icmsTotal.setValorPIS(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDesconto(new BigDecimal("999999999999.99"));
Expand All @@ -161,7 +161,7 @@ public void naoDevePermitirBaseCalculoICMSNulo() {
public void naoDevePermitirOutrasDespesasAcessoriasNulo() {
final NFNotaInfoICMSTotal icmsTotal = new NFNotaInfoICMSTotal();
icmsTotal.setBaseCalculoICMS(new BigDecimal("999999999999.99"));
icmsTotal.setValor(new BigDecimal("999999999999.99"));
icmsTotal.setBaseCalculoICMSST(new BigDecimal("999999999999.99"));
icmsTotal.setValorCOFINS(new BigDecimal("999999999999.99"));
icmsTotal.setValorPIS(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDesconto(new BigDecimal("999999999999.99"));
Expand Down Expand Up @@ -210,7 +210,7 @@ public void naoDevePermitirCOFINSNulo() {
final NFNotaInfoICMSTotal icmsTotal = new NFNotaInfoICMSTotal();
icmsTotal.setBaseCalculoICMS(new BigDecimal("999999999999.99"));
icmsTotal.setOutrasDespesasAcessorias(new BigDecimal("999999999999.99"));
icmsTotal.setValor(new BigDecimal("999999999999.99"));
icmsTotal.setBaseCalculoICMSST(new BigDecimal("999999999999.99"));
icmsTotal.setValorPIS(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDesconto(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDosProdutosServicos(new BigDecimal("999999999999.99"));
Expand All @@ -234,7 +234,7 @@ public void naoDevePermitirTotalPISNulo() {
final NFNotaInfoICMSTotal icmsTotal = new NFNotaInfoICMSTotal();
icmsTotal.setBaseCalculoICMS(new BigDecimal("999999999999.99"));
icmsTotal.setOutrasDespesasAcessorias(new BigDecimal("999999999999.99"));
icmsTotal.setValor(new BigDecimal("999999999999.99"));
icmsTotal.setBaseCalculoICMSST(new BigDecimal("999999999999.99"));
icmsTotal.setValorCOFINS(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDesconto(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDosProdutosServicos(new BigDecimal("999999999999.99"));
Expand All @@ -258,7 +258,7 @@ public void naoDevePermitirTotalDescontoNulo() {
final NFNotaInfoICMSTotal icmsTotal = new NFNotaInfoICMSTotal();
icmsTotal.setBaseCalculoICMS(new BigDecimal("999999999999.99"));
icmsTotal.setOutrasDespesasAcessorias(new BigDecimal("999999999999.99"));
icmsTotal.setValor(new BigDecimal("999999999999.99"));
icmsTotal.setBaseCalculoICMSST(new BigDecimal("999999999999.99"));
icmsTotal.setValorCOFINS(new BigDecimal("999999999999.99"));
icmsTotal.setValorPIS(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDosProdutosServicos(new BigDecimal("999999999999.99"));
Expand All @@ -282,7 +282,7 @@ public void naoDevePermitrValorTotalDosProdutosServicosNulo() {
final NFNotaInfoICMSTotal icmsTotal = new NFNotaInfoICMSTotal();
icmsTotal.setBaseCalculoICMS(new BigDecimal("999999999999.99"));
icmsTotal.setOutrasDespesasAcessorias(new BigDecimal("999999999999.99"));
icmsTotal.setValor(new BigDecimal("999999999999.99"));
icmsTotal.setBaseCalculoICMSST(new BigDecimal("999999999999.99"));
icmsTotal.setValorCOFINS(new BigDecimal("999999999999.99"));
icmsTotal.setValorPIS(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDesconto(new BigDecimal("999999999999.99"));
Expand All @@ -306,7 +306,7 @@ public void naoDevePermitirFreteNulo() {
final NFNotaInfoICMSTotal icmsTotal = new NFNotaInfoICMSTotal();
icmsTotal.setBaseCalculoICMS(new BigDecimal("999999999999.99"));
icmsTotal.setOutrasDespesasAcessorias(new BigDecimal("999999999999.99"));
icmsTotal.setValor(new BigDecimal("999999999999.99"));
icmsTotal.setBaseCalculoICMSST(new BigDecimal("999999999999.99"));
icmsTotal.setValorCOFINS(new BigDecimal("999999999999.99"));
icmsTotal.setValorPIS(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDesconto(new BigDecimal("999999999999.99"));
Expand All @@ -330,7 +330,7 @@ public void naoDevePermitirICMSNulo() {
final NFNotaInfoICMSTotal icmsTotal = new NFNotaInfoICMSTotal();
icmsTotal.setBaseCalculoICMS(new BigDecimal("999999999999.99"));
icmsTotal.setOutrasDespesasAcessorias(new BigDecimal("999999999999.99"));
icmsTotal.setValor(new BigDecimal("999999999999.99"));
icmsTotal.setBaseCalculoICMSST(new BigDecimal("999999999999.99"));
icmsTotal.setValorCOFINS(new BigDecimal("999999999999.99"));
icmsTotal.setValorPIS(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDesconto(new BigDecimal("999999999999.99"));
Expand All @@ -354,7 +354,7 @@ public void naoDevePermitirICMSSTNulo() {
final NFNotaInfoICMSTotal icmsTotal = new NFNotaInfoICMSTotal();
icmsTotal.setBaseCalculoICMS(new BigDecimal("999999999999.99"));
icmsTotal.setOutrasDespesasAcessorias(new BigDecimal("999999999999.99"));
icmsTotal.setValor(new BigDecimal("999999999999.99"));
icmsTotal.setBaseCalculoICMSST(new BigDecimal("999999999999.99"));
icmsTotal.setValorCOFINS(new BigDecimal("999999999999.99"));
icmsTotal.setValorPIS(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDesconto(new BigDecimal("999999999999.99"));
Expand All @@ -378,7 +378,7 @@ public void naoDevePermitirValorTotalIINulo() {
final NFNotaInfoICMSTotal icmsTotal = new NFNotaInfoICMSTotal();
icmsTotal.setBaseCalculoICMS(new BigDecimal("999999999999.99"));
icmsTotal.setOutrasDespesasAcessorias(new BigDecimal("999999999999.99"));
icmsTotal.setValor(new BigDecimal("999999999999.99"));
icmsTotal.setBaseCalculoICMSST(new BigDecimal("999999999999.99"));
icmsTotal.setValorCOFINS(new BigDecimal("999999999999.99"));
icmsTotal.setValorPIS(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDesconto(new BigDecimal("999999999999.99"));
Expand All @@ -402,7 +402,7 @@ public void naoDevePermitirValorTotalIPINulo() {
final NFNotaInfoICMSTotal icmsTotal = new NFNotaInfoICMSTotal();
icmsTotal.setBaseCalculoICMS(new BigDecimal("999999999999.99"));
icmsTotal.setOutrasDespesasAcessorias(new BigDecimal("999999999999.99"));
icmsTotal.setValor(new BigDecimal("999999999999.99"));
icmsTotal.setBaseCalculoICMSST(new BigDecimal("999999999999.99"));
icmsTotal.setValorCOFINS(new BigDecimal("999999999999.99"));
icmsTotal.setValorPIS(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDesconto(new BigDecimal("999999999999.99"));
Expand All @@ -426,7 +426,7 @@ public void naoDevePermitirValorTotalNFeNulo() {
final NFNotaInfoICMSTotal icmsTotal = new NFNotaInfoICMSTotal();
icmsTotal.setBaseCalculoICMS(new BigDecimal("999999999999.99"));
icmsTotal.setOutrasDespesasAcessorias(new BigDecimal("999999999999.99"));
icmsTotal.setValor(new BigDecimal("999999999999.99"));
icmsTotal.setBaseCalculoICMSST(new BigDecimal("999999999999.99"));
icmsTotal.setValorCOFINS(new BigDecimal("999999999999.99"));
icmsTotal.setValorPIS(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDesconto(new BigDecimal("999999999999.99"));
Expand All @@ -450,7 +450,7 @@ public void naoDevePermitirValorTotalSeguroNulo() {
final NFNotaInfoICMSTotal icmsTotal = new NFNotaInfoICMSTotal();
icmsTotal.setBaseCalculoICMS(new BigDecimal("999999999999.99"));
icmsTotal.setOutrasDespesasAcessorias(new BigDecimal("999999999999.99"));
icmsTotal.setValor(new BigDecimal("999999999999.99"));
icmsTotal.setBaseCalculoICMSST(new BigDecimal("999999999999.99"));
icmsTotal.setValorCOFINS(new BigDecimal("999999999999.99"));
icmsTotal.setValorPIS(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDesconto(new BigDecimal("999999999999.99"));
Expand All @@ -474,7 +474,7 @@ public void devePermitirICMSFundoCombatePobrezaNulo() {
final NFNotaInfoICMSTotal icmsTotal = new NFNotaInfoICMSTotal();
icmsTotal.setBaseCalculoICMS(new BigDecimal("999999999999.99"));
icmsTotal.setOutrasDespesasAcessorias(new BigDecimal("999999999999.99"));
icmsTotal.setValor(new BigDecimal("999999999999.99"));
icmsTotal.setBaseCalculoICMSST(new BigDecimal("999999999999.99"));
icmsTotal.setValorCOFINS(new BigDecimal("999999999999.99"));
icmsTotal.setValorPIS(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDesconto(new BigDecimal("999999999999.99"));
Expand All @@ -497,7 +497,7 @@ public void devePermitirICMSPartilhaDestinatarioNulo() {
final NFNotaInfoICMSTotal icmsTotal = new NFNotaInfoICMSTotal();
icmsTotal.setBaseCalculoICMS(new BigDecimal("999999999999.99"));
icmsTotal.setOutrasDespesasAcessorias(new BigDecimal("999999999999.99"));
icmsTotal.setValor(new BigDecimal("999999999999.99"));
icmsTotal.setBaseCalculoICMSST(new BigDecimal("999999999999.99"));
icmsTotal.setValorCOFINS(new BigDecimal("999999999999.99"));
icmsTotal.setValorPIS(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDesconto(new BigDecimal("999999999999.99"));
Expand All @@ -520,7 +520,7 @@ public void devePermitirICMSPartilhaRemententeNulo() {
final NFNotaInfoICMSTotal icmsTotal = new NFNotaInfoICMSTotal();
icmsTotal.setBaseCalculoICMS(new BigDecimal("999999999999.99"));
icmsTotal.setOutrasDespesasAcessorias(new BigDecimal("999999999999.99"));
icmsTotal.setValor(new BigDecimal("999999999999.99"));
icmsTotal.setBaseCalculoICMSST(new BigDecimal("999999999999.99"));
icmsTotal.setValorCOFINS(new BigDecimal("999999999999.99"));
icmsTotal.setValorPIS(new BigDecimal("999999999999.99"));
icmsTotal.setValorTotalDesconto(new BigDecimal("999999999999.99"));
Expand Down

0 comments on commit 8e85773

Please sign in to comment.