Clean up old test schema and test data

Summary:
For historical reasons we had two versions of the
`glean.test.Predicate` predicate which was very confusing. This diff
removes the old version, collapses the schemas and updates all the
tests as necessary.

Reviewed By: josefs

Differential Revision: D59809144

fbshipit-source-id: 3c7bc9a1f26ce7c4e57c11f0bf6615ec41588950

glean.cabal.in

@@ -1713,12 +1713,6 @@ common angle-test
         glean:if-glean-hs,
         glean:schema
 
-test-suite angle-test-onemany
-    import: test, angle-test
-    type: exitcode-stdio-1.0
-    main-is: Angle/OneManyTest.hs
-    ghc-options: -main-is Angle.OneManyTest
-
 test-suite angle-test-angle
     import: test, angle-test
     type: exitcode-stdio-1.0

glean/haxl/tests/IntegrationTest.hs

@@ -67,7 +67,7 @@ getTest env repo = TestLabel "GetRec" $
 
     rs <- runHaxl e $ mapM Glean.getKey stubs
     assertBool "Glean.getKey" $
-      sort (map (fromNat . Glean.Test.kitchenSink_nat) rs) == [ 0, 0, 0, 42 ] &&
+      sort (map (fromNat . Glean.Test.kitchenSink_nat) rs) == [ 0, 0, 42, 43 ] &&
       all (isNothing . Sys.blob_key . Glean.Test.kitchenSink_pred) rs
 
     rs <- runHaxl e $ mapM Glean.getKeyRec stubs