From 76dedf364b82dca5254f7b7b6b5b671e5a493b28 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Fri, 15 May 2020 12:07:50 +0200 Subject: [PATCH] Switch to use FillableSubscribeForm --- .../smackx/pubsub/PubSubIntegrationTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/pubsub/PubSubIntegrationTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/pubsub/PubSubIntegrationTest.java index f0c967020..6e470a67a 100644 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/pubsub/PubSubIntegrationTest.java +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/pubsub/PubSubIntegrationTest.java @@ -437,9 +437,9 @@ public class PubSubIntegrationTest extends AbstractSmackIntegrationTest { // Subscribe to the node twice, using different configuration final Node subscriberNode = pubSubManagerTwo.getNode(nodename); final EntityBareJid subscriber = conTwo.getUser().asEntityBareJid(); - final FillableSubscribeForm formA = new FillableSubscribeForm( DataForm.builder( DataForm.Type.form ).build() ); + final FillableSubscribeForm formA = subscriberNode.getSubscriptionOptions( subscriber.toString() ).getFillableForm(); formA.setDigestFrequency( 1 ); - final FillableSubscribeForm formB = new FillableSubscribeForm( DataForm.builder( DataForm.Type.form ).build() ); + final FillableSubscribeForm formB = subscriberNode.getSubscriptionOptions( subscriber.toString() ).getFillableForm(); formB.setDigestFrequency( 2 ); final Subscription subscriptionA = subscriberNode.subscribe( subscriber, formA ); @@ -487,9 +487,9 @@ public class PubSubIntegrationTest extends AbstractSmackIntegrationTest { // Subscribe to the node twice, using different configuration final Node subscriberNode = pubSubManagerTwo.getNode(nodename); final EntityBareJid subscriber = conTwo.getUser().asEntityBareJid(); - final FillableSubscribeForm formA = new FillableSubscribeForm( DataForm.builder( DataForm.Type.form ).build() ); + final FillableSubscribeForm formA = subscriberNode.getSubscriptionOptions( subscriber.toString() ).getFillableForm(); formA.setDigestFrequency( 1 ); - final FillableSubscribeForm formB =new FillableSubscribeForm( DataForm.builder( DataForm.Type.form ).build() ); + final FillableSubscribeForm formB = subscriberNode.getSubscriptionOptions( subscriber.toString() ).getFillableForm(); formB.setDigestFrequency( 2 ); final Subscription subscriptionA = subscriberNode.subscribe( subscriber, formA ); @@ -577,9 +577,9 @@ public class PubSubIntegrationTest extends AbstractSmackIntegrationTest { // Subscribe to the node twice, using different configuration final Node subscriberNode = pubSubManagerTwo.getNode(nodename); final EntityBareJid subscriber = conTwo.getUser().asEntityBareJid(); - final FillableSubscribeForm formA = new FillableSubscribeForm( DataForm.builder( DataForm.Type.form ).build() ); + final FillableSubscribeForm formA = subscriberNode.getSubscriptionOptions( subscriber.toString() ).getFillableForm(); formA.setDigestFrequency( 1 ); - final FillableSubscribeForm formB = new FillableSubscribeForm( DataForm.builder( DataForm.Type.form ).build() ); + final FillableSubscribeForm formB = subscriberNode.getSubscriptionOptions( subscriber.toString() ).getFillableForm(); formB.setDigestFrequency( 2 ); subscriberNode.subscribe( subscriber, formA ); @@ -749,9 +749,9 @@ public class PubSubIntegrationTest extends AbstractSmackIntegrationTest { // Subscribe to the node twice, using different configuration final Node subscriberNode = pubSubManagerTwo.getNode(nodename); final EntityBareJid subscriber = conTwo.getUser().asEntityBareJid(); - final FillableSubscribeForm formA = new FillableSubscribeForm( DataForm.builder( DataForm.Type.form ).build() ); + final FillableSubscribeForm formA = subscriberNode.getSubscriptionOptions( subscriber.toString() ).getFillableForm(); formA.setDigestFrequency( 1 ); - final FillableSubscribeForm formB = new FillableSubscribeForm( DataForm.builder( DataForm.Type.form ).build() ); + final FillableSubscribeForm formB = subscriberNode.getSubscriptionOptions( subscriber.toString() ).getFillableForm(); formB.setDigestFrequency( 2 ); subscriberNode.subscribe( subscriber, formA );