Skip to content

Commit 8bede0b

Browse files
cowtowncodercowtowncoder
committed
Fix failing test suite; can't add #41 test, entities missing; someone who knos, uses Hibernate can have a try I give up
1 parent d87432b commit 8bede0b

File tree

7 files changed

+91
-159
lines changed

7 files changed

+91
-159
lines changed

‎hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/data/Contrato.java

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
package com.fasterxml.jackson.datatype.hibernate4.data;
22

3+
import java.math.BigDecimal;
34
import java.util.List;
45

56
import javax.persistence.Column;
67
import javax.persistence.Entity;
8+
import javax.persistence.FetchType;
79
import javax.persistence.Id;
10+
import javax.persistence.JoinColumn;
11+
import javax.persistence.ManyToOne;
812
import javax.persistence.OneToMany;
913
import javax.persistence.Table;
1014

@@ -40,3 +44,30 @@ public void setLiquidacoes(List<Liquidacao> liquidacoes) {
4044
this.liquidacoes = liquidacoes;
4145
}
4246
}
47+
48+
@Entity @Table(name="Liquidacao", catalog="classicmodels")
49+
class Liquidacao {
50+
@Id
51+
public Long id;
52+
53+
@Column(name="valor_total")
54+
public BigDecimal valorTotal;
55+
56+
@ManyToOne(fetch=FetchType.LAZY) @JoinColumn(name="contrato_id")
57+
public Contrato contrato;
58+
59+
@ManyToOne(fetch=FetchType.LAZY) @JoinColumn(name="parcela_id") @JsonIgnoreProperties("contrato")
60+
public Parcela parcela;
61+
}
62+
63+
@Entity @Table(name="Parcela", catalog="classicmodels")
64+
class Parcela {
65+
@Id
66+
public Long id;
67+
68+
@Column(name="numero_parcela")
69+
public Integer numeroParcela;
70+
71+
@ManyToOne(fetch=FetchType.LAZY) @JoinColumn(name="contrato_id")
72+
public Contrato contrato;
73+
}

‎hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/data/Liquidacao.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/data/Parcela.java

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎hibernate4/src/test/resources/META-INF/persistence.xml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@
88
<provider>org.hibernate.ejb.HibernatePersistence</provider>
99
<class>com.fasterxml.jackson.datatype.hibernate4.data.Contrato</class>
1010
<class>com.fasterxml.jackson.datatype.hibernate4.data.Customer</class>
11-
<class>com.fasterxml.jackson.datatype.hibernate4.data.Employee</class>
12-
<class>com.fasterxml.jackson.datatype.hibernate4.data.Liquidacao</class>
13-
<class>com.fasterxml.jackson.datatype.hibernate4.data.Office</class>
14-
<class>com.fasterxml.jackson.datatype.hibernate4.data.Order</class>
15-
<class>com.fasterxml.jackson.datatype.hibernate4.data.OrderDetail</class>
16-
<class>com.fasterxml.jackson.datatype.hibernate4.data.OrderDetailId</class>
17-
<class>com.fasterxml.jackson.datatype.hibernate4.data.Parcela</class>
18-
<class>com.fasterxml.jackson.datatype.hibernate4.data.Payment</class>
19-
<class>com.fasterxml.jackson.datatype.hibernate4.data.PaymentId</class>
20-
<class>com.fasterxml.jackson.datatype.hibernate4.data.Product</class>
11+
<class>com.fasterxml.jackson.datatype.hibernate4.data.Employee</class>
12+
<class>com.fasterxml.jackson.datatype.hibernate4.data.Liquidacao</class>
13+
<class>com.fasterxml.jackson.datatype.hibernate4.data.Office</class>
14+
<class>com.fasterxml.jackson.datatype.hibernate4.data.Order</class>
15+
<class>com.fasterxml.jackson.datatype.hibernate4.data.OrderDetail</class>
16+
<class>com.fasterxml.jackson.datatype.hibernate4.data.OrderDetailId</class>
17+
<class>com.fasterxml.jackson.datatype.hibernate4.data.Parcela</class>
18+
<class>com.fasterxml.jackson.datatype.hibernate4.data.Payment</class>
19+
<class>com.fasterxml.jackson.datatype.hibernate4.data.PaymentId</class>
20+
<class>com.fasterxml.jackson.datatype.hibernate4.data.Product</class>
2121
<properties>
22-
<property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
23-
<property name="javax.persistence.jdbc.user" value=""/>
24-
<property name="javax.persistence.jdbc.password" value=""/>
25-
<property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:;DB_CLOSE_DELAY=-1;INIT=RUNSCRIPT FROM 'classpath:/classicmodels.sql'"/>
26-
<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
22+
<property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
23+
<property name="javax.persistence.jdbc.user" value=""/>
24+
<property name="javax.persistence.jdbc.password" value=""/>
25+
<property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:;DB_CLOSE_DELAY=-1;INIT=RUNSCRIPT FROM 'classpath:/classicmodels.sql'"/>
26+
<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
2727
</properties>
2828
</persistence-unit>
2929

