Major rework -- see long comments

* Replace --create-from-json=file with --json-input, which causes the
  regular input to be treated as json.
* Eliminate --to-json
* In --json=2, bring back "objects" and eliminate "objectinfo". Stream
  data is never present.
* In --json-output=2, write "qpdf-v2" with "objects" and include
  stream data.

1 files changed, 0 insertions, 53 deletions

diff --git a/qpdf/qtest/qpdf-json.test b/qpdf/qtest/qpdf-json.test
deleted file mode 100644
index 89d5cd4e..00000000
--- a/qpdf/qtest/qpdf-json.test
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env perl
-require 5.008;
-use warnings;
-use strict;
-
-unshift(@INC, '.');
-require qpdf_test_helpers;
-
-chdir("qpdf") or die "chdir testdir failed: $!\n";
-
-require TestDriver;
-
-cleanup();
-
-my $td = new TestDriver('qpdf-json');
-
-my $n_tests = 0;
-
-my @badfiles = (
-    'no-qpdf-object',
-    'no-json-version',
-    'no-pdf-version',
-    'top-level-scalar',
-    'bad-json-version1',
-    'bad-json-version2',
-    'bad-pdf-version1',
-    'bad-pdf-version2',
-    'top-level-array',
-    'objects-not-dict',
-    'bad-object-key',
-    'object-not-dict',
-    'stream-not-dict',
-    'stream-dict-not-dict',
-    'trailer-not-dict',
-    'trailer-stream',
-    'missing-trailer',
-    'missing-objects',
-    'obj-key-errors',
-    );
-
-$n_tests += scalar(@badfiles);
-
-foreach my $f (@badfiles)
-{
-    $td->runtest("bad: $f",
-                 {$td->COMMAND =>
-                      "qpdf --create-from-json=qjson-$f.json a.pdf"},
-                 {$td->FILE => "qjson-$f.out", $td->EXIT_STATUS => 2},
-                 $td->NORMALIZE_NEWLINES);
-}
-
-cleanup();
-$td->report($n_tests);