From b08eb5216d86cbe384b9f5e3c476dcb41d771e85 Mon Sep 17 00:00:00 2001
From: Brian Cully <bjc@kublai.com>
Date: Mon, 13 Nov 2017 17:28:31 +0000
Subject: Rename 'config' to 'env'.

"Environment" more accurately reflects its usage, and this opens up
"config" for global configuration.

  * Flags -c -> -e (-config -> -env).
---
 t/fixtures/input          | 29 -----------------------------
 t/fixtures/localhost.conf |  3 ---
 t/fixtures/sample.env     |  3 +++
 t/fixtures/sample.input   | 29 +++++++++++++++++++++++++++++
 t/fixtures/sample.plan    |  6 ++++++
 t/fixtures/testplan       |  6 ------
 t/samplerun.t             | 12 ++++++------
 7 files changed, 44 insertions(+), 44 deletions(-)
 delete mode 100644 t/fixtures/input
 delete mode 100644 t/fixtures/localhost.conf
 create mode 100644 t/fixtures/sample.env
 create mode 100644 t/fixtures/sample.input
 create mode 100644 t/fixtures/sample.plan
 delete mode 100644 t/fixtures/testplan

(limited to 't')

diff --git a/t/fixtures/input b/t/fixtures/input
deleted file mode 100644
index 2d508fe..0000000
--- a/t/fixtures/input
+++ /dev/null
@@ -1,29 +0,0 @@
-<stream:stream xmlns:stream='http://etherx.jabber.org/streams'
-	       version='1.0'
-	       from='localhost'
-	       id='somestreamid'
-	       xmlns='jabber:client'>
-  <stream:features>
-    <mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>
-      <mechanism>SCRAM-SHA-1</mechanism>
-      <mechanism>PLAIN</mechanism>
-    </mechanisms>
-    <auth xmlns='http://jabber.org/features/iq-auth'/>
-  </stream:features>
-<success xmlns='urn:ietf:params:xml:ns:xmpp-sasl'></success>
-<stream:stream xmlns:stream='http://etherx.jabber.org/streams'
-	       version='1.0'
-	       from='localhost'
-	       id='somestreamid'
-	       xmlns='jabber:client'>
-  <stream:features>
-    <bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'/>
-    <session xmlns='urn:ietf:params:xml:ns:xmpp-session'/>
-  </stream:features>
-<iq from='test0@localhost' to='test0@localhost/xmpt' id='bind' type='result'>
-  <bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'>
-    <jid>test0@localhost/xmpt</jid>
-  </bind>
-</iq>
-<iq from='test0@localhost' to='test0@localhost/xmpt' id='session' type='result'/>
-</stream:stream>
diff --git a/t/fixtures/localhost.conf b/t/fixtures/localhost.conf
deleted file mode 100644
index bc462d7..0000000
--- a/t/fixtures/localhost.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Domain and bare JID are calculated from full.
-full_jid=test0@localhost/xmpt
-password=test
diff --git a/t/fixtures/sample.env b/t/fixtures/sample.env
new file mode 100644
index 0000000..bc462d7
--- /dev/null
+++ b/t/fixtures/sample.env
@@ -0,0 +1,3 @@
+# Domain and bare JID are calculated from full.
+full_jid=test0@localhost/xmpt
+password=test
diff --git a/t/fixtures/sample.input b/t/fixtures/sample.input
new file mode 100644
index 0000000..2d508fe
--- /dev/null
+++ b/t/fixtures/sample.input
@@ -0,0 +1,29 @@
+<stream:stream xmlns:stream='http://etherx.jabber.org/streams'
+	       version='1.0'
+	       from='localhost'
+	       id='somestreamid'
+	       xmlns='jabber:client'>
+  <stream:features>
+    <mechanisms xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>
+      <mechanism>SCRAM-SHA-1</mechanism>
+      <mechanism>PLAIN</mechanism>
+    </mechanisms>
+    <auth xmlns='http://jabber.org/features/iq-auth'/>
+  </stream:features>
+<success xmlns='urn:ietf:params:xml:ns:xmpp-sasl'></success>
+<stream:stream xmlns:stream='http://etherx.jabber.org/streams'
+	       version='1.0'
+	       from='localhost'
+	       id='somestreamid'
+	       xmlns='jabber:client'>
+  <stream:features>
+    <bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'/>
+    <session xmlns='urn:ietf:params:xml:ns:xmpp-session'/>
+  </stream:features>
+<iq from='test0@localhost' to='test0@localhost/xmpt' id='bind' type='result'>
+  <bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'>
+    <jid>test0@localhost/xmpt</jid>
+  </bind>
+</iq>
+<iq from='test0@localhost' to='test0@localhost/xmpt' id='session' type='result'/>
+</stream:stream>
diff --git a/t/fixtures/sample.plan b/t/fixtures/sample.plan
new file mode 100644
index 0000000..ba7fcaa
--- /dev/null
+++ b/t/fixtures/sample.plan
@@ -0,0 +1,6 @@
+signin
+auth
+bind-reneg
+bind
+session
+signout
diff --git a/t/fixtures/testplan b/t/fixtures/testplan
deleted file mode 100644
index ba7fcaa..0000000
--- a/t/fixtures/testplan
+++ /dev/null
@@ -1,6 +0,0 @@
-signin
-auth
-bind-reneg
-bind
-session
-signout
diff --git a/t/samplerun.t b/t/samplerun.t
index 4df0d7d..d9dba31 100644
--- a/t/samplerun.t
+++ b/t/samplerun.t
@@ -7,12 +7,12 @@ use IO::File;
 use strict;
 use warnings;
 
-my $config = 't/fixtures/localhost.conf';
-my $testplan = 't/fixtures/testplan';
-my $input = 't/fixtures/input';
+my $env		= 't/fixtures/sample.env';
+my $testplan	= 't/fixtures/sample.plan';
+my $input	= 't/fixtures/sample.input';
 
 do {
-  my $cmd = "./xmpt -c $config -p $testplan";
+  my $cmd = "./xmpt -e $env -p $testplan";
   my $xmptfh = new IO::File("|$cmd") or BAIL_OUT "Can't run '$cmd': $!.\n";
   my $inputfh = new IO::File($input) or
     BAIL_OUT "Couldn't open $input for reading: $!.\n";
@@ -25,7 +25,7 @@ do {
 };
 
 do {
-  my $cmd = "./xmpt -t 1 -c $config -p $testplan cat 2>/dev/null";
+  my $cmd = "./xmpt -t 1 -e $env -p $testplan cat 2>/dev/null";
   local $SIG{ALRM} = sub { fail("Timed out running $cmd.") };
   alarm 5;
   system $cmd;
@@ -33,7 +33,7 @@ do {
 };
 
 do {
-  my $cmd = "./xmpt -c $config -p $testplan cat $input 2>/dev/null";
+  my $cmd = "./xmpt -e $env -p $testplan cat $input 2>/dev/null";
   local $SIG{ALRM} = sub { fail("Timed out running $cmd.") };
   alarm 10;
   ok((system($cmd) >> 8) == 0, 'I/O redirected to cat');
-- 
cgit v1.2.3