‎hibernate5/src/test/java/com/fasterxml/jackson/datatype/hibernate5/failing/Issue41Test.java

Lines changed: 0 additions & 87 deletions
This file was deleted.

‎hibernate5/src/test/resources/META-INF/persistence.xml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,18 @@
66

77
<persistence-unit name="persistenceUnit" transaction-type="RESOURCE_LOCAL">
88
<provider>org.hibernate.ejb.HibernatePersistence</provider>
9+
<class>com.fasterxml.jackson.datatype.hibernate5.data.Contrato</class>
910
<class>com.fasterxml.jackson.datatype.hibernate5.data.Customer</class>
10-
<class>com.fasterxml.jackson.datatype.hibernate5.data.Employee</class>
11-
<class>com.fasterxml.jackson.datatype.hibernate5.data.Office</class>
12-
<class>com.fasterxml.jackson.datatype.hibernate5.data.Order</class>
13-
<class>com.fasterxml.jackson.datatype.hibernate5.data.OrderDetail</class>
14-
<class>com.fasterxml.jackson.datatype.hibernate5.data.OrderDetailId</class>
15-
<class>com.fasterxml.jackson.datatype.hibernate5.data.Payment</class>
16-
<class>com.fasterxml.jackson.datatype.hibernate5.data.PaymentId</class>
17-
<class>com.fasterxml.jackson.datatype.hibernate5.data.Product</class>
11+
<class>com.fasterxml.jackson.datatype.hibernate5.data.Employee</class>
12+
<class>com.fasterxml.jackson.datatype.hibernate5.data.Liquidacao</class>
13+
<class>com.fasterxml.jackson.datatype.hibernate5.data.Office</class>
14+
<class>com.fasterxml.jackson.datatype.hibernate5.data.Order</class>
15+
<class>com.fasterxml.jackson.datatype.hibernate5.data.OrderDetail</class>
16+
<class>com.fasterxml.jackson.datatype.hibernate5.data.OrderDetailId</class>
17+
<class>com.fasterxml.jackson.datatype.hibernate5.data.Parcela</class>
18+
<class>com.fasterxml.jackson.datatype.hibernate5.data.Payment</class>
19+
<class>com.fasterxml.jackson.datatype.hibernate5.data.PaymentId</class>
20+
<class>com.fasterxml.jackson.datatype.hibernate5.data.Product</class>
1821
<properties>
1922
<property name="javax.persistence.jdbc.driver" value="org.h2.Driver"/>
2023
<property name="javax.persistence.jdbc.user" value=""/>

‎hibernate5/src/test/resources/classicmodels.sql

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3979,6 +3979,40 @@ INSERT INTO `classicmodels`.`Product` (`productCode`,`productName`,`productLine`
39793979
('S72_1253','Boeing X-32A JSF','Planes','1:72','Motor City Art Classics','10\" Wingspan with retractable landing gears.Comes with pilot',4857,32.77,49.66),
39803980
('S72_3212','Pont Yacht','Ships','1:72','Unimax Art Galleries','Measures 38 inches Long x 33 3/4 inches High. Includes a stand.\r\nMany extras including rigging, long boats, pilot house, anchors, etc. Comes with 2 masts, all square-rigged',414,33.3,54.6);
39813981

3982+
3983+
DROP TABLE IF EXISTS `classicmodels`.`Contrato`;
3984+
CREATE TABLE `classicmodels`.`Contrato` (
3985+
`id` numeric(10) NOT NULL,
3986+
`numero_contrato` varchar(50) NOT NULL,
3987+
PRIMARY KEY (`id`)
3988+
) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
3989+
INSERT INTO `classicmodels`.`Contrato` (`id`,`numero_contrato`) VALUES
3990+
(1, '100001-9');
3991+
3992+
DROP TABLE IF EXISTS `classicmodels`.`Parcela`;
3993+
CREATE TABLE `classicmodels`.`Parcela` (
3994+
`id` numeric(10) NOT NULL,
3995+
`numero_parcela` numeric(10) NOT NULL,
3996+
`contrato_id` numeric(10) NOT NULL,
3997+
PRIMARY KEY (`id`)
3998+
) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
3999+
INSERT INTO `classicmodels`.`Parcela` (`id`,`numero_parcela`,`contrato_id`) VALUES
4000+
(1, 1, 1);
4001+
4002+
DROP TABLE IF EXISTS `classicmodels`.`Liquidacao`;
4003+
CREATE TABLE `classicmodels`.`Liquidacao` (
4004+
`id` numeric(10) NOT NULL,
4005+
`valor_total` numeric(10) NOT NULL,
4006+
`contrato_id` numeric(10) NOT NULL,
4007+
`parcela_id` numeric(10) NULL,
4008+
PRIMARY KEY (`id`)
4009+
) DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
4010+
INSERT INTO `classicmodels`.`Liquidacao` (`id`,`valor_total`,`contrato_id`, `parcela_id`) VALUES
4011+
(1, 10000, 1, 1);
4012+
4013+
4014+
4015+
39824016
-- Return to H2 regular mode
39834017
SET MODE REGULAR;
39844018

0 commit comments

Comments
 (0)