Browse Source

Delete unused test files in tests

Andrew Young 8 years ago
parent
commit
8786322171

+ 0 - 9
tests/t1-0.org

@@ -1,9 +0,0 @@
-* heading 1
-** test heading
-:PROPERTIES:
-:ID: 100
-:END:
-- this is just a test
-* heading 2
-** test heading
-- this is a different heading

+ 0 - 10
tests/t1-1.org

@@ -1,10 +0,0 @@
-* heading 1
-** test heading
-- this is a different heading
-* heading 3
-** heading 4
-*** test heading
-:PROPERTIES:
-:ID: 100
-:END:
-- this is just a test111

+ 0 - 13
tests/t1-2.org

@@ -1,13 +0,0 @@
-* heading 1
-** test heading
-:PROPERTIES:
-:ID: 100
-:END:
-- updated line in file 2
-* heading 2
-- new text under heading 2
-- this will conflict since heading 2
-  deleted in file 1
-** test heading
-- this is a different heading
-- this line added in file 2

+ 0 - 7
tests/test.sh

@@ -1,7 +0,0 @@
-#! /bin/sh
-
-# print a git diff of the files
-git merge-file -p t1-1.org t1-0.org t1-2.org
-# run the program with some test files
-../src/org-merge-driver t1-1.org t1-2.org t1-0.org tout.org
-cat tout.org

+ 0 - 8
tests/test1.org

@@ -1,8 +0,0 @@
-* Heading 1
-* Heading 2
-*** Heading 3
-* Heading 4
-** Heading 5
-*** Heading 6
-*** Heading 7
-** Heading 8

+ 0 - 20
tests/test1/t1-0.org

@@ -1,20 +0,0 @@
-* deleted in both files
-- this text will be deleted too
-* unchanged 1
-:PROPERTIES:
-:ID: 100
-:END:
-- this is just a test
-* unchanged 1
-* deleted in first
-- we are testing this
-** deleted in second
-- I'm wondering what this will do
-* unchanged 2
-- testing this is so much fun 
-** unchanged 3
-*** moved level 2 in first
-- some text
-*** moved level 2 in second
-** different text in both
-- different text in both

+ 0 - 19
tests/test1/t1-1.org

@@ -1,19 +0,0 @@
-- this text is new, but the same in both files
-* unchanged 1
-:PROPERTIES:
-:ID: 100
-:END:
-- this is just a test
-* unchanged 1
-** deleted in second
-- I'm wondering what this will do
-* new in file 1
-* unchanged 2
-- testing is so much fun
-** sub new heading in file 1
-** unchanged 3
-** moved level 2 in first
-*** moved level 2 in second
-** different text in both
-- file 1 different text
-

+ 0 - 19
tests/test1/t1-2.org

@@ -1,19 +0,0 @@
-- this text is new, but the same in both files
-* unchanged 1
-:PROPERTIES:
-:ID: 100
-:END:
-- this is just a test
-* unchanged 1
-* deleted in first
-- we are testing this
-* unchanged 2
-- testing is so much fun
-** unchanged 3
-*** file 2 new sub-heading
-**** file 2 new sub-sub-heading
-*** moved level 2 in first
-** moved level 2 in second
-** different text in both
-- different text from file 2
-

+ 0 - 5
tests/test2.org

@@ -1,5 +0,0 @@
-* h
-t
-** hh
- *
-* h

+ 0 - 2
tests/test2/t1-0.org

@@ -1,2 +0,0 @@
-* original heading
-- here is some text

+ 0 - 7
tests/test2/t1-1.org

@@ -1,7 +0,0 @@
-- conflicting text in file 1
-* original heading
-- here is some text
-- add some text in file 1
-** New heading in file 1
-- more text
-*** Sub new heading in file 1

+ 0 - 6
tests/test2/t1-2.org

@@ -1,6 +0,0 @@
-#+TITLE: A New Title In File 2
-* original heading
-- here is some text
-** File 2 new sub heading
-* A new heading in file 2
-- with some text

+ 0 - 27
tests/test3.org

@@ -1,27 +0,0 @@
- **
-  ****
-** ***
-* * * *
-  **
-
-  **
-**** ***
- *
-*** *
-** **
-* ***
-
-*aa
- *ab
-*-*
-****ac
-
-** 
-*****
-
-#+begin_src C
-/*
-* this is source code */
-
-return 1+2;
-#+end_src:

+ 0 - 9
tests/test3/t1-0.org

@@ -1,9 +0,0 @@
-* heading 1
-** test heading
-:PROPERTIES:
-:ID: 100
-:END:
-- this is just a test
-* heading 2
-** test heading
-- this is a different heading

+ 0 - 10
tests/test3/t1-1.org

@@ -1,10 +0,0 @@
-* heading 1
-** test heading
-- this is a different heading
-* heading 3
-** heading 4
-** test heading
-:PROPERTIES:
-:ID: 100
-:END:
-- this is just a test

+ 0 - 10
tests/test3/t1-2.org

@@ -1,10 +0,0 @@
-* heading 1
-** test heading
-:PROPERTIES:
-:ID: 100
-:END:
-- updated line in file 2
-* heading 2
-** test heading
-- this is a different heading
-- this line added in file 2

+ 0 - 3
tests/test4.org

@@ -1,3 +0,0 @@
-* this is yet another test
-- with windows style endlines
-- i hope this works

+ 0 - 25
tests/tout.org

@@ -1,25 +0,0 @@
-* heading 2
-- new text under heading 2
-- this will conflict since heading 2
-  deleted in file 1
-* heading 3
-** heading 4
-** test heading
-:PROPERTIES:
-:ID: 100
-:END:
-- updated line in file 2
-this is some more text
-
-
-
-aoeuaoeua
-aoeuaeou
-* heading 1
-** test heading
-ooeueou
-aoeuaeou
-*** aoetnh
-- andrew
-aeou
-