Package difflib

Examples of difflib.Patch

684
685
686
687
688
689
690
691
692
693
        String oldContent = getDriftFileBits(subject, drift.getOldDriftFile().getHashId());
        List<String> oldList = asList(oldContent.split("\\n"));
        String newContent = getDriftFileBits(subject, drift.getNewDriftFile().getHashId());
        List<String> newList = asList(newContent.split("\\n"));

        Patch patch = DiffUtils.diff(oldList, newList);
        List<String> deltas = DiffUtils.generateUnifiedDiff(drift.getPath(), drift.getPath(), oldList, patch, 10);

        return new FileDiffReport(patch.getDeltas().size(), deltas);
    }
View Full Code Here
727
728
729
730
731
732
733
734
735
736
737
        DriftFile drift2File = drift2.getNewDriftFile();
        String content2 = (null == drift2File) ? "" : getDriftFileBits(subject, drift2File.getHashId());
        List<String> content2List = asList(content2.split("\\n"));

        Patch patch = DiffUtils.diff(content1List, content2List);
        List<String> deltas = DiffUtils
            .generateUnifiedDiff(drift1.getPath(), drift2.getPath(), content1List, patch, 10);

        return new FileDiffReport(patch.getDeltas().size(), deltas);
    }
View Full Code Here
131
132
133
134
135
136
137
138
139
140
141
        List<String> actualList = asList(actualContents.split("\\n"));

        String expectedContents = StreamUtil.slurp(new FileReader(expectedFile));
        List<String> expectedList = asList(expectedContents.split("\\n"));

        Patch patch = DiffUtils.diff(actualList, expectedList);
        List<String> diffs = DiffUtils.generateUnifiedDiff(actualFile.getName(), "expected.cassandra.yaml", actualList,
            patch, 5);
        assertTrue(patch.getDeltas().isEmpty(), actualFile.getName() + " was not configured correctly. The "
            + "following differences were found:\n" + StringUtil.listToString(diffs, "\n"));
    }
View Full Code Here
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
          else {
            //andTrueBodyOutput[booleanStrippedUnstrippedIndex].compareTo(normalBodyOutput[booleanStrippedUnstrippedIndex])
            //the results of the "AND 1=1" do NOT match the original query, for whatever reason (no sql injection, or the web page is not stable)
            if (this.debugEnabled) {
              log.debug("Check 2, " + (strippedOutput[booleanStrippedUnstrippedIndex] ? "STRIPPED" : "UNSTRIPPED") + " html output for AND condition [" + sqlBooleanAndTrueValue + "] does NOT match the (refreshed) original results for " + refreshedmessage.getRequestHeader().getURI());
              Patch diffpatch = DiffUtils.diff(
                  new LinkedList<String>(Arrays.asList(normalBodyOutput[booleanStrippedUnstrippedIndex].split("\\n"))),
                  new LinkedList<String>(Arrays.asList(andTrueBodyOutput[booleanStrippedUnstrippedIndex].split("\\n"))));

              //int numberofDifferences = diffpatch.getDeltas().size();

              //and convert the list of patches to a String, joining using a newline
              StringBuilder tempDiff = new StringBuilder(250);
              for (Delta delta : diffpatch.getDeltas()) {
                String changeType = null;
                if (delta.getType() == Delta.TYPE.CHANGE) {
                  changeType = "Changed Text";
                } else if (delta.getType() == Delta.TYPE.DELETE) {
                  changeType = "Deleted Text";
View Full Code Here
35
36
37
38
39
40
41
42
43
        List<String> oldLines = Lists.newArrayList(splitter.split(oldDiff));
        List<String> newLines = Lists.newArrayList(splitter.split(newDiff));
        if (oldLines.equals(newLines)) {
            return "";
        }
        Patch diffs = DiffUtils.diff(oldLines, newLines);
        return Joiner.on("\n").join(DiffUtils.generateUnifiedDiff(DIFF_OLD_FILE_NAME, DIFF_NEW_FILE_NAME, oldLines,
                diffs, DIFF_CONTEXT_LINES));
    }
View Full Code Here
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
  /**
   * �����擾���������s���܂��B
   */
  public void doDiff() {

    Patch rev = DiffUtils.diff(this.text1, this.text2);

    int count1 = 0;
    int count2 = 0;

    for (Delta delta : rev.getDeltas()) {
      Chunk orgChunk = delta.getOriginal();
      Chunk revChunk = delta.getRevised();

      while (count1 != orgChunk.getPosition()) {
        this.handler.match(this.text1.get(count1));
View Full Code Here
73
74
75
76
77
78
79
80
    }
    return matches;
  }

  private List<Delta> getDeltas() {
    Patch diff = DiffUtils.diff(oldMatches, newMatches);
    return diff.getDeltas();
  }
View Full Code Here
9
10
11
12
13
14
15
16
17
18
public class VersionComparer {

  private List<String> differences;
 
  public boolean compare(String originalVersion, String originalContent, String revisedVersion, String revisedContent) {
    Patch patch = DiffUtils.diff(contentToLines(originalContent), contentToLines(revisedContent));
    differences = DiffUtils.generateUnifiedDiff(originalVersion, revisedVersion,
        contentToLines(originalContent), patch, 5);
    return true;
  }
View Full Code Here
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
        } catch (IOException e) {
            TestUtils.getLog().println("Unable to break up output into lines");
            e.printStackTrace();
        }

        Patch diff = DiffUtils.diff(referenceLines, outputLines);

        if (!diff.getDeltas().isEmpty()) {
            TestUtils.getLog().println("Reference output diff:");
            List<String> diffOutput = DiffUtils.generateUnifiedDiff(fileName + ".css", fileName + ".css", referenceLines, diff, 3);
            for (String diffOutputLine : diffOutput) {
                TestUtils.getLog().println(diffOutputLine);
            }
        }

        Assert.assertEquals(diff.getDeltas().size(), 0);
    }
View Full Code Here
106
107
108
109
110
111
112
            path = buildPath(orig, rev);
            return buildRevision(path, orig, rev);
        } catch (DifferentiationFailedException e) {
            e.printStackTrace();
        }
        return new Patch();
    }
View Full Code Here
TOP

Related Classes of difflib.Patch

  • com.bazaarvoice.jless.DiffTest
  • com.custardsource.dybdob.mojo.DiffGenerator
  • difflib.myers.MyersDiff
  • fitnesse.responders.versions.VersionComparer
  • jp.sf.amateras.stepcounter.diffcount.diff.DiffEngine
  • net.continuumsecurity.Utils
  • org.languagetool.dev.wikipedia.atom.ChangeAnalysis
  • org.rhq.cassandra.DeployerITest
  • org.rhq.enterprise.server.drift.DriftManagerBean
  • org.zaproxy.zap.extension.ascanrules.TestSQLInjection
    • Copyright © 2018 www.massapicom. All rights reserved.
    All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